Changeset 27938

Timestamp:

May 12, 2010, 3:45:51 PM (16 years ago)

Author:

watersc1

Message:

I introduced a bug that killed burntool processing. This should resolve that bug.

Location:

trunk/ippScripts/scripts

Files:

• automate_stacks.pl (modified) (2 diffs)
• make_burntool_pcontrol.pl (modified) (1 diff)

trunk/ippScripts/scripts/automate_stacks.pl

@@ -455 +455 @@
     }
 
-    if ($#{ $stderr_buf } > -1) {
-        $metadata_out{nsState} = 'ERROR';
-        return(1);
-    }
+#    if ($#{ $stderr_buf } > -1) {
+#        $metadata_out{nsState} = 'ERROR';
+#        return(1);
+#    }
 
     my $N = 0;
@@ -464 +464 @@
     foreach my $row (@burntool_entries) {
         my ($trash,$start,$end);
-        ($trash,$trash,$start,$end) = (split /\s+/,$row);
-
+        (undef,$trash,$start,$end) = (split /\s+/,$row);
+        if ($trash ne 'burntool') {
+            $metadata_out{nsState} = 'ERROR';
+            return(1);
+        }
         for (my $class_counter = 0; $class_counter < 60; $class_counter++) {
             $metadata_out{"bt${N}Begin"} = $start;

trunk/ippScripts/scripts/make_burntool_pcontrol.pl

@@ -322 +322 @@
     my ($exp_type,$obs_mode,$object,$comment) = @_;
     my $return_value = 0;
+    unless($object) {
+        $object = '';
+    }
     if ($exp_type eq 'OBJECT') {
         foreach my $target (@target_list) {
+#           print STDERR "$target $obsmode_list{$target} $exp_type $obs_mode $object $comment\n";
             if (($obs_mode =~ /$obsmode_list{$target}/)&&
                 ($object   =~ /$object_list{$target}/)&&