Changeset 33665

Timestamp:

Apr 3, 2012, 2:34:25 PM (14 years ago)

Author:

rhenders

Message:

no longer passing config parameters unnecessarily to IppToPspsDb methods; added OB batches to cleanup

File:

• trunk/ippToPsps/jython/cleanup.py (modified) (3 diffs)

trunk/ippToPsps/jython/cleanup.py

@@ -13 +13 @@
 from datastore import Datastore
 from dxlayer import DXLayer
-
 
 '''
@@ -42 +41 @@
             self.clean("P2")
             self.clean("ST")
+            self.clean("OB")
 
             self.checkClientStatus()
@@ -59 +59 @@
         self.logger.infoTitle("Cleaning up batch type %s" % batchType)
 
-        loadedDatastoreIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDatastore(batchType, self.config.epoch, self.config.dvoLabel)
-        loadedDxlayerIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDXLayer(batchType, self.config.epoch, self.config.dvoLabel)
-        mergedLocalIDs = self.ippToPspsDb.getMergedButNotDeletedFromLocalDisk(batchType, self.config.epoch, self.config.dvoLabel)
+        loadedDatastoreIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDatastore(batchType)
+        loadedDxlayerIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDXLayer(batchType)
+        mergedLocalIDs = self.ippToPspsDb.getMergedButNotDeletedFromLocalDisk(batchType)
 
-        purgedDatastoreIDs = self.ippToPspsDb.getPurgedButNotDeletedFromDatastore(batchType, self.config.epoch, self.config.dvoLabel)
-        purgedLocalIDs = self.ippToPspsDb.getPurgedButNotDeletedFromLocalDisk(batchType, self.config.epoch, self.config.dvoLabel)
+        purgedDatastoreIDs = self.ippToPspsDb.getPurgedButNotDeletedFromDatastore(batchType)
+        purgedLocalIDs = self.ippToPspsDb.getPurgedButNotDeletedFromLocalDisk(batchType)
 
         self.logger.infoPair("Loaded to ODM but still on datastore", "%d" % len(loadedDatastoreIDs))