Changeset 34241 for branches/eam_branches/ipp-20120627/pstamp

Timestamp:

Jul 31, 2012, 11:38:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/pstamp/scripts

Files:

• . (modified) (1 prop)
• pstamp_checkdependent.pl (modified) (3 diffs)
• pstamp_parser_run.pl (modified) (1 diff)

branches/eam_branches/ipp-20120627/pstamp/scripts/pstamp_checkdependent.pl

@@ -331 +331 @@
         return $error_code
     }
-    if (($state eq 'update') and ($metadata->{fault})) {
+    if (($data_state eq 'full') and ($metadata->{fault})) {
         # fault dependent.
         my $fault = $metadata->{fault};
         print STDERR "warp $warp_id $skycell_id faulted: $fault";
         return $fault;
+    }
+    if ($metadata->{quality} ne 0) {
+        print STDERR "warp $warp_id $skycell_id bad quality on update: $metadata->{quality}\n";
+        return $PSTAMP_GONE;
     }
 
@@ -466 +470 @@
                 return $warp_status;
             }
-        }
+        } elsif ($warp1->{quality} != 0) {
+            print STDERR "warp $warp1->{warp_id} $skycell_id has poor quality: $warp1->{quality}\n";
+            faultComponent('diff', $diff_id, $skycell_id, $PSTAMP_GONE);
+            return $PSTAMP_GONE;
+        }
         $command = "$warptool -warped -warp_id $skycell->{warp2} -skycell_id $skycell_id";
         my $warp2 = runToolAndParseExpectOne($command, $verbose);
@@ -477 +485 @@
                 faultComponent('diff', $diff_id, $skycell_id, $PSTAMP_GONE);
             }
-        }
+        } elsif ($warp2->{quality} != 0) {
+            print STDERR "warp $warp2->{warp_id} $skycell_id has poor quality: $warp2->{quality}\n";
+            faultComponent('diff', $diff_id, $skycell_id, $PSTAMP_GONE);
+            return $PSTAMP_GONE;
+        }
 
         if (!$warps_ready) {

branches/eam_branches/ipp-20120627/pstamp/scripts/pstamp_parser_run.pl

@@ -127 +127 @@
 if ($uri =~ /^http:/) {
     # if the uri is an http uri download the file 
-    my $command = "$dsget --uri $uri --filename $new_uri";
+    my $command = "$dsget --uri $uri --filename $new_uri --timeout 120";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);