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", "other|o", "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 && $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 "deleteEntry"; |
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] eq "uploadConfig" && (!$opt{"pyConfig"} || !$opt{"release"})) |
41 |
> |
{ |
42 |
> |
print "The Python config and ntuple release must be given!\n"; |
43 |
|
exit; |
44 |
|
} |
45 |
|
if ($ARGV[0] eq "uploadRelease") |
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 |
|
{ |
67 |
|
@listOfFiles = reverse (@listOfFiles); |
68 |
|
pop (@listOfFiles); |
69 |
|
@listOfFiles = reverse (@listOfFiles); |
70 |
< |
dbOtherCreate ($ENV{"USER"}, \@listOfFiles, $opt{"comment"}); |
70 |
> |
dbOtherCreate ("$ENV{'USER'}\@$ENV{'HOSTNAME'}", \@listOfFiles, $opt{"comment"}); |
71 |
|
} |
72 |
|
else |
73 |
|
{ |
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 |
< |
dbUpdate ($id, $fullDataset, $ENV{"USER"}, $opt{"format"}, $opt{"location"}, $opt{"fileList"}, $status, $opt{"comment"}, $opt{"pyConfig"}, $opt{"crabCfg"}, $opt{"jsonFile"}, $opt{"lumiSummary"}, $opt{"release"}) if !$opt{"other"}; |
85 |
< |
dbUpdateOther ($id, $opt{"comment"}, $ENV{"USER"}) if $opt{"other"}; |
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 |
|
} |
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; |
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; |
265 |
|
close (LUMI_SUMMARY); |
266 |
|
$lumiSummary = join ("", @lumiSummary); |
267 |
|
} |
268 |
< |
if ($release) |
241 |
< |
{ |
242 |
< |
my $query = "select id from ntupleRelease where name='$release'"; |
243 |
< |
$db->selectdb ("ntuple"); |
244 |
< |
my $results = $db->query ($query); |
245 |
< |
if ($results->numrows () != 1) |
246 |
< |
{ |
247 |
< |
print "Ntuple release \"$release\" not found!\n"; |
248 |
< |
exit; |
249 |
< |
} |
250 |
< |
} |
268 |
> |
$release .= ".$configName" if $configName; |
269 |
|
($nFiles, $size) = sizeOfDataset ($dataset, $location, $fileList); |
270 |
|
my $fullLocation = $location; |
271 |
|
$fullLocation = "$ENV{'PWD'}/$location" if !($location =~ m/^\//); |
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); |
308 |
|
my $id = 1; |
309 |
|
$id = $row[0] + 1 if $results->numrows (); |
310 |
|
|
311 |
< |
$query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version) values ($id, '$dataset', now(), now(), '$user', '$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)" if $xSection; |
312 |
> |
$query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version, globalTag) values ($id, '$dataset', now(), now(), '$userAndHost', '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release', '$globalTag')" if !$xSection; |
313 |
|
} |
314 |
|
if ($id > 0) |
315 |
|
{ |
316 |
|
my $fields; |
317 |
|
my $values; |
318 |
|
|
319 |
< |
$values .= ", dataset='$dataset'" if $dataset; |
319 |
> |
if ($name) |
320 |
> |
{ |
321 |
> |
$query = "select id from ntuple where dataset='$name'"; |
322 |
> |
$db->selectdb ("ntuple"); |
323 |
> |
$results = $db->query ($query); |
324 |
> |
if ($results->numrows ()) |
325 |
> |
{ |
326 |
> |
print "This dataset already exists in the database. Create anyway? (y/N): "; |
327 |
> |
my $response = <STDIN>; |
328 |
> |
$response =~ s/\n//g; |
329 |
> |
$response = "n" if !$response; |
330 |
> |
exit if substr (lc ($response), 0, 1) ne 'y'; |
331 |
> |
} |
332 |
> |
$values .= ", dataset='$name'"; |
333 |
> |
} |
334 |
> |
|
335 |
|
$values .= ", lastUpdateTime=now()"; |
336 |
|
$values .= ", lastUpdateUser='$user'"; |
337 |
|
$values .= ", format='$format'" if $format; |
346 |
|
$values .= ", jsonFile='$jsonFile'" if $jsonFile; |
347 |
|
$values .= ", lumiSummary='$lumiSummary'" if $lumiSummary; |
348 |
|
$values .= ", version='$release'" if $release; |
349 |
+ |
$values .= ", globalTag='$globalTag'" if $globalTag; |
350 |
+ |
$values .= ", crossSectionInPicobarn=$xSection" if $xSection; |
351 |
|
|
352 |
|
$values =~ s/^, //; |
353 |
|
$query = "update ntuple set $values where id=$id"; |
411 |
|
printf "%-29s%s\n", " -b, --crabCfg FILE", "CRAB config used to submit ntuple jobs"; |
412 |
|
printf "%-29s%s\n", " -c, --comment COMMENT", "comment for the database entry"; |
413 |
|
printf "%-29s%s\n", " -f, --format FORMAT", "ntuple format (default: BEAN)"; |
414 |
+ |
printf "%-29s%s\n", " -g, --globalTag TAG", "global tag"; |
415 |
+ |
printf "%-29s%s\n", " -i, --configName NAME", "name of config used to produce ntuples"; |
416 |
|
printf "%-29s%s\n", " -j, --jsonFile FILE", "JSON file used for this dataset"; |
417 |
|
printf "%-29s%s\n", " -l, --location DIRECTORY", "directory containing the ntuples"; |
418 |
|
printf "%-29s%s\n", " -p, --pyConfig FILE", "Python config used to produce ntuples"; |
419 |
|
printf "%-29s%s\n", " -r, --release NAME", "ntuple release used to produce ntuples"; |
420 |
|
printf "%-29s%s\n", " -s, --lumiSummary FILE", "lumiSummary.json reported by CRAB"; |
421 |
+ |
printf "%-29s%s\n", " -x, --xSection XSEC", "cross section in picobarns for the sample"; |
422 |
|
} |
423 |
|
elsif ($command eq "createOther") |
424 |
|
{ |
437 |
|
printf "%-29s%s\n", " -b, --crabCfg FILE", "CRAB config used to submit ntuple jobs"; |
438 |
|
printf "%-29s%s\n", " -c, --comment COMMENT", "comment for the database entry"; |
439 |
|
printf "%-29s%s\n", " -f, --format FORMAT", "ntuple format"; |
440 |
+ |
printf "%-29s%s\n", " -g, --globalTag TAG", "global tag"; |
441 |
+ |
printf "%-29s%s\n", " -i, --configName NAME", "name of config used to produce ntuples"; |
442 |
|
printf "%-29s%s\n", " -j, --jsonFile FILE", "JSON file used for this dataset"; |
443 |
|
printf "%-29s%s\n", " -l, --location DIRECTORY", "directory containing the ntuples"; |
444 |
+ |
printf "%-29s%s\n", " -n, --name NAME", "rename the entry"; |
445 |
|
printf "%-29s%s\n", " -o, --other", "update an entry in the non-ntuple database"; |
446 |
|
printf "%-29s%s\n", " -p, --pyConfig FILE", "Python config used to produce ntuples"; |
447 |
|
printf "%-29s%s\n", " -r, --release NAME", "ntuple release used to produce ntuples"; |
448 |
|
printf "%-29s%s\n", " -s, --lumiSummary FILE", "lumiSummary.json reported by CRAB"; |
449 |
+ |
printf "%-29s%s\n", " -x, --xSection XSEC", "cross section in picobarns for the sample"; |
450 |
|
} |
451 |
|
elsif ($command eq "finish") |
452 |
|
{ |
453 |
|
print "Usage: $exeName -l DIRECTORY finish NAME\n"; |
397 |
– |
|
454 |
|
print "Finalizes the database entry for dataset NAME, changing its status to\n"; |
455 |
|
print "\"present\". This is intended to be the final step in command-line based ntuple\n"; |
456 |
|
print "production.\n"; |
476 |
|
} |
477 |
|
elsif ($command eq "uploadRelease") |
478 |
|
{ |
479 |
< |
print "Usage: $exeName -p FILE -r DIRECTORY [OPTION]... uploadRelease NAME\n"; |
479 |
> |
print "Usage: $exeName -e FILE -p FILE -r DIRECTORY [OPTION]... uploadRelease NAME\n"; |
480 |
|
print "Copies an ntuple release to the appropriate area on the Tier 3, and creates a\n"; |
481 |
|
print "database entry for it, with NAME being the name of the release. An ntuple\n"; |
482 |
|
print "release is a CMSSW release with all the necessary packages added for creating\n"; |
484 |
|
print "\n"; |
485 |
|
print "Mandatory arguments to long options are mandatory for short options too.\n"; |
486 |
|
printf "%-29s%s\n", " -c, --comment COMMENT", "comment for the database entry"; |
487 |
+ |
printf "%-29s%s\n", " -e, --recipe FILE", "file containing the recipe for the release"; |
488 |
|
printf "%-29s%s\n", " -f, --format FORMAT", "ntuple format (default: BEAN)"; |
489 |
|
printf "%-29s%s\n", " -p, --pyConfig FILE", "default Python config for the release"; |
490 |
|
printf "%-29s%s\n", " -r, --release DIRECTORY", "CMSSW release containing ntuple packages"; |
491 |
|
} |
492 |
+ |
elsif ($command eq "downloadRelease") |
493 |
+ |
{ |
494 |
+ |
print "Usage: $exeName [OPTION]... downloadRelease NAME\n"; |
495 |
+ |
print "Copies an ntuple release to the current directory on the Tier 3. Optionally\n"; |
496 |
+ |
print "copies the corresponding Python configuration file registered in the database.\n"; |
497 |
+ |
print "\n"; |
498 |
+ |
print "Mandatory arguments to long options are mandatory for short options too.\n"; |
499 |
+ |
printf "%-29s%s\n", " -p, --pyConfig FILE", "Python configuration file name"; |
500 |
+ |
} |
501 |
+ |
elsif ($command eq "uploadConfig") |
502 |
+ |
{ |
503 |
+ |
print "Usage: $exeName -p FILE -r RELEASE [OPTION]... uploadConfig NAME\n"; |
504 |
+ |
print "Creates an entry in the database for a customized Python configuration file.\n"; |
505 |
+ |
print "\n"; |
506 |
+ |
print "Mandatory arguments to long options are mandatory for short options too.\n"; |
507 |
+ |
printf "%-29s%s\n", " -c, --comment COMMENT", "comment for the database entry"; |
508 |
+ |
printf "%-29s%s\n", " -p, --pyConfig FILE", "Python config file"; |
509 |
+ |
printf "%-29s%s\n", " -r, --release NAME", "ntuple release with which to use this config"; |
510 |
+ |
} |
511 |
|
else |
512 |
|
{ |
513 |
|
print "Usage: $exeName [OPTION]... COMMAND NAME\n"; |
519 |
|
print "\n"; |
520 |
|
print "COMMAND may be one of the following:\n"; |
521 |
|
printf "%-29s%s\n", " create", "creates the entry"; |
522 |
< |
printf "%-29s%s\n", " create", "creates an entry for non-ntuple data"; |
522 |
> |
printf "%-29s%s\n", " createOther", "creates an entry for non-ntuple data"; |
523 |
|
printf "%-29s%s\n", " update", "updates the entry"; |
524 |
|
printf "%-29s%s\n", " finish", "finalizes the database entry"; |
525 |
|
printf "%-29s%s\n", " deleteEntry", "removes the database entry"; |
526 |
|
printf "%-29s%s\n", " deprecate", "marks the dataset for deletion"; |
527 |
|
printf "%-29s%s\n", " uploadRelease", "upload an ntuple release"; |
528 |
+ |
printf "%-29s%s\n", " downloadRelease", "download an ntuple release"; |
529 |
+ |
printf "%-29s%s\n", " uploadConfig", "upload an ntuple config"; |
530 |
|
} |
531 |
|
|
532 |
|
exit; |
580 |
|
my $name = shift; |
581 |
|
my $user = shift; |
582 |
|
my $comment = shift; |
583 |
+ |
my $recipeName = shift; |
584 |
|
|
506 |
– |
move ($release, "/home/hart/public_html/releases/$name.tar.gz") or die "Ntuple releases may only be uploaded on the Tier 3, stopped"; |
585 |
|
if (!(-e $psetName)) |
586 |
|
{ |
587 |
|
print "$psetName does not exist!\n"; |
588 |
|
exit; |
589 |
|
} |
590 |
+ |
if (!(-e $recipeName)) |
591 |
+ |
{ |
592 |
+ |
print "$recipeName does not exist!\n"; |
593 |
+ |
exit; |
594 |
+ |
} |
595 |
+ |
move ($release, "/home/osucms/public_html/releases/$name.tar.gz") or die "Ntuple releases may only be uploaded on the Tier 3, stopped"; |
596 |
|
open (PY_CONFIG, "<$psetName"); |
597 |
|
my @pset = <PY_CONFIG>; |
598 |
|
close (PY_CONFIG); |
599 |
|
my $pset = join ("", @pset); |
600 |
+ |
open (RECIPE, "<$recipeName"); |
601 |
+ |
my @recipe = <RECIPE>; |
602 |
+ |
close (RECIPE); |
603 |
+ |
my $recipe = join ("\n", @recipe); |
604 |
|
|
605 |
|
my $query = "select max(id) from ntupleRelease"; |
606 |
|
$db->selectdb ("ntuple"); |
615 |
|
$format = addSlashes ($format); |
616 |
|
$cmsswRelease = addSlashes ($cmsswRelease); |
617 |
|
$comment = addSlashes ($comment); |
618 |
+ |
$recipe = addSlashes ($recipe); |
619 |
|
|
620 |
< |
my $query = "insert into ntupleRelease (id, name, pset, user, pending, format, cmsswRelease, comment) values ($id, '$name', '$pset', '$user', 1, '$format', '$cmsswRelease', '$comment')"; |
620 |
> |
my $query = "insert into ntupleRelease (id, name, pset, user, pending, format, cmsswRelease, comment, recipe) values ($id, '$name', '$pset', '$user', 1, '$format', '$cmsswRelease', '$comment', '$recipe')"; |
621 |
|
$db->selectdb ("ntuple"); |
622 |
|
my $results = $db->query ($query); |
623 |
|
} |
624 |
|
|
625 |
|
sub |
626 |
+ |
downloadRelease |
627 |
+ |
{ |
628 |
+ |
my $release = shift; |
629 |
+ |
my $pyConfigName = shift; |
630 |
+ |
|
631 |
+ |
my $query = "select id,pset from ntupleRelease where name='$release'"; |
632 |
+ |
$db->selectdb ("ntuple"); |
633 |
+ |
my $results = $db->query ($query); |
634 |
+ |
if ($results->numrows () != 1) |
635 |
+ |
{ |
636 |
+ |
print "Ntuple release \"$release\" not found!\n"; |
637 |
+ |
exit; |
638 |
+ |
} |
639 |
+ |
if ($pyConfigName) |
640 |
+ |
{ |
641 |
+ |
my @row = $results->fetchrow (); |
642 |
+ |
open (PY_CONFIG, ">$pyConfigName"); |
643 |
+ |
print PY_CONFIG $row[1]; |
644 |
+ |
close (PY_CONFIG); |
645 |
+ |
} |
646 |
+ |
`wget "http://cmshead.mps.ohio-state.edu/~osucms/releases/$release.tar.gz"`; |
647 |
+ |
} |
648 |
+ |
|
649 |
+ |
sub |
650 |
|
dbOtherCreate |
651 |
|
{ |
652 |
< |
my $user = shift; |
652 |
> |
my $userAndHost = shift; |
653 |
|
my $listOfFiles = shift; |
654 |
|
my $comment = shift; |
655 |
|
|
656 |
+ |
my $user = $userAndHost; |
657 |
+ |
$user =~ s/@.*$//g; |
658 |
+ |
|
659 |
|
my $size = 0.0; |
660 |
|
my $nFiles = 0.0; |
661 |
|
for (my $i = 0; $i < @$listOfFiles; $i++) |
686 |
|
$location = addSlashes ($location); |
687 |
|
$comment = addSlashes ($comment); |
688 |
|
|
689 |
< |
my $query = "insert into other (id, creationTime, lastUpdateTime, lastUpdateUser, user, location, nFiles, sizeInGB, comment) values ($id, now(), now(), '$user', '$user', '$location', $nFiles, $size, '$comment')"; |
689 |
> |
$query = "insert into other (id, creationTime, lastUpdateTime, lastUpdateUser, user, location, nFiles, sizeInGB, comment) values ($id, now(), now(), '$userAndHost', '$user', '$location', $nFiles, $size, '$comment')"; |
690 |
|
$db->selectdb ("ntuple"); |
691 |
< |
my $results = $db->query ($query); |
691 |
> |
$results = $db->query ($query); |
692 |
|
|
693 |
|
print "ID $id\n"; |
694 |
|
} |
695 |
+ |
|
696 |
+ |
sub |
697 |
+ |
uploadConfig |
698 |
+ |
{ |
699 |
+ |
my $name = shift; |
700 |
+ |
my $user = shift; |
701 |
+ |
my $psetName = shift; |
702 |
+ |
my $release = shift; |
703 |
+ |
my $comment = shift; |
704 |
+ |
|
705 |
+ |
if (!(-e $psetName)) |
706 |
+ |
{ |
707 |
+ |
print "$psetName does not exist!\n"; |
708 |
+ |
exit; |
709 |
+ |
} |
710 |
+ |
if ($release) |
711 |
+ |
{ |
712 |
+ |
my $query = "select id from ntupleRelease where name='$release'"; |
713 |
+ |
$db->selectdb ("ntuple"); |
714 |
+ |
my $results = $db->query ($query); |
715 |
+ |
if ($results->numrows () != 1) |
716 |
+ |
{ |
717 |
+ |
print "Ntuple release \"$release\" not found!\n"; |
718 |
+ |
exit; |
719 |
+ |
} |
720 |
+ |
} |
721 |
+ |
open (PSET, "<$psetName"); |
722 |
+ |
my @pset = <PSET>; |
723 |
+ |
close (PSET); |
724 |
+ |
my $pset = join ("", @pset); |
725 |
+ |
|
726 |
+ |
my $query = "select max(id) from ntupleConfig"; |
727 |
+ |
$db->selectdb ("ntuple"); |
728 |
+ |
my $results = $db->query ($query); |
729 |
+ |
my @row = $results->fetchrow (); |
730 |
+ |
my $id = 1; |
731 |
+ |
$id = $row[0] + 1 if $results->numrows (); |
732 |
+ |
|
733 |
+ |
$name = addSlashes ($name); |
734 |
+ |
$user = addSlashes ($user); |
735 |
+ |
$pset = addSlashes ($pset); |
736 |
+ |
$release = addSlashes ($release); |
737 |
+ |
$comment = addSlashes ($comment); |
738 |
+ |
|
739 |
+ |
my $query = "insert into ntupleConfig (id, name, pset, user, pending, ntupleRelease, comment) values ($id, '$name', '$pset', '$user', 1, '$release', '$comment')"; |
740 |
+ |
$db->selectdb ("ntuple"); |
741 |
+ |
$results = $db->query ($query); |
742 |
+ |
} |
743 |
+ |
|
744 |
+ |
sub |
745 |
+ |
locationExists |
746 |
+ |
{ |
747 |
+ |
my $id = shift; |
748 |
+ |
my $location = shift; |
749 |
+ |
|
750 |
+ |
$location =~ s/^(.*)\/+$/$1/; |
751 |
+ |
my $query = "select id from ntuple where location like '$location%' and id!=$id"; |
752 |
+ |
$db->selectdb ("ntuple"); |
753 |
+ |
my $results = $db->query ($query); |
754 |
+ |
return 1 if $results->numrows (); |
755 |
+ |
|
756 |
+ |
if ($location =~ m/^\/store\/.*$/) |
757 |
+ |
{ |
758 |
+ |
$location =~ s/^\/store\/(.*)$/\/data\/se\/store\/$1/; |
759 |
+ |
} |
760 |
+ |
elsif ($location =~ m/^\/data\/se\/store\/.*$/) |
761 |
+ |
{ |
762 |
+ |
$location =~ s/^\/data\/se\/store\/(.*)$/\/store\/$1/; |
763 |
+ |
} |
764 |
+ |
|
765 |
+ |
my $query = "select id from ntuple where location like '$location%' and id!=$id"; |
766 |
+ |
$db->selectdb ("ntuple"); |
767 |
+ |
my $results = $db->query ($query); |
768 |
+ |
return 1 if $results->numrows (); |
769 |
+ |
|
770 |
+ |
return 0; |
771 |
+ |
} |