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.27 by ahart, Thu Jun 20 00:49:02 2013 UTC vs.
Revision 1.28 by ahart, Fri Aug 30 19:54:49 2013 UTC

# Line 29 | Line 29 | my $argc = @ARGV;
29   printHelp ($ARGV[0]) if $opt{"help"};
30   printHelp () if $argc != 2 && $ARGV[0] ne "createOther";
31   printHelp () if $ARGV[0] ne "create" && $ARGV[0] ne "createOther" && $ARGV[0] ne "update" && $ARGV[0] ne "finish" && $ARGV[0] ne "deprecate" && $ARGV[0] ne "uploadRelease" && $ARGV[0] ne "downloadRelease" && $ARGV[0] ne "deleteEntry" && $ARGV[0] ne "uploadConfig";
32 < if (($ARGV[0] eq "create" || $ARGV[0] eq "finish") && !$opt{"location"})
32 > if ($ARGV[0] eq "create" && !$opt{"location"})
33    {
34      print "The directory containing the ntuples must be given!\n";
35      exit;
# Line 83 | Line 83 | else
83      $status = "" if $ARGV[0] eq "update";
84      $status = "deprecated" if $ARGV[0] eq "deprecate";
85      $opt{"format"} = "BEAN" if $ARGV[0] eq "create" && !$opt{"format"};
86 +    $opt{"lumiSummary"} = "/dev/null" if $ARGV[0] eq "finish" && !$opt{"lumiSummary"};
87 +    if ($ARGV[0] eq "finish" && (!$opt{"location"} && !getLocation ($id)))
88 +      {
89 +        print "The directory containing the ntuples must be given!\n";
90 +        exit;
91 +      }
92      if ($opt{"location"} && locationExists ($id, $opt{"location"}))
93        {
94          print "This location is already registered in the database!\n";
# Line 368 | Line 374 | dbUpdate
374        $values .= ", lastUpdateUser='$user'";
375        $values .= ", format='$format'" if $format;
376        $values .= ", location='$fullLocation'" if $location;
377 <      $values .= ", fileList='$fileList'" if $fileList;
377 >      $values .= ", fileList='$fileList'" if $fileListName;
378        $values .= ", nFiles=$nFiles" if $nFiles;
379        $values .= ", sizeInGB=$size" if $size;
380        $values .= ", status='$status'" if $status;
381        $values .= ", comment='$comment'" if $comment;
382 <      $values .= ", pset='$pset'" if $pset;
383 <      $values .= ", crabCfg='$crabCfg'" if $crabCfg;
384 <      $values .= ", jsonFile='$jsonFile'" if $jsonFile;
385 <      $values .= ", lumiSummary='$lumiSummary'" if $lumiSummary;
382 >      $values .= ", pset='$pset'" if $psetName;
383 >      $values .= ", crabCfg='$crabCfg'" if $crabCfgName;
384 >      $values .= ", jsonFile='$jsonFile'" if $jsonFileName;
385 >      $values .= ", lumiSummary='$lumiSummary'" if $lumiSummaryName;
386        $values .= ", version='$release'" if $release;
387        $values .= ", globalTag='$globalTag'" if $globalTag;
388        $values .= ", crossSectionInPicobarn=$xSection" if $xSection;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines