Changeset 30326 for trunk/ippScripts/scripts/addstar_run.pl

Timestamp:

Jan 20, 2011, 1:22:59 PM (15 years ago)

Author:

heather

Message:

fixed some faulty logic

File:

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

trunk/ippScripts/scripts/addstar_run.pl

@@ -71 +71 @@
     defined $camera;
 if ($minidvodb && !defined($minidvodb_group)) {
-                my_die( "missing minidvodb_group", $add_id, 3 );
-            }
+                my_die( "missing minidvodb_group", $add_id, 3 );
+            }
 my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $add_id, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
 
@@ -113 +113 @@
 
 if (defined $dvodbReal) {
-        if ($minidvodb) {
-            
-            if (!defined($minidvodb_name)) {
-                #take the active one, if it's not defined on the command line
-                #reverts would have this already set, for example.
-                my $command = "addtool -listminidvodbrun ";
-                $command .= " -minidvodb_group $minidvodb_group" if defined $minidvodb_group;
-                $command .= " -state 'active' -limit 1";
-                $command .= " -dbname $dbname" if defined $dbname;
-                print $command;
-                my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                    run(command => $command, verbose => $verbose);
-                &my_die( "Unable to get active minidvodb_name", $add_id, $PS_EXIT_SYS_ERROR) unless $success;
-                my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
-                    &my_die("Unable to parse metadata config", $add_id, $PS_EXIT_PROG_ERROR);
-
-                my $components = parse_md_list($metadata) or
-                    &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 . '/';
-#we don't need this now that I fixed the paths     
-            
-        }
+        if ($minidvodb) {
+
+            #if (!defined($minidvodb_name)) {
+                #take the active one, if it's not defined on the command line
+                #reverts would have this already set, for example.
+                my $command = "addtool -listminidvodbrun ";
+                $command .= " -minidvodb_group $minidvodb_group" if defined $minidvodb_group;
+                $command .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
+                $command .= " -state 'active' -limit 1";
+                $command .= " -dbname $dbname" if defined $dbname;
+                print $command;
+                my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                    run(command => $command, verbose => $verbose);
+                &my_die( "Unable to get active minidvodb_name", $add_id, $PS_EXIT_SYS_ERROR) unless $success;
+                my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
+                    &my_die("Unable to parse metadata config", $add_id, $PS_EXIT_PROG_ERROR);
+
+                my $components = parse_md_list($metadata) or
+                    &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 . '/';
+#we don't need this now that I fixed the paths
+
+        }
         else {
 
@@ -153 +154 @@
 
 unless ($no_op) {
-            print $dvodbReal;
+            print $dvodbReal;
 
         ## addstar can either save the full set of detections, or just
@@ -222 +223 @@
         $command .= " -addprocessedexp";
         $command .= " -fault $exit_code";
-        $command .= " -dvodb_path $minidvodb_path" if defined $minidvodb_path;
+        $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));
-        $fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
+        $fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
         $command .= " -dbname $dbname" if defined $dbname;
         system ($command);