ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/OSUT3Analysis/DBTools/scripts/osucrab

Comparing UserCode/OSUT3Analysis/DBTools/scripts/osucrab (file contents):
Revision 1.4 by ahart, Fri Aug 24 13:47:51 2012 UTC vs.
Revision 1.6 by ahart, Fri Nov 30 18:21:00 2012 UTC

#	Line 39 | Line 39 | if ($arg =~ m/-create/)
39
40		my $status = "created";
41		$status = "submitted" if $arg =~ m/-submit/;
42	<	my $results = dbInsert ($dataset, $ENV{"USER"}, $format, "", 0, 0, $status, $comment, $psetName, $crabCfgName, $jsonFileName, $submissionLogName);
42	>	my $results = dbInsert ($dataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $format, "", 0, 0, $status, $comment, $psetName, $crabCfgName, $jsonFileName, $submissionLogName);
43		}
44		elsif ($arg =~ m/-submit/)
45		{
#	Line 56 | Line 56 | elsif ($arg =~ m/-submit/)
56
57		system ("crab $arg");
58
59	<	my $results = dbUpdate ($id, "submitted", $submissionLogName, $ENV{"USER"}) if $id > -1;
59	>	my $results = dbUpdate ($id, "submitted", $submissionLogName, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $id > -1;
60		}
61		elsif ($arg =~ m/-report/)
62		{
#	Line 73 | Line 73 | elsif ($arg =~ m/-report/)
73
74		system ("crab $arg");
75
76	<	my $results = dbReport ($id, "complete", $lumiSummaryName, $ENV{"USER"}) if $id > -1;
76	>	my $results = dbReport ($id, "complete", $lumiSummaryName, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $id > -1;
77		}
78		elsif ($arg =~ m/-status/)
79		{
#	Line 89 | Line 89 | elsif ($arg =~ m/-status/)
89		my $currentStatusName = "$workingDir/log/.currentStatus";
90		unlink ($currentStatusName) if -e $currentStatusName;
91		system ("crab $arg | tee $currentStatusName");
92	<	my $results = dbStatus ($id, $currentStatusName, $ENV{"USER"}) if $id > -1;
92	>	my $results = dbStatus ($id, $currentStatusName, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $id > -1;
93		unlink ($currentStatusName);
94		}
95		else
#	Line 151 | Line 151 | sub
151		dbInsert
152		{
153		my $dataset = shift;
154	<	my $user = shift;
154	>	my $userAndHost = shift;
155		my $format = shift;
156		my $location = shift;
157		my $nFiles = shift;
#	Line 163 | Line 163 | dbInsert
163		my $jsonFileName = shift;
164		my $submissionLogName = shift;
165
166	+	my $user = $userAndHost;
167	+	$user =~ s/@.*$//;
168	+
169		open (PY_CONFIG, "<$psetName");
170		my @pset = <PY_CONFIG>;
171		close (PY_CONFIG);
#	Line 205 | Line 208 | dbInsert
208		print ID_FILE "$id\n";
209		close (ID_FILE);
210
211	<	$query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, submissionLog) values ($id, '$dataset', now(), now(), '$user', '$user', '$format', '$location', $nFiles, $sizeInGB, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$submissionLog')";
211	>	$query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, submissionLog) values ($id, '$dataset', now(), now(), '$userAndHost', '$user', '$format', '$location', $nFiles, $sizeInGB, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$submissionLog')";
212		$results = $db->query ($query);
213
214		return $results;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines