Changeset 32492 for trunk/ippToPsps

Timestamp:

Oct 5, 2011, 4:18:10 PM (15 years ago)

Author:

rhenders

Message:

now reporting counts of new merge_worthy and new merged batches

File:

• trunk/ippToPsps/jython/pollOdm.py (modified) (2 diffs)

trunk/ippToPsps/jython/pollOdm.py

@@ -35 +35 @@
 EPOCH = configDoc.find("options/epoch").text
 
+lookingForUnmerged = 0
 if len(sys.argv) > 3 and sys.argv[3] == "unmerged":
+    lookingForUnmerged = 1
+
+if lookingForUnmerged:
     ids = ippToPspsDb.getUnmergedBatchIDs(EPOCH, DVOLABEL, BATCHTYPE)
 else:
@@ -45 +49 @@
 results = {}
 
-logger.info("+-----------+----------------+----------------+----------------+----------------+")
-logger.info("|   Batch   | Loaded to ODM  |  Load failed   |  Merge worthy  |     Merged     |")
-logger.info("+-----------+----------------+----------------+----------------+----------------+")
+logger.info("+-----------+----------------+----------------+----------------+----------------+----------------+----------------+")
+logger.info("|   Batch   | Loaded to ODM  |  Load failed   |  Merge worthy  |     Merged     |New merge worthy|   New merged   |")
+logger.info("+-----------+----------------+----------------+----------------+----------------+----------------+----------------+")
+newMergeWorthy = 0
+newMerged = 0
 for id in ids:
 
    if odm.checkBatch(id, results):
        ippToPspsDb.updateOdmStatus(id, results)
-       logger.info("| %9s | %14d | %14d | %14d | %14d |" %
+
+       if lookingForUnmerged:
+           if results['MERGED'] == 1: newMerged = newMerged + 1
+       else:
+           if results['MERGEWORTHY'] == 1: newMergeWorthy = newMergeWorthy + 1
+           if results['MERGED'] == 1: newMerged = newMerged + 1
+
+       logger.info("| %9s | %14d | %14d | %14d | %14d | %14d | %14d |" %
                (Batch.getNameFromID(id),
                 results['LOADEDTOODM'],
                 results['LOADFAILED'],
                 results['MERGEWORTHY'],
-                results['MERGED']))
+                results['MERGED'],
+                newMergeWorthy,
+                newMerged))
+
+
    else:
-       logger.info("| %9s | failed to poll ODM                                                |" % Batch.getNameFromID(id))
+       logger.info("| %9s | failed to poll ODM                                                                                  |" % Batch.getNameFromID(id))
 
-logger.info("+-----------+----------------+----------------+----------------+----------------+")
+logger.info("+-----------+----------------+----------------+----------------+----------------+----------------+----------------+")
 
+logger.infoPair("New merge-worthy batches", "%d" % newMergeWorthy)
+logger.infoPair("New merged batches", "%d" % newMerged)
+
+