Changeset 28852

Timestamp:

Aug 5, 2010, 2:10:35 PM (16 years ago)

Author:

rhenders

Message:

Simplified DVO Db args: now provide full path and it gets broken up in code

File:

• trunk/ippToPsps/perl/ippToPsps_run.pl (modified) (4 diffs)

trunk/ippToPsps/perl/ippToPsps_run.pl

@@ -9 +9 @@
 use File::Temp qw(tempfile);
 use XML::LibXML;
+use File::Basename;
 
 # local classes
@@ -33 +34 @@
         'output|o=s' => \$output,
         'batch|b=s' => \$batchType,
-        'dvolocation|l=s' => \$dvoLocation,
-        'dvodb|d=s' => \$dvoDb,
+        'dvo|d=s' => \$fullDvoPath,
         'expid|e=s' => \$singleExpId,
         'product|p=s' => \$datastoreProduct,
@@ -58 +58 @@
     print "* REQUIRED: need to define a batch type     -b <init|det|diff|stack>\n";
 }
-if (!defined $dvoDb) {
+if (!defined $fullDvoPath) {
     $quit=1;
-    print "* REQUIRED: need to provide a DVO Db name   -d <name>\n";
-}
-if (!defined $dvoLocation) {
-    $dvoLocation="/data/ipp037.0/gpc1/catdirs";
-    print "* OPTIONAL: location of DVO Db              -l <location>        default = '$dvoLocation'\n";
+    print "* REQUIRED: need to provide a DVO Db        -d <pathToDVO>\n";
 }
 if (!defined $singleExpId) {
 
-    print "* OPTIONAL: a single exposure ID            -e <expID>           default = none\n";
+    print "* OPTIONAL: a single exposure ID            -e <expID>           (default = none)\n";
 }
 if (!defined $datastoreProduct) {
 
-    print "* OPTIONAL: datastore product               -p <product>         default = none (i.e. data will not be published)\n";
+    print "* OPTIONAL: datastore product               -p <product>         (default = none, i.e. data will not be published)\n";
 }
 if (!defined $verbose) {
     $verbose = 0;
-    print "* OPTIONAL: run in verbose mode             -v                   default = $verbose\n";
+    print "* OPTIONAL: run in verbose mode             -v                   (default = $verbose)\n";
 }
 if (!defined $save_temps) {
     $save_temps = 0;
-    print "* OPTIONAL: keep temp files                 -t                   default = $save_temps\n";
+    print "* OPTIONAL: keep temp files                 -t                   (default = $save_temps)\n";
 }
 if (!defined $force) {
     $force = 0;
-    print "* OPTIONAL: force if already processed      -f                   default = $force\n";
+    print "* OPTIONAL: force if already processed      -f                   (default = $force)\n";
 }
 if (!defined $dontTarNZip) {
     $dontTarNZip = 0;
-    print "* OPTIONAL: don't tar and zip output        -z                   default = $dontTarNZip\n";
+    print "* OPTIONAL: don't tar and zip output        -z                   (default = $dontTarNZip)\n";
 }
 print "*\n*******************************************************************************\n";
 
 if ($quit) { exit; }
-
-$fullDvoPath = $dvoLocation . "/" . $dvoDb;
 
 # determine PSPS batch 'type'
@@ -103 +97 @@
 elsif ($batchType eq 'diff') {$pspsBatchType = "OB";}
 else {$pspsBatchType = "UNKNOWN";}
+
+# spilt full DVO path into Db and path
+($dvoDb, $dvoLocation) = fileparse($fullDvoPath);
 
 my $gpc1Db = new ippToPsps::Gpc1Db("gpc1", "ippdb01", "ippuser", "ippuser", $verbose, $save_temps);