Changeset 29258

Timestamp:

Sep 29, 2010, 10:57:34 AM (16 years ago)

Author:

rhenders

Message:

Now reporting when load has failed

File:

• trunk/ippToPsps/perl/checkOdmStatus.pl (modified) (9 diffs)

trunk/ippToPsps/perl/checkOdmStatus.pl

@@ -90 +90 @@
 
     print "\n";
-    printf("+----------------------+--------------+--------------+----------------+---------------+---------+----------+\n");
-    printf("|      Timestamp       |    Batch     |  Exposure ID | Loaded to ODM? | Merge worthy? | Merged? | Deleted? |\n");
-    printf("+----------------------+--------------+--------------+----------------+---------------+---------+----------+\n");
+    printf("+----------------------+--------------+--------------+----------------+--------------+--------------+---------+----------+\n");
+    printf("|      Timestamp       |    Batch     |  Exposure ID | Loaded to ODM? | Load failed? |Merge worthy? | Merged? | Deleted? |\n");
+    printf("+----------------------+--------------+--------------+----------------+--------------+--------------+---------+----------+\n");
 
     # loop round batches
@@ -101 +101 @@
     my $numDeleted = 0;
     foreach $batch ( @{$batches} ) {
-        my ($timestamp, $type, $expId, $batchId, $surveyType, $deleted, $dvoDb, $processed, $onDatastore, $loadedToOdm, $mergeWorthy, $merged) =  @{$batch};
+        my ($timestamp, $type, $expId, $batchId, $surveyType, $deleted, $dvoDb, $processed, $onDatastore, $loadedToOdm, $loadFailed, $mergeWorthy, $merged) =  @{$batch};
 
         if (!$onDatastore) {next;}
@@ -125 +125 @@
         $numBatchesToCheck++;
 
-
         # if not merged then update by polling ODM for status
-        if (!$merged) {
-
-            if (checkODM($batch->getName(), \$loadedToOdm, \$mergeWorthy, \$merged)) {$numChecked++;}
+        if (!$merged && !$loadFailed) {
+
+            if (checkODM($batch->getName(), \$loadedToOdm, \$loadFailed, \$mergeWorthy, \$merged)) {$numChecked++;}
             else {next;}
         }
 
         # delete from datastore
-        if (defined $product && !$deleted && $loadedToOdm && $mergeWorthy) {
+        if (defined $product && !$deleted && $loadedToOdm && ($mergeWorthy || $loadFailed)) {
+
 
             $deleted = $datastore->remove($batch->getName());
@@ -149 +149 @@
 
         # update database
-        $ippToPspsDb->updateODMStatus($batchId, $expId, $loadedToOdm, $mergeWorthy, $merged, $deleted);
-        printf( "| %18s  | %11s  | %10d   |    %6s      |    %6s     | %6s  |  %5s   |\n", 
+        $ippToPspsDb->updateODMStatus($batchId, $expId, $loadedToOdm, $loadFailed, $mergeWorthy, $merged, $deleted);
+        printf( "| %18s  | %11s  | %10d   |    %6s      |    %6s    |   %6s     | %6s  |  %5s   |\n", 
                 $timestamp, 
                 $batch->getName(), 
                 $expId, 
                 $loadedToOdm ? "yes" : "no", 
+                $loadFailed ? "yes" : "no", 
                 $mergeWorthy ? "yes" : "no", 
                 $merged ? "yes" : "no",
@@ -160 +161 @@
     }
 
-    printf("+----------------------+--------------+--------------+----------------+---------------+---------+----------+\n");
-
+    printf("+----------------------+--------------+--------------+----------------+--------------+--------------+---------+----------+\n");
     printf( "* Successfully checked %d batch%s out of %d\n", $numChecked, ($numChecked==1) ? "" : "es", $numBatchesToCheck);
     printf( "* Successfully removed %d batch%s from the datastore\n", $numRemovedFromDatastore, ($numRemovedFromDatastore==1) ? "" : "es");
@@ -174 +174 @@
 ########################################################################################
 sub checkODM {
-    my ($batchName, $loadedToOdm, $mergeWorthy, $merged) = @_;
+    my ($batchName, $loadedToOdm, $loadFailed, $mergeWorthy, $merged) = @_;
 
     my $statusFilter = "*";
@@ -194 +194 @@
 
     my ($tempFile, $tempName) = tempfile( "/tmp/ippToPsps_odmXml.XXXX", UNLINK => !$save_temps);
+    #print $response->content. "\n";
     print $tempFile $response->content;
     close($tempFile);
 
     ${$loadedToOdm} = 0;
+    ${$loadFailed} = 0;
     ${$mergeWorthy} = 0;
     ${$merged} = 0;
 
-    parseXml($tempName, $loadedToOdm, $mergeWorthy, $merged);
+    parseXml($tempName, $loadedToOdm, $loadFailed, $mergeWorthy, $merged);
+
+    unlink($tempFile);
 
     return 1;
 }
 
-######################################################################################y
+
+
+########################################################################################
 # 
 # Parses ODM XML
@@ -212 +218 @@
 ########################################################################################
 sub parseXml {
-    my ($xmlFile, $loadedToOdm, $mergeWorthy, $merged) = @_;
+    my ($xmlFile, $loadedToOdm, $loadFailed, $mergeWorthy, $merged) = @_;
 
     my $parser = XML::LibXML->new;
@@ -218 +224 @@
     my $xc = XML::LibXML::XPathContext->new($doc);
     $xc->registerNs('ArrayOfOdmBatchState', 'PanSTARRS.Services.OdmWebService');
-    my $result = $xc->findvalue('//ArrayOfOdmBatchState:Message');
+    my $result = $xc->findvalue('//ArrayOfOdmBatchState:BatchState');
+
+    if ($result =~ m/failed/) { 
+        ${$loadFailed} = 1;
+        ${$loadedToOdm} = 1;
+    return;
+    }
+
+    $result = $xc->findvalue('//ArrayOfOdmBatchState:Message');
     ${$loadedToOdm} = 0;
     ${$mergeWorthy} = 0;