Changeset 32365

Timestamp:

Sep 7, 2011, 9:30:13 AM (15 years ago)

Author:

bills

Message:

postage stamp script bug fixes

Location:

tags/ipp-20110622/pstamp/scripts

Files:

• . (modified) (1 prop)
• pstamp_checkdependent.pl (modified) (1 diff)
• pstampparse.pl (modified) (1 diff)

tags/ipp-20110622/pstamp/scripts/pstamp_checkdependent.pl

@@ -240 +240 @@
         my $state = $chip->{state};
         my $data_state = $chip->{data_state};
+        my $fault = $chip->{fault};
         if (($state =~ /error/) or ($state =~ /purged/) or ($state =~ /scrubbed/) or ($state eq 'drop') or
-            ($data_state =~ /error/) or ($data_state =~ /purged/) or ($data_state =~ /scrubbed/) or ($data_state eq 'drop')) {
-
-            print "chipRun state is $chip->{chip_id} has state: $state data_state: $data_state cannot update\n";
+            ($data_state =~ /error/) or ($data_state =~ /purged/) or ($data_state =~ /scrubbed/) or ($data_state eq 'drop') or
+            ($fault eq $PSTAMP_GONE)) {
+
+            print "chipRun state is $chip->{chip_id} has state: $state data_state: $data_state fault: $fault cannot update\n";
             my $error_code;
             if (($state eq 'error_cleaned') or ($data_state ='error_cleaned')) {

tags/ipp-20110622/pstamp/scripts/pstampparse.pl

@@ -148 +148 @@
     } elsif ($lcname =~ /qub/) {
         $label = "QUB";
+        $label_changed = 1;
+    } elsif ($lcname =~ /pypstamp/) {
+        $label = "PY";
         $label_changed = 1;
     }