Changeset 33680 for trunk/ippToPsps

Timestamp:

Apr 3, 2012, 4:36:52 PM (14 years ago)

Author:

rhenders

Message:

now polls of OB batches

File:

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

trunk/ippToPsps/jython/pollOdm.py

@@ -42 +42 @@
         else: self.stages = [self.STAGE]
 
-        if self.BATCHTYPE == "all": self.batchTypes = ['P2', 'ST']
+        if self.BATCHTYPE == "all": self.batchTypes = ['P2', 'ST', 'OB']
         else: self.batchTypes = [self.BATCHTYPE]
 
@@ -68 +68 @@
       
         if stage == "unloaded":
-            ids = self.ippToPspsDb.getUnloadedBatchIDs(self.config.epoch, self.config.dvoLabel, batchType)
+            ids = self.ippToPspsDb.getUnloadedBatchIDs(batchType)
         elif stage == "unmergeworthy":
-            ids = self.ippToPspsDb.getUnmergeWorthyBatchIDs(self.config.epoch, self.config.dvoLabel, batchType)
+            ids = self.ippToPspsDb.getUnmergeWorthyBatchIDs(batchType)
         elif stage == "unmerged":
-            ids = self.ippToPspsDb.getUnmergedBatchIDs(self.config.epoch, self.config.dvoLabel, batchType)
+            ids = self.ippToPspsDb.getUnmergedBatchIDs(batchType)
     
         self.logger.infoTitle("Checking %d %s %s batches" % (len(ids), stage, batchType))
@@ -121 +121 @@
     '''
     def printUsage(self):
-        super(PollOdm, self).printUsage("<P2|ST|all> <unloaded|unmergeworthy|unmerged|all> [hours]")
+        super(PollOdm, self).printUsage("<P2|ST|OB|all> <unloaded|unmergeworthy|unmerged|all> [hours]")