Changeset 32489 for trunk/ippToPsps

Timestamp:

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

Author:

rhenders

Message:

using new ipptopspsdb method, and changed some log messages

File:

• trunk/ippToPsps/jython/cleanup.py (modified) (1 diff)

trunk/ippToPsps/jython/cleanup.py

@@ -27 +27 @@
     logger.infoTitle("Cleaning up batch type %s" % batchType)
 
-    localIDs = ippToPspsDb.getLoadedToODMButNotDeletedFromLocalDisk(batchType, EPOCH, DVOLABEL)
+    localIDs = ippToPspsDb.getMergedButNotDeletedFromLocalDisk(batchType, EPOCH, DVOLABEL)
     datastoreIDs = ippToPspsDb.getLoadedToODMButNotDeletedFromDatastore(batchType, EPOCH, DVOLABEL)
     dxlayerIDs = ippToPspsDb.getLoadedToODMButNotDeletedFromDXLayer(batchType, EPOCH, DVOLABEL)
-    logger.infoPair("Loaded to ODM but still on local disk", "%d" % len(localIDs))
+    logger.infoPair("Merged but still on local disk", "%d" % len(localIDs))
     logger.infoPair("Loaded to ODM but still on datastore", "%d" % len(datastoreIDs))
     logger.infoPair("Loaded to ODM but still in DXLayer", "%d" % len(dxlayerIDs))