Changeset 28298

Timestamp:

Jun 10, 2010, 1:55:37 PM (16 years ago)

Author:

heather

Message:

addstar path problems fixed

File:

• trunk/ippScripts/scripts/addstar_run.pl (modified) (5 diffs)

trunk/ippScripts/scripts/addstar_run.pl

@@ -36 +36 @@
     exit($PS_EXIT_CONFIG_ERROR);
 }
-
+my $minidvodb_path;
 my ( $exp_tag, $add_id, $camera, $outroot, $camroot, $dbname, $reduction, $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $image_only, $verbose, $no_update,
      $no_op, $redirect, $save_temps);
@@ -132 +132 @@
                     &my_die("Unable to parse metadata list", $add_id, $PS_EXIT_PROG_ERROR);
                 my $comp = $$components[0];
+                $minidvodb_path = $comp->{minidvodb_path};
                 $minidvodb_name = $comp->{minidvodb_name};
         
+                if (!defined($minidvodb_path)) {
+                    &my_die("Unable to parse minidvodb_path", $add_id, $PS_EXIT_PROG_ERROR);
+                } 
                 if (!defined($minidvodb_name)) {
                     &my_die("Unable to parse minidvodb_name", $add_id, $PS_EXIT_PROG_ERROR);
-                } 
-                
+                }
             }
             # tack on the minidvodb part to the db.
-            $dvodbReal = $dvodbReal . '/' . $minidvodb_name . '/';
+#           $dvodbReal = $dvodbReal . '/' . $minidvodb_name . '/';
+#we don't need this now that I fixed the paths     
             
         }
@@ -160 +164 @@
         my $command  = "$addstar -update"; # XXX optionally set -update?
         $command .= " -D CAMERA $camdir";
-        $command .= " -D CATDIR $dvodbReal";
+        $command .= " -D CATDIR $minidvodb_path";
         $command .= " $realFile";
         $command .= " -use-name $fpaObjects"; # DVO wants the neb-name as a file reference
@@ -182 +186 @@
 $fpaCommand .= " -path_base $outroot";
 $fpaCommand .= " -dtime_addstar $dtime_addstar";
-$fpaCommand .= " -dvodb_path $dvodbReal" if defined $dvodbReal;
+$fpaCommand .= " -dvodb_path $minidvodb_path" if defined $minidvodb_path;
 $fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
 $fpaCommand .= " -dbname $dbname" if defined $dbname;
@@ -213 +217 @@
         $command .= " -addprocessedexp";
         $command .= " -fault $exit_code";
-        $command .= " -dvodb_path $dvodbReal" if defined $dvodbReal;
+        $command .= " -dvodb_path $minidvodb_path" if defined $minidvodb_path;
         $command .= " -path_base $outroot" if defined $outroot;
         $command .= (" -dtime_addstar " . ((DateTime->now->mjd - $mjd_start) * 86400));