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.15 by ahart, Fri Nov 30 18:20:59 2012 UTC vs.
Revision 1.17 by ahart, Sat Jan 19 07:16:03 2013 UTC

# Line 15 | Line 15 | 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", "recipe|e=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", "help|h");
25   my $argc = @ARGV;
26  
27   printHelp ($ARGV[0]) if $opt{"help"};
# Line 41 | Line 42 | if ($ARGV[0] eq "uploadConfig" && (!$opt
42      print "The Python config and ntuple release must be given!\n";
43      exit;
44    }
45 + if ($opt{"location"} && locationExists ($opt{"location"}))
46 +  {
47 +    print "This location is already registered in the database!\n";
48 +    exit;
49 +  }
50   if ($ARGV[0] eq "uploadRelease")
51    {
52      my $parentDir = "./$opt{'release'}";
# Line 80 | Line 86 | else
86      $status = "" if $ARGV[0] eq "update";
87      $status = "deprecated" if $ARGV[0] eq "deprecate";
88      $opt{"format"} = "BEAN" if $ARGV[0] eq "create" && !$opt{"format"};
89 <    dbUpdate ($id, $fullDataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $opt{"format"}, $opt{"location"}, $opt{"fileList"}, $status, $opt{"comment"}, $opt{"pyConfig"}, $opt{"crabCfg"}, $opt{"jsonFile"}, $opt{"lumiSummary"}, $opt{"release"}) if !$opt{"other"};
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"}) 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"};
# Line 176 | Line 182 | dbUpdate
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 278 | Line 285 | dbUpdate
285    $jsonFile = addSlashes ($jsonFile);
286    $lumiSummary = addSlashes ($lumiSummary);
287    $fullLocation = addSlashes ($fullLocation);
288 +  $name = addSlashes ($name);
289    $fileList = addSlashes ($fileList);
290    $status = addSlashes ($status);
291    $comment = addSlashes ($comment);
# Line 287 | Line 295 | dbUpdate
295    my $query;
296    if ($id < 0)
297      {
298 +      $query = "select id from ntuple where dataset='$dataset'";
299 +      $db->selectdb ("ntuple");
300 +      $results = $db->query ($query);
301 +      if ($results->numrows ())
302 +        {
303 +          print "This dataset already exists in the database. Create anyway? (y/N): ";
304 +          my $response = <STDIN>;
305 +          $response =~ s/\n//g;
306 +          $response = "n" if !$response;
307 +          exit if substr (lc ($response), 0, 1) ne 'y';
308 +        }
309 +
310        $query = "select max(id) from ntuple";
311        $db->selectdb ("ntuple");
312        $results = $db->query ($query);
# Line 301 | Line 321 | dbUpdate
321        my $fields;
322        my $values;
323  
324 <      $values .= ", dataset='$dataset'" if $dataset;
324 >      if ($name)
325 >        {
326 >          $query = "select id from ntuple where dataset='$name'";
327 >          $db->selectdb ("ntuple");
328 >          $results = $db->query ($query);
329 >          if ($results->numrows ())
330 >            {
331 >              print "This dataset already exists in the database. Create anyway? (y/N): ";
332 >              my $response = <STDIN>;
333 >              $response =~ s/\n//g;
334 >              $response = "n" if !$response;
335 >              exit if substr (lc ($response), 0, 1) ne 'y';
336 >            }
337 >          $values .= ", dataset='$name'";
338 >        }
339 >
340        $values .= ", lastUpdateTime=now()";
341        $values .= ", lastUpdateUser='$user'";
342        $values .= ", format='$format'" if $format;
# Line 404 | Line 439 | printHelp
439        printf "%-29s%s\n", "  -f, --format FORMAT", "ntuple format";
440        printf "%-29s%s\n", "  -j, --jsonFile FILE", "JSON file used for this dataset";
441        printf "%-29s%s\n", "  -l, --location DIRECTORY", "directory containing the ntuples";
442 +      printf "%-29s%s\n", "  -n, --name NAME", "rename the entry";
443        printf "%-29s%s\n", "  -o, --other", "update an entry in the non-ntuple database";
444        printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config used to produce ntuples";
445        printf "%-29s%s\n", "  -r, --release NAME", "ntuple release used to produce ntuples";
# Line 706 | Line 742 | uploadConfig
742    $db->selectdb ("ntuple");
743    $results = $db->query ($query);
744   }
745 +
746 + sub
747 + locationExists
748 + {
749 +  my $location = shift;
750 +
751 +  $location =~ s/^(.*)\/+$/$1/;
752 +  my $query = "select id from ntuple where location like '$location%'";
753 +  $db->selectdb ("ntuple");
754 +  my $results = $db->query ($query);
755 +  return 1 if $results->numrows ();
756 +
757 +  if ($location =~ m/^\/store\/.*$/)
758 +    {
759 +      $location =~ s/^\/store\/(.*)$/\/data\/se\/store\/$1/;
760 +    }
761 +  elsif ($location =~ m/^\/data\/se\/store\/.*$/)
762 +    {
763 +      $location =~ s/^\/data\/se\/store\/(.*)$/\/store\/$1/;
764 +    }
765 +
766 +  my $query = "select id from ntuple where location like '$location%'";
767 +  $db->selectdb ("ntuple");
768 +  my $results = $db->query ($query);
769 +  return 1 if $results->numrows ();
770 +
771 +  return 0;
772 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines