Changeset 35834

Timestamp:

Jul 17, 2013, 2:30:44 PM (13 years ago)

Author:

bills

Message:

remove defaulting of camera and improve error handling in ipp_apply_burntoo_single.pl

File:

• tags/ipp-20130712/ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (4 diffs, 1 prop)

tags/ipp-20130712/ippScripts/scripts/ipp_apply_burntool_single.pl

@@ -45 +45 @@
     defined $dbname;
 
-unless (defined $camera) {
-    $camera = "GPC1";
-}
+# unless (defined $camera) {
+#    $camera = "GPC1";
+# }
 
 my $missing_tools;
@@ -146 +146 @@
             }
             if (($addable == 1)&&($#continue_exp_ids < $continue)) {
-                $this_exp_id = $entry->{exp_id};
-                $this_uri    = $entry->{uri};
-                $this_state  = $entry->{imfile_state};
+                $this_exp_id = $entry->{exp_id} ? $entry->{exp_id} : 0;
+                $this_uri    = $entry->{uri} ? $entry->{uri} : 'NULL';
+                $this_state  = $entry->{imfile_state} ? $entry->{imfile_state} : 'NULL';
                 print ">> $this_exp_id $this_uri $this_state\n";
                 if ($this_state eq 'pending_burntool') {
@@ -177 +177 @@
     $outTable  =~ s/fits$/burn.tbl/;
     my $outTableReal = $ipprc->file_resolve($outTable, 1);
+    if (!$outTableReal) {
+        &my_die("failed to resolve output file: $outTable",$exp_id,$class_id);
+    }
     
     my $previousTable;
@@ -184 +187 @@
         $previousTable =~ s/fits$/burn.tbl/;
         $previousTableReal = $ipprc->file_resolve($previousTable, 0);
+        if (!$previousTableReal) {
+            &my_die("failed to resolve input file: $previousTable",$exp_id,$class_id);
+        }
     }