ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/OSUT3Analysis/DBTools/scripts/osucrab
(Generate patch)

Comparing UserCode/OSUT3Analysis/DBTools/scripts/osucrab (file contents):
Revision 1.6 by ahart, Fri Nov 30 18:21:00 2012 UTC vs.
Revision 1.7 by ahart, Wed Dec 12 20:44:29 2012 UTC

# Line 24 | Line 24 | if ($arg =~ m/-create/)
24      my $dataset = getOption (\@crabCfg, "datasetpath");
25      my $psetName = getOption (\@crabCfg, "pset");
26      my $jsonFileName = getOption (\@crabCfg, "lumi_mask");
27 <    my $submissionLogName = getOption (\@crabCfg, "ui_working_dir");
28 <    $submissionLogName .= "/log/crab.log";
27 >    my $workingDir = getOption (\@crabCfg, "ui_working_dir");
28  
29      print "Ntuple format (BEAN): ";
30      my $format = <STDIN>;
# Line 39 | Line 38 | if ($arg =~ m/-create/)
38  
39      my $status = "created";
40      $status = "submitted" if $arg =~ m/-submit/;
41 <    my $results = dbInsert ($dataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $format, "", 0, 0, $status, $comment, $psetName, $crabCfgName, $jsonFileName, $submissionLogName);
41 >    my $results = dbInsert ($dataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $format, "", 0, 0, $status, $comment, $psetName, $crabCfgName, $jsonFileName, $workingDir);
42    }
43   elsif ($arg =~ m/-submit/)
44    {
# Line 52 | Line 51 | elsif ($arg =~ m/-submit/)
51          close (ID_FILE);
52          $id =~ s/(.*)\n/$1/;
53        }
55 –    my $submissionLogName = $workingDir . "/log/crab.log";
54  
55      system ("crab $arg");
56  
57 <    my $results = dbUpdate ($id, "submitted", $submissionLogName, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $id > -1;
57 >    my $results = dbUpdate ($id, "submitted", "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $id > -1;
58    }
59   elsif ($arg =~ m/-report/)
60    {
# Line 161 | Line 159 | dbInsert
159    my $psetName = shift;
160    my $crabCfgName = shift;
161    my $jsonFileName = shift;
162 <  my $submissionLogName = shift;
162 >  my $workingDir = shift;
163  
164    my $user = $userAndHost;
165    $user =~ s/@.*$//;
# Line 178 | Line 176 | dbInsert
176    my @jsonFile = <JSON_FILE>;
177    close (JSON_FILE);
178    my $jsonFile = join ("", @jsonFile);
181 –  open (SUBMISSION_LOG, "<$submissionLogName");
182 –  my @submissionLog = <SUBMISSION_LOG>;
183 –  close (SUBMISSION_LOG);
184 –  my $submissionLog = join ("", @submissionLog);
179  
180    $dataset = addSlashes ($dataset);
181    $user = addSlashes ($user);
# Line 189 | Line 183 | dbInsert
183    $pset = addSlashes ($pset);
184    $crabCfg = addSlashes ($crabCfg);
185    $jsonFile = addSlashes ($jsonFile);
192 –  $submissionLog = addSlashes ($submissionLog);
186    $location = addSlashes ($location);
187    $status = addSlashes ($status);
188    $comment = addSlashes ($comment);
# Line 202 | Line 195 | dbInsert
195    my $id = 1;
196    $id = $row[0] + 1 if $results->numrows ();
197  
205 –  my $workingDir = $submissionLogName;
206 –  $workingDir =~ s/(.*)\/log\/crab\.log/$1/;
198    open (ID_FILE, ">$workingDir/log/.osuID");
199    print ID_FILE "$id\n";
200    close (ID_FILE);
201  
202 <  $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')";
202 >  $query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile) values ($id, '$dataset', now(), now(), '$userAndHost', '$user', '$format', '$location', $nFiles, $sizeInGB, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile')";
203    $results = $db->query ($query);
204  
205    return $results;
# Line 219 | Line 210 | dbUpdate
210   {
211    my $id = shift;
212    my $status = shift;
222 –  my $submissionLogName = shift;
213    my $user = shift;
214  
225 –  open (SUBMISSION_LOG, "<$submissionLogName");
226 –  my @submissionLog = <SUBMISSION_LOG>;
227 –  close (SUBMISSION_LOG);
228 –  my $submissionLog = join ("", @submissionLog);
229 –
230 –  $submissionLog = addSlashes ($submissionLog);
215    $status = addSlashes ($status);
216    $user = addSlashes ($user);
217  
218    my $results;
219 <  my $query = "update ntuple set lastUpdateTime=now(), lastUpdateUser='$user', status='$status', submissionLog='$submissionLog' where id=$id";
219 >  my $query = "update ntuple set lastUpdateTime=now(), lastUpdateUser='$user', status='$status' where id=$id";
220    $db->selectdb ("ntuple");
221    $results = $db->query ($query);
222  

Diff Legend

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