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.1 by ahart, Wed Jun 6 12:14:37 2012 UTC vs.
Revision 1.3 by ahart, Tue Aug 7 18:10:18 2012 UTC

#	Line 10 | Line 10 | sub dbInsert;
10		sub addSlashes;
11		sub getOption;
12
13	<	our $db;
13	>	our $db = Mysql->connect ("cmshead.mps.ohio-state.edu", "ntuple", "osuT3User") or die "Failed to connect to Tier 3, stopped";
14
15		my $arg = join (" ", @ARGV);
16		if ($arg =~ m/-create/)
#	Line 43 | Line 43 | if ($arg =~ m/-create/)
43		elsif ($arg =~ m/-submit/)
44		{
45		my $workingDir = getWorkingDir (\@ARGV);
46	<	open (ID_FILE, "<$workingDir/log/.osuID");
47	<	my $id = <ID_FILE>;
48	<	close (ID_FILE);
49	<	$id =~ s/(.*)\n/$1/;
46	>	my $id = -1;
47	>	if (-e "$workingDir/log/.osuID")
48	>	{
49	>	open (ID_FILE, "<$workingDir/log/.osuID");
50	>	$id = <ID_FILE>;
51	>	close (ID_FILE);
52	>	$id =~ s/(.*)\n/$1/;
53	>	}
54		my $submissionLogName = $workingDir . "/log/crab.log";
55
56		system ("crab $arg");
57
58	<	my $results = dbUpdate ($id, "submitted", $submissionLogName);
58	>	my $results = dbUpdate ($id, "submitted", $submissionLogName) if $id > -1;
59		}
60		elsif ($arg =~ m/-report/)
61		{
62		my $workingDir = getWorkingDir (\@ARGV);
63	<	open (ID_FILE, "<$workingDir/log/.osuID");
64	<	my $id = <ID_FILE>;
65	<	close (ID_FILE);
66	<	$id =~ s/(.*)\n/$1/;
63	>	my $id = -1;
64	>	if (-e "$workingDir/log/.osuID")
65	>	{
66	>	open (ID_FILE, "<$workingDir/log/.osuID");
67	>	my $id = <ID_FILE>;
68	>	close (ID_FILE);
69	>	$id =~ s/(.*)\n/$1/;
70	>	}
71		my $lumiSummaryName = $workingDir . "/res/lumiSummary.json";
72
73		system ("crab $arg");
74
75	<	my $results = dbReport ($id, "complete", $lumiSummaryName);
75	>	my $results = dbReport ($id, "complete", $lumiSummaryName) if $id > -1;
76		}
77		else
78		{
#	Line 166 | Line 174 | dbInsert
174		$comment = addSlashes ($comment);
175
176		my $results;
169	–	$db = Mysql->connect ("cmshead.mps.ohio-state.edu", "ntuple", "osuT3User");
177		my $query = "select max(id) from ntuple";
178		$db->selectdb ("ntuple");
179		$results = $db->query ($query);
#	Line 202 | Line 209 | dbUpdate
209		$status = addSlashes ($status);
210
211		my $results;
205	–	$db = Mysql->connect ("cmshead.mps.ohio-state.edu", "ntuple", "osuT3User");
212		my $query = "update ntuple set lastUpdateTime=now(), status='$status', submissionLog='$submissionLog' where id=$id";
213		$db->selectdb ("ntuple");
214		$results = $db->query ($query);
#	Line 226 | Line 232 | dbReport
232		$status = addSlashes ($status);
233
234		my $results;
229	–	$db = Mysql->connect ("cmshead.mps.ohio-state.edu", "ntuple", "osuT3User");
235		my $query = "update ntuple set lastUpdateTime=now(), status='$status', lumiSummary='$lumiSummary' where id=$id";
236		$db->selectdb ("ntuple");
237		$results = $db->query ($query);

Diff Legend

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