ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/OSUT3Analysis/DBTools/scripts/osudb

Comparing UserCode/OSUT3Analysis/DBTools/scripts/osudb (file contents):
Revision 1.14 by ahart, Mon Oct 22 14:45:07 2012 UTC vs.
Revision 1.15 by ahart, Fri Nov 30 18:20:59 2012 UTC

#	Line 66 | Line 66 | elsif ($ARGV[0] eq "createOther")
66		@listOfFiles = reverse (@listOfFiles);
67		pop (@listOfFiles);
68		@listOfFiles = reverse (@listOfFiles);
69	<	dbOtherCreate ("$ENV{'USER'}", \@listOfFiles, $opt{"comment"});
69	>	dbOtherCreate ("$ENV{'USER'}\@$ENV{'HOSTNAME'}", \@listOfFiles, $opt{"comment"});
70		}
71		else
72		{
#	Line 173 | Line 173 | dbUpdate
173		{
174		my $id = shift;
175		my $dataset = shift;
176	<	my $user = shift;
176	>	my $userAndHost = shift;
177		my $format = shift;
178		my $location = shift;
179		my $fileListName = shift;
#	Line 185 | Line 185 | dbUpdate
185		my $lumiSummaryName = shift;
186		my $release = shift;
187
188	+	my $user = $userAndHost;
189	+	$user =~ s/@.*$//g;
190	+
191		my $fileList;
192		my $pset;
193		my $crabCfg;
#	Line 291 | Line 294 | dbUpdate
294		my $id = 1;
295		$id = $row[0] + 1 if $results->numrows ();
296
297	<	$query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version) values ($id, '$dataset', now(), now(), '$user', '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release')";
297	>	$query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version) values ($id, '$dataset', now(), now(), '$userAndHost', '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release')";
298		}
299		if ($id > 0)
300		{
#	Line 612 | Line 615 | downloadRelease
615		sub
616		dbOtherCreate
617		{
618	<	my $user = shift;
618	>	my $userAndHost = shift;
619		my $listOfFiles = shift;
620		my $comment = shift;
621
622	+	my $user = $userAndHost;
623	+	$user =~ s/@.*$//g;
624	+
625		my $size = 0.0;
626		my $nFiles = 0.0;
627		for (my $i = 0; $i < @$listOfFiles; $i++)
#	Line 646 | Line 652 | dbOtherCreate
652		$location = addSlashes ($location);
653		$comment = addSlashes ($comment);
654
655	<	$query = "insert into other (id, creationTime, lastUpdateTime, lastUpdateUser, user, location, nFiles, sizeInGB, comment) values ($id, now(), now(), '$user', '$user', '$location', $nFiles, $size, '$comment')";
655	>	$query = "insert into other (id, creationTime, lastUpdateTime, lastUpdateUser, user, location, nFiles, sizeInGB, comment) values ($id, now(), now(), '$userAndHost', '$user', '$location', $nFiles, $size, '$comment')";
656		$db->selectdb ("ntuple");
657		$results = $db->query ($query);
658

Diff Legend

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