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

Comparing UserCode/OSUT3Analysis/DBTools/scripts/osudb (file contents):
Revision 1.5 by ahart, Tue Jul 31 14:55:05 2012 UTC vs.
Revision 1.7 by ahart, Wed Aug 1 14:35:07 2012 UTC

# Line 42 | Line 42 | if ($ARGV[0] ne "uploadRelease")
42      $status = "" if $ARGV[0] eq "update";
43      $status = "deprecated" if $ARGV[0] eq "deprecate";
44      $opt{"format"} = "BEAN" if $ARGV[0] eq "create" && !$opt{"format"};
45 –    $opt{"location"} = "$ENV{'PWD'}/$opt{'location'}" if !($opt{"location"} =~ m/^\//);
45      dbUpdate ($id, $fullDataset, $ENV{"USER"}, $opt{"format"}, $opt{"location"}, $opt{"fileList"}, $status, $opt{"comment"}, $opt{"pyConfig"}, $opt{"crabCfg"}, $opt{"jsonFile"}, $opt{"lumiSummary"}, $opt{"release"});
46      dbDelete ($id) if $ARGV[0] eq "deleteEntry";
47    }
# Line 236 | Line 235 | dbUpdate
235          }
236      }
237    ($nFiles, $size) = sizeOfDataset ($dataset, $location, $fileList);
238 +  my $fullLocation = $location;
239 +  $fullLocation = "$ENV{'PWD'}/$location" if !($location =~ m/^\//);
240  
241    $dataset = addSlashes ($dataset);
242    $user = addSlashes ($user);
# Line 244 | Line 245 | dbUpdate
245    $crabCfg = addSlashes ($crabCfg);
246    $jsonFile = addSlashes ($jsonFile);
247    $lumiSummary = addSlashes ($lumiSummary);
248 <  $location = addSlashes ($location);
248 >  $fullLocation = addSlashes ($fullLocation);
249    $fileList = addSlashes ($fileList);
250    $status = addSlashes ($status);
251    $comment = addSlashes ($comment);
# Line 261 | Line 262 | dbUpdate
262        my $id = 1;
263        $id = $row[0] + 1 if $results->numrows ();
264  
265 <      $query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version) values ($id, '$dataset', now(), now(), '$user', '$format', '$location', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release')";
265 >      $query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version) values ($id, '$dataset', now(), now(), '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release')";
266      }
267    if ($id > 0)
268      {
# Line 271 | Line 272 | dbUpdate
272        $values .= ", dataset='$dataset'" if $dataset;
273        $values .= ", lastUpdateTime=now()";
274        $values .= ", format='$format'" if $format;
275 <      $values .= ", location='$location'" if $location;
275 >      $values .= ", location='$fullLocation'" if $location;
276        $values .= ", fileList='$fileList'" if $fileList;
277        $values .= ", nFiles=$nFiles" if $nFiles;
278        $values .= ", sizeInGB=$size" if $size;
# Line 408 | Line 409 | sizeOfDataset
409    my $location = shift;
410    my $fileList = shift;
411  
411 –  my $query = "select nFiles from ntuple where dataset='$dataset'";
412 –  $db->selectdb ("ntuple");
413 –  my $results = $db->query ($query);
414 –  my @row = $results->fetchrow ();
415 –  my $previousNFiles = 0;
416 –  $previousNFiles = $row[0] if $results->numrows ();
417 –
412    my $size = 0.0;
413    my $nFiles = 0;
414 <  if ($location && !$fileList && $previousNFiles < 1)
414 >  if ($location && !$fileList)
415      {
416        if (!(-e $location))
417          {

Diff Legend

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