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.7 by ahart, Wed Aug 1 14:35:07 2012 UTC vs.
Revision 1.23 by ahart, Thu Feb 7 09:04:47 2013 UTC

# Line 7 | Line 7 | use File::Copy;
7  
8   sub getDataset;
9   sub dbUpdate;
10 + sub dbUpdateOther;
11   sub dbDelete;
12 + sub dbDeleteOther;
13   sub addSlashes;
14   sub uploadRelease;
15 + sub downloadRelease;
16 + sub datasetExists;
17 + sub uploadConfig;
18 + sub locationExists;
19  
20   our $db = Mysql->connect ("cmshead.mps.ohio-state.edu", "ntuple", "osuT3User") or die "Failed to connect to Tier 3, stopped";
21  
22   my %opt;
23   Getopt::Long::Configure ("bundling");
24 < GetOptions (\%opt, "comment|c=s", "format|f=s", "pyConfig|p=s", "crabCfg|b=s", "jsonFile|j=s", "lumiSummary|s=s", "location|l=s", "fileList|t=s", "release|r=s", "help|h");
24 > GetOptions (\%opt, "comment|c=s", "format|f=s", "pyConfig|p=s", "crabCfg|b=s", "jsonFile|j=s", "lumiSummary|s=s", "location|l=s", "name|n=s", "fileList|t=s", "release|r=s", "other|o", "recipe|e=s", "globalTag|g=s", "configName|i=s", "xSection|x=s", "help|h");
25   my $argc = @ARGV;
26  
27   printHelp ($ARGV[0]) if $opt{"help"};
28 < printHelp () if $argc != 2;
29 < printHelp () if $ARGV[0] ne "create" && $ARGV[0] ne "update" && $ARGV[0] ne "finish" && $ARGV[0] ne "deprecate" && $ARGV[0] ne "uploadRelease" && $ARGV[0] ne "deleteEntry";
28 > printHelp () if $argc != 2 && $ARGV[0] ne "createOther";
29 > 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";
30   if (($ARGV[0] eq "create" || $ARGV[0] eq "finish") && !$opt{"location"})
31    {
32      print "The directory containing the ntuples must be given!\n";
33      exit;
34    }
35 < if ($ARGV[0] eq "uploadRelease" && !$opt{"pyConfig"} && !$opt{"release"})
35 > if ($ARGV[0] eq "uploadRelease" && (!$opt{"pyConfig"} || !$opt{"release"} || !$opt{"recipe"}))
36    {
37 <    print "Both the Python and the CMSSW release must be given!\n";
37 >    print "The Python config, CMSSW release directory, and recipe file must be given!\n";
38      exit;
39    }
40 < if ($ARGV[0] ne "uploadRelease")
40 > if ($ARGV[0] eq "uploadConfig" && (!$opt{"pyConfig"} || !$opt{"release"}))
41    {
42 <    my $id = -1;
43 <    my $fullDataset;
38 <    ($id, $fullDataset) = getDataset ($ARGV[0], $ARGV[1]) if $ARGV[0] ne "create";
39 <    $fullDataset = $ARGV[1] if $id < 0;
40 <    $ARGV[0] = "create" if $id < 0;
41 <    my $status = "present";
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 <    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";
42 >    print "The Python config and ntuple release must be given!\n";
43 >    exit;
44    }
45 < else
45 > if ($ARGV[0] eq "uploadRelease")
46    {
47      my $parentDir = "./$opt{'release'}";
48      $parentDir =~ s/CMSSW_[^\/]*//g;
# Line 54 | Line 51 | else
51      $cmsswRelease =~ s/^.*CMSSW_([^\/]*).*$/CMSSW_$1/;
52      `tar -C $parentDir -czf $ARGV[1].tar.gz $opt{"release"}`;
53      $opt{"format"} = "BEAN" if !$opt{"format"};
54 <    uploadRelease ($opt{"format"}, $cmsswRelease, "$ARGV[1].tar.gz", $opt{"pyConfig"}, $ARGV[1], $ENV{"USER"}, $opt{"comment"});
54 >    uploadRelease ($opt{"format"}, $cmsswRelease, "$ARGV[1].tar.gz", $opt{"pyConfig"}, $ARGV[1], "$ENV{'USER'}", $opt{"comment"}, $opt{"recipe"});
55 >  }
56 > elsif ($ARGV[0] eq "downloadRelease")
57 >  {
58 >    downloadRelease ($ARGV[1], $opt{"pyConfig"});
59 >  }
60 > elsif ($ARGV[0] eq "uploadConfig")
61 >  {
62 >    uploadConfig ($ARGV[1], $ENV{"USER"}, $opt{"pyConfig"}, $opt{"release"}, $opt{"comment"});
63 >  }
64 > elsif ($ARGV[0] eq "createOther")
65 >  {
66 >    my @listOfFiles = @ARGV;
67 >    @listOfFiles = reverse (@listOfFiles);
68 >    pop (@listOfFiles);
69 >    @listOfFiles = reverse (@listOfFiles);
70 >    dbOtherCreate ("$ENV{'USER'}\@$ENV{'HOSTNAME'}", \@listOfFiles, $opt{"comment"});
71 >  }
72 > else
73 >  {
74 >    my $id = -1;
75 >    my $fullDataset;
76 >    ($id, $fullDataset) = getDataset ($ARGV[0], $ARGV[1]) if $ARGV[0] ne "create" && ($ARGV[0] ne "update" || !$opt{"other"}) && ($ARGV[0] ne "deleteEntry" || !$opt{"other"});
77 >    $id = $ARGV[1] if ($ARGV[0] eq "update" && $opt{"other"}) || ($ARGV[0] eq "deleteEntry" && $opt{"other"});
78 >    $fullDataset = $ARGV[1] if $id < 0;
79 >    $ARGV[0] = "create" if $id < 0;
80 >    my $status = "present";
81 >    $status = "" if $ARGV[0] eq "update";
82 >    $status = "deprecated" if $ARGV[0] eq "deprecate";
83 >    $opt{"format"} = "BEAN" if $ARGV[0] eq "create" && !$opt{"format"};
84 >    if ($opt{"location"} && locationExists ($id, $opt{"location"}))
85 >      {
86 >        print "This location is already registered in the database!\n";
87 >        exit;
88 >      }
89 >    dbUpdate ($id, $fullDataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $opt{"format"}, $opt{"location"}, $opt{"name"}, $opt{"fileList"}, $status, $opt{"comment"}, $opt{"pyConfig"}, $opt{"crabCfg"}, $opt{"jsonFile"}, $opt{"lumiSummary"}, $opt{"release"}, $opt{"globalTag"}, $opt{"configName"}, $opt{"xSection"}) if !$opt{"other"};
90 >    dbUpdateOther ($id, $opt{"comment"}, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $opt{"other"};
91 >    dbDelete ($id) if $ARGV[0] eq "deleteEntry" && !$opt{"other"};
92 >    dbDeleteOther ($id) if $ARGV[0] eq "deleteEntry" && $opt{"other"};
93    }
94  
95   sub
# Line 80 | Line 115 | getDataset
115    my $queryDataset = $dataset;
116    $queryDataset =~ s/\*/%/g;
117    $queryDataset =~ s/(.*)/%$1%/g;
118 <  my $query = "select id,dataset,user,creationTime from ntuple where dataset like '$queryDataset' order by lastUpdateTime";
118 >  my $query = "select id,dataset,user,creationTime from ntuple where dataset like '$queryDataset' order by creationTime";
119    $db->selectdb ("ntuple");
120    $results = $db->query ($query);
121    if ($results->numrows () == 1)
# Line 144 | Line 179 | dbUpdate
179   {
180    my $id = shift;
181    my $dataset = shift;
182 <  my $user = shift;
182 >  my $userAndHost = shift;
183    my $format = shift;
184    my $location = shift;
185 +  my $name = shift;
186    my $fileListName = shift;
187    my $status = shift;
188    my $comment = shift;
# Line 155 | Line 191 | dbUpdate
191    my $jsonFileName = shift;
192    my $lumiSummaryName = shift;
193    my $release = shift;
194 +  my $globalTag = shift;
195 +  my $configName = shift;
196 +  my $xSection = shift;
197 +
198 +  my $user = $userAndHost;
199 +  $user =~ s/@.*$//g;
200  
201    my $fileList;
202    my $pset;
# Line 223 | Line 265 | dbUpdate
265        close (LUMI_SUMMARY);
266        $lumiSummary = join ("", @lumiSummary);
267      }
268 <  if ($release)
227 <    {
228 <      my $query = "select id from ntupleRelease where name='$release'";
229 <      $db->selectdb ("ntuple");
230 <      my $results = $db->query ($query);
231 <      if ($results->numrows () != 1)
232 <        {
233 <          print "Ntuple release \"$release\" not found!\n";
234 <          exit;
235 <        }
236 <    }
268 >  $release .= ".$configName" if $configName;
269    ($nFiles, $size) = sizeOfDataset ($dataset, $location, $fileList);
270    my $fullLocation = $location;
271    $fullLocation = "$ENV{'PWD'}/$location" if !($location =~ m/^\//);
# Line 246 | Line 278 | dbUpdate
278    $jsonFile = addSlashes ($jsonFile);
279    $lumiSummary = addSlashes ($lumiSummary);
280    $fullLocation = addSlashes ($fullLocation);
281 +  $name = addSlashes ($name);
282    $fileList = addSlashes ($fileList);
283    $status = addSlashes ($status);
284    $comment = addSlashes ($comment);
285    $release = addSlashes ($release);
286 +  $globalTag = addSlashes ($globalTag);
287  
288    my $results;
289    my $query;
290    if ($id < 0)
291      {
292 +      $query = "select id from ntuple where dataset='$dataset'";
293 +      $db->selectdb ("ntuple");
294 +      $results = $db->query ($query);
295 +      if ($results->numrows ())
296 +        {
297 +          print "This dataset already exists in the database. Create anyway? (y/N): ";
298 +          my $response = <STDIN>;
299 +          $response =~ s/\n//g;
300 +          $response = "n" if !$response;
301 +          exit if substr (lc ($response), 0, 1) ne 'y';
302 +        }
303 +
304        $query = "select max(id) from ntuple";
305        $db->selectdb ("ntuple");
306        $results = $db->query ($query);
# Line 262 | Line 308 | dbUpdate
308        my $id = 1;
309        $id = $row[0] + 1 if $results->numrows ();
310  
311 <      $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')";
311 >      $query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version, globalTag, crossSectionInPicobarn) values ($id, '$dataset', now(), now(), '$userAndHost', '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release', '$globalTag', $xSection)";
312      }
313    if ($id > 0)
314      {
315        my $fields;
316        my $values;
317  
318 <      $values .= ", dataset='$dataset'" if $dataset;
318 >      if ($name)
319 >        {
320 >          $query = "select id from ntuple where dataset='$name'";
321 >          $db->selectdb ("ntuple");
322 >          $results = $db->query ($query);
323 >          if ($results->numrows ())
324 >            {
325 >              print "This dataset already exists in the database. Create anyway? (y/N): ";
326 >              my $response = <STDIN>;
327 >              $response =~ s/\n//g;
328 >              $response = "n" if !$response;
329 >              exit if substr (lc ($response), 0, 1) ne 'y';
330 >            }
331 >          $values .= ", dataset='$name'";
332 >        }
333 >
334        $values .= ", lastUpdateTime=now()";
335 +      $values .= ", lastUpdateUser='$user'";
336        $values .= ", format='$format'" if $format;
337        $values .= ", location='$fullLocation'" if $location;
338        $values .= ", fileList='$fileList'" if $fileList;
# Line 283 | Line 345 | dbUpdate
345        $values .= ", jsonFile='$jsonFile'" if $jsonFile;
346        $values .= ", lumiSummary='$lumiSummary'" if $lumiSummary;
347        $values .= ", version='$release'" if $release;
348 +      $values .= ", globalTag='$globalTag'" if $globalTag;
349 +      $values .= ", crossSectionInPicobarn=$xSection" if $xSection;
350  
351        $values =~ s/^, //;
352        $query = "update ntuple set $values where id=$id";
# Line 293 | Line 357 | dbUpdate
357   }
358  
359   sub
360 + dbUpdateOther
361 + {
362 +  my $id = shift;
363 +  my $comment = shift;
364 +  my $user = shift;
365 +
366 +  $comment = addSlashes ($comment);
367 +
368 +  my $query = "update other set lastUpdateTime=now(), lastUpdateUser='$user', comment='$comment'  where id=$id";
369 +  $db->selectdb ("ntuple");
370 +  my $results = $db->query ($query);
371 +
372 +  return $results;
373 + }
374 +
375 + sub
376   dbDelete
377   {
378    my $id = shift;
379  
300  return if $id < 0;
380    my $query = "delete from ntuple where id=$id";
381    $db->selectdb ("ntuple");
382    my $results = $db->query ($query);
383   }
384  
385   sub
386 + dbDeleteOther
387 + {
388 +  my $id = shift;
389 +
390 +  my $query = "delete from other where id=$id";
391 +  $db->selectdb ("ntuple");
392 +  my $results = $db->query ($query);
393 + }
394 +
395 + sub
396   printHelp
397   {
398    my $command = shift;
# Line 321 | Line 410 | printHelp
410        printf "%-29s%s\n", "  -b, --crabCfg FILE", "CRAB config used to submit ntuple jobs";
411        printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
412        printf "%-29s%s\n", "  -f, --format FORMAT", "ntuple format (default: BEAN)";
413 +      printf "%-29s%s\n", "  -g, --globalTag TAG", "global tag";
414 +      printf "%-29s%s\n", "  -i, --configName NAME", "name of config used to produce ntuples";
415        printf "%-29s%s\n", "  -j, --jsonFile FILE", "JSON file used for this dataset";
416        printf "%-29s%s\n", "  -l, --location DIRECTORY", "directory containing the ntuples";
417        printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config used to produce ntuples";
418        printf "%-29s%s\n", "  -r, --release NAME", "ntuple release used to produce ntuples";
419        printf "%-29s%s\n", "  -s, --lumiSummary FILE", "lumiSummary.json reported by CRAB";
420 +      printf "%-29s%s\n", "  -x, --xSection XSEC", "cross section in picobarns for the sample";
421 +    }
422 +  elsif ($command eq "createOther")
423 +    {
424 +      print "Usage: $exeName [OPTION]... createOther DIRECTORIES_AND_FILES\n";
425 +      print "Creates an entry in the database for non-ntuple data.\n";
426 +      print "\n";
427 +      print "Mandatory arguments to long options are mandatory for short options too.\n";
428 +      printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
429      }
430    elsif ($command eq "update")
431      {
# Line 336 | Line 436 | printHelp
436        printf "%-29s%s\n", "  -b, --crabCfg FILE", "CRAB config used to submit ntuple jobs";
437        printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
438        printf "%-29s%s\n", "  -f, --format FORMAT", "ntuple format";
439 +      printf "%-29s%s\n", "  -g, --globalTag TAG", "global tag";
440 +      printf "%-29s%s\n", "  -i, --configName NAME", "name of config used to produce ntuples";
441        printf "%-29s%s\n", "  -j, --jsonFile FILE", "JSON file used for this dataset";
442        printf "%-29s%s\n", "  -l, --location DIRECTORY", "directory containing the ntuples";
443 +      printf "%-29s%s\n", "  -n, --name NAME", "rename the entry";
444 +      printf "%-29s%s\n", "  -o, --other", "update an entry in the non-ntuple database";
445        printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config used to produce ntuples";
446        printf "%-29s%s\n", "  -r, --release NAME", "ntuple release used to produce ntuples";
447        printf "%-29s%s\n", "  -s, --lumiSummary FILE", "lumiSummary.json reported by CRAB";
448 +      printf "%-29s%s\n", "  -x, --xSection XSEC", "cross section in picobarns for the sample";
449      }
450    elsif ($command eq "finish")
451      {
452        print "Usage: $exeName -l DIRECTORY finish NAME\n";
348
453        print "Finalizes the database entry for dataset NAME, changing its status to\n";
454        print "\"present\".  This is intended to be the final step in command-line based ntuple\n";
455        print "production.\n";
# Line 355 | Line 459 | printHelp
459      }
460    elsif ($command eq "deleteEntry")
461      {
462 <      print "Usage: $exeName deleteEntry NAME\n";
462 >      print "Usage: $exeName [OPTION]... deleteEntry NAME\n";
463        print "Deletes the database entry for dataset NAME. This is intended primarily for\n";
464        print "mistaken database entries. If you wish to actually delete a set of ntuples,\n";
465        print "please use the \"deprecate\" command instead.\n";
466 +      print "\n";
467 +      printf "%-29s%s\n", "  -o, --other", "update an entry in the non-ntuple database";
468      }
469    elsif ($command eq "deprecate")
470      {
# Line 369 | Line 475 | printHelp
475      }
476    elsif ($command eq "uploadRelease")
477      {
478 <      print "Usage: $exeName -p FILE -r DIRECTORY [OPTION]... uploadRelease NAME\n";
478 >      print "Usage: $exeName -e FILE -p FILE -r DIRECTORY [OPTION]... uploadRelease NAME\n";
479        print "Copies an ntuple release to the appropriate area on the Tier 3, and creates a\n";
480        print "database entry for it, with NAME being the name of the release. An ntuple\n";
481        print "release is a CMSSW release with all the necessary packages added for creating\n";
# Line 377 | Line 483 | printHelp
483        print "\n";
484        print "Mandatory arguments to long options are mandatory for short options too.\n";
485        printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
486 +      printf "%-29s%s\n", "  -e, --recipe FILE", "file containing the recipe for the release";
487        printf "%-29s%s\n", "  -f, --format FORMAT", "ntuple format (default: BEAN)";
488        printf "%-29s%s\n", "  -p, --pyConfig FILE", "default Python config for the release";
489        printf "%-29s%s\n", "  -r, --release DIRECTORY", "CMSSW release containing ntuple packages";
490      }
491 +  elsif ($command eq "downloadRelease")
492 +    {
493 +      print "Usage: $exeName [OPTION]... downloadRelease NAME\n";
494 +      print "Copies an ntuple release to the current directory on the Tier 3. Optionally\n";
495 +      print "copies the corresponding Python configuration file registered in the database.\n";
496 +      print "\n";
497 +      print "Mandatory arguments to long options are mandatory for short options too.\n";
498 +      printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python configuration file name";
499 +    }
500 +  elsif ($command eq "uploadConfig")
501 +    {
502 +      print "Usage: $exeName -p FILE -r RELEASE [OPTION]... uploadConfig NAME\n";
503 +      print "Creates an entry in the database for a customized Python configuration file.\n";
504 +      print "\n";
505 +      print "Mandatory arguments to long options are mandatory for short options too.\n";
506 +      printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
507 +      printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config file";
508 +      printf "%-29s%s\n", "  -r, --release NAME", "ntuple release with which to use this config";
509 +    }
510    else
511      {
512        print "Usage: $exeName [OPTION]... COMMAND NAME\n";
# Line 392 | Line 518 | printHelp
518        print "\n";
519        print "COMMAND may be one of the following:\n";
520        printf "%-29s%s\n", "  create", "creates the entry";
521 +      printf "%-29s%s\n", "  createOther", "creates an entry for non-ntuple data";
522        printf "%-29s%s\n", "  update", "updates the entry";
523        printf "%-29s%s\n", "  finish", "finalizes the database entry";
524        printf "%-29s%s\n", "  deleteEntry", "removes the database entry";
525        printf "%-29s%s\n", "  deprecate", "marks the dataset for deletion";
526        printf "%-29s%s\n", "  uploadRelease", "upload an ntuple release";
527 +      printf "%-29s%s\n", "  downloadRelease", "download an ntuple release";
528 +      printf "%-29s%s\n", "  uploadConfig", "upload an ntuple config";
529      }
530  
531    exit;
# Line 450 | Line 579 | uploadRelease
579    my $name = shift;
580    my $user = shift;
581    my $comment = shift;
582 +  my $recipeName = shift;
583  
454  move ($release, "/home/hart/public_html/releases/$name.tar.gz") or die "Ntuple releases may only be uploaded on the Tier 3, stopped";
584    if (!(-e $psetName))
585      {
586        print "$psetName does not exist!\n";
587        exit;
588      }
589 +  if (!(-e $recipeName))
590 +    {
591 +      print "$recipeName does not exist!\n";
592 +      exit;
593 +    }
594 +  move ($release, "/home/osucms/public_html/releases/$name.tar.gz") or die "Ntuple releases may only be uploaded on the Tier 3, stopped";
595    open (PY_CONFIG, "<$psetName");
596    my @pset = <PY_CONFIG>;
597    close (PY_CONFIG);
598    my $pset = join ("", @pset);
599 +  open (RECIPE, "<$recipeName");
600 +  my @recipe = <RECIPE>;
601 +  close (RECIPE);
602 +  my $recipe = join ("\n", @recipe);
603  
604    my $query = "select max(id) from ntupleRelease";
605    $db->selectdb ("ntuple");
# Line 475 | Line 614 | uploadRelease
614    $format = addSlashes ($format);
615    $cmsswRelease = addSlashes ($cmsswRelease);
616    $comment = addSlashes ($comment);
617 +  $recipe = addSlashes ($recipe);
618  
619 <  my $query = "insert into ntupleRelease (id, name, pset, user, pending, format, cmsswRelease, comment) values ($id, '$name', '$pset', '$user', 1, '$format', '$cmsswRelease', '$comment')";
619 >  my $query = "insert into ntupleRelease (id, name, pset, user, pending, format, cmsswRelease, comment, recipe) values ($id, '$name', '$pset', '$user', 1, '$format', '$cmsswRelease', '$comment', '$recipe')";
620    $db->selectdb ("ntuple");
621    my $results = $db->query ($query);
622   }
623 +
624 + sub
625 + downloadRelease
626 + {
627 +  my $release = shift;
628 +  my $pyConfigName = shift;
629 +
630 +  my $query = "select id,pset from ntupleRelease where name='$release'";
631 +  $db->selectdb ("ntuple");
632 +  my $results = $db->query ($query);
633 +  if ($results->numrows () != 1)
634 +    {
635 +      print "Ntuple release \"$release\" not found!\n";
636 +      exit;
637 +    }
638 +  if ($pyConfigName)
639 +    {
640 +      my @row = $results->fetchrow ();
641 +      open (PY_CONFIG, ">$pyConfigName");
642 +      print PY_CONFIG $row[1];
643 +      close (PY_CONFIG);
644 +    }
645 +  `wget "http://cmshead.mps.ohio-state.edu/~osucms/releases/$release.tar.gz"`;
646 + }
647 +
648 + sub
649 + dbOtherCreate
650 + {
651 +  my $userAndHost = shift;
652 +  my $listOfFiles = shift;
653 +  my $comment = shift;
654 +
655 +  my $user = $userAndHost;
656 +  $user =~ s/@.*$//g;
657 +
658 +  my $size = 0.0;
659 +  my $nFiles = 0.0;
660 +  for (my $i = 0; $i < @$listOfFiles; $i++)
661 +    {
662 +      if (!(-e $$listOfFiles[$i]))
663 +        {
664 +          print "$$listOfFiles[$i] does not exist!\n";
665 +          exit;
666 +        }
667 +      $nFiles += `ls -R $$listOfFiles[$i] | grep -v ':\$' | grep -v '^\$' | wc -l`;
668 +      my $fileSize = `du -s $$listOfFiles[$i]`;
669 +      $fileSize =~ s/([^ ]*) .*/$1/;
670 +      $fileSize /= 1024 * 1024;
671 +      $size += $fileSize;
672 +      $$listOfFiles[$i] = "$ENV{'PWD'}/$$listOfFiles[$i]" if !($$listOfFiles[$i] =~ m/^\//);
673 +    }
674 +  $size = sprintf "%.2f", $size;
675 +  my $location = join ("<br />", @$listOfFiles);
676 +
677 +  my $query = "select max(id) from other";
678 +  $db->selectdb ("ntuple");
679 +  my $results = $db->query ($query);
680 +  my @row = $results->fetchrow ();
681 +  my $id = 1;
682 +  $id = $row[0] + 1 if $results->numrows ();
683 +
684 +  $user = addSlashes ($user);
685 +  $location = addSlashes ($location);
686 +  $comment = addSlashes ($comment);
687 +
688 +  $query = "insert into other (id, creationTime, lastUpdateTime, lastUpdateUser, user, location, nFiles, sizeInGB, comment) values ($id, now(), now(), '$userAndHost', '$user', '$location', $nFiles, $size, '$comment')";
689 +  $db->selectdb ("ntuple");
690 +  $results = $db->query ($query);
691 +
692 +  print "ID $id\n";
693 + }
694 +
695 + sub
696 + uploadConfig
697 + {
698 +  my $name = shift;
699 +  my $user = shift;
700 +  my $psetName = shift;
701 +  my $release = shift;
702 +  my $comment = shift;
703 +
704 +  if (!(-e $psetName))
705 +    {
706 +      print "$psetName does not exist!\n";
707 +      exit;
708 +    }
709 +  if ($release)
710 +    {
711 +      my $query = "select id from ntupleRelease where name='$release'";
712 +      $db->selectdb ("ntuple");
713 +      my $results = $db->query ($query);
714 +      if ($results->numrows () != 1)
715 +        {
716 +          print "Ntuple release \"$release\" not found!\n";
717 +          exit;
718 +        }
719 +    }
720 +  open (PSET, "<$psetName");
721 +  my @pset = <PSET>;
722 +  close (PSET);
723 +  my $pset = join ("", @pset);
724 +
725 +  my $query = "select max(id) from ntupleConfig";
726 +  $db->selectdb ("ntuple");
727 +  my $results = $db->query ($query);
728 +  my @row = $results->fetchrow ();
729 +  my $id = 1;
730 +  $id = $row[0] + 1 if $results->numrows ();
731 +
732 +  $name = addSlashes ($name);
733 +  $user = addSlashes ($user);
734 +  $pset = addSlashes ($pset);
735 +  $release = addSlashes ($release);
736 +  $comment = addSlashes ($comment);
737 +
738 +  my $query = "insert into ntupleConfig (id, name, pset, user, pending, ntupleRelease, comment) values ($id, '$name', '$pset', '$user', 1, '$release', '$comment')";
739 +  $db->selectdb ("ntuple");
740 +  $results = $db->query ($query);
741 + }
742 +
743 + sub
744 + locationExists
745 + {
746 +  my $id = shift;
747 +  my $location = shift;
748 +
749 +  $location =~ s/^(.*)\/+$/$1/;
750 +  my $query = "select id from ntuple where location like '$location%' and id!=$id";
751 +  $db->selectdb ("ntuple");
752 +  my $results = $db->query ($query);
753 +  return 1 if $results->numrows ();
754 +
755 +  if ($location =~ m/^\/store\/.*$/)
756 +    {
757 +      $location =~ s/^\/store\/(.*)$/\/data\/se\/store\/$1/;
758 +    }
759 +  elsif ($location =~ m/^\/data\/se\/store\/.*$/)
760 +    {
761 +      $location =~ s/^\/data\/se\/store\/(.*)$/\/store\/$1/;
762 +    }
763 +
764 +  my $query = "select id from ntuple where location like '$location%' and id!=$id";
765 +  $db->selectdb ("ntuple");
766 +  my $results = $db->query ($query);
767 +  return 1 if $results->numrows ();
768 +
769 +  return 0;
770 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines