Changeset 29656 for trunk/ippScripts/scripts/automate_stacks.pl

Timestamp:

Nov 3, 2010, 3:47:26 PM (16 years ago)

Author:

watersc1

Message:

bugfix to hopefully prevent destreak from ruining warps before we have a chance to turn them into a stack.

File:

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

trunk/ippScripts/scripts/automate_stacks.pl

@@ -1267 +1267 @@
     my $stack_done_sth = "SELECT * from stackRun LEFT JOIN stackSumSkyfile USING(stack_id) WHERE $where ";
     $stack_done_sth .= " AND ((state = 'full') OR (state = 'new' && fault != 0)) ";
-
+    if ($debug == 1) {
+        print STDERR "post_stack_queue: database queries:\n";
+        print STDERR "$stack_full_sth\n";
+        print STDERR "$stack_done_sth\n";
+    }
     my $stack_full_ref = $db->selectall_arrayref( $stack_full_sth );
     my $stack_done_ref = $db->selectall_arrayref( $stack_done_sth );
@@ -1281 +1285 @@
         if ($stackable_list{$target} == 1) {
             my ($Nstacks, $Nattempted) = post_stack_queue($date,$target);
+            if ($debug == 1) {
+                print STDERR "confirm_stacks: Target $target on $date has $Nattempted attempts on $Nstacks.\n";
+            }
             if ($Nstacks != $Nattempted) {
                 if ($debug == 1) {
-                    print STDERR "confirm_stacks: Target $target on $date is not done stacking. $Nstacks $Nattempted\n"
+                    print STDERR "confirm_stacks: Target $target on $date is not done stacking. $Nstacks $Nattempted\n";
                 }
                 if ($metadata_out{nsState} eq 'CONFIRM_STACKING') {
                     $metadata_out{nsState} = 'STACKING';
                 }
-                    
+                next;
+            }
+            if ($Nstacks == 0) {
+                if ($debug == 1) {
+                    print STDERR "confirm_stacks: Target $target on $date has no stacks. Skipping.\n";
+                }
                 next;
             }
@@ -1531 +1543 @@
         my $N = $metadata_out{N_MACROS};
         $metadata_out{"ns${N}Macro"} = $macro_formats{$proc_mode};
-#       print STDERR "WORKING ON A MACRO: ns${N}Macro $proc_mode $macro_formats{$proc_mode}\n";
+        if ($debug == 1) {
+            print STDERR "WORKING ON A MACRO: ns${N}Macro $proc_mode $macro_formats{$proc_mode}\n";
+        }
         if (defined($date)&&(defined($target))) {
 
@@ -1552 +1566 @@
             $metadata_out{"ns${N}Macro"} =~ s/\@DATE\@/$date/;
         }
+        if ($debug == 1) {
+            print STDERR "DONE WITH A MACRO: ns${N}Macro $proc_mode $macro_formats{$proc_mode}\n";
+        }
         $metadata_out{N_MACROS} ++;
     }