Changeset 28851

Timestamp:

Aug 5, 2010, 1:08:04 PM (16 years ago)

Author:

rhenders

Message:

Improvements to arguments

File:

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

trunk/ippToPsps/perl/ippToPsps_run.pl

@@ -6 +6 @@
 use PS::IPP::Config 1.01 qw( :standard );
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
-use Pod::Usage qw( pod2usage );
 use IPC::Cmd 0.36 qw( can_run run );
 use File::Temp qw(tempfile);
@@ -18 +17 @@
 my $camera = 'GPC1';
 my $batchType = undef;
-my $dvoPath = undef;
+my $dvoLocation = undef;
 my $dvoDb = undef;
 my $fullDvoPath = undef;
 my $verbose = undef;
 my $save_temps = undef; 
-my $no_update = undef;
 my $output = undef;
 my $singleExpId = undef;
@@ -35 +33 @@
         'output|o=s' => \$output,
         'batch|b=s' => \$batchType,
-        'dvopath=s' => \$dvoPath,
+        'dvolocation|l=s' => \$dvoLocation,
         'dvodb|d=s' => \$dvoDb,
         'expid|e=s' => \$singleExpId,
@@ -41 +39 @@
         'verbose|v' => \$verbose,
         'save_temps|t' => \$save_temps,
-        'no-update|u' => \$no_update,
         'force|f' => \$force,
         'tarnzip|z' => \$dontTarNZip,
@@ -65 +62 @@
     print "* REQUIRED: need to provide a DVO Db name   -d <name>\n";
 }
-if (!defined $dvoPath) {
-    $dvoPath="/data/ipp037.0/gpc1/catdirs";
-    print "* OPTIONAL: path to DVO Db                  -dvopath <path>      default = '$dvoPath'\n";
+if (!defined $dvoLocation) {
+    $dvoLocation="/data/ipp037.0/gpc1/catdirs";
+    print "* OPTIONAL: location of DVO Db              -l <location>        default = '$dvoLocation'\n";
 }
 if (!defined $singleExpId) {
 
-    print "* OPTIONAL: an single exposure ID           -e <expID>           default = none\n";
+    print "* OPTIONAL: a single exposure ID            -e <expID>           default = none\n";
 }
 if (!defined $datastoreProduct) {
@@ -85 +82 @@
     print "* OPTIONAL: keep temp files                 -t                   default = $save_temps\n";
 }
-if (!defined $no_update) {
-    $no_update = 0;
-    print "* OPTIONAL: don't update database           -u                   default = $no_update\n";
-}
 if (!defined $force) {
     $force = 0;
@@ -101 +94 @@
 if ($quit) { exit; }
 
-$fullDvoPath = $dvoPath . "/" . $dvoDb;
+$fullDvoPath = $dvoLocation . "/" . $dvoDb;
 
 # determine PSPS batch 'type'