Changeset 32120 for trunk/ippToPsps

Timestamp:

Aug 17, 2011, 12:39:08 PM (15 years ago)

Author:

rhenders

Message:

using new Batch-class static methods to get batch name; putting import at bottom to avoid issue of circular imports

Location:

trunk/ippToPsps/jython

Files:

• datastore.py (modified) (2 diffs)
• odm.py (modified) (2 diffs)

trunk/ippToPsps/jython/datastore.py

@@ -6 +6 @@
 import sys
 from xml.etree.ElementTree import ElementTree, Element, tostring
-
 
 '''
@@ -94 +93 @@
         for i in range(firstInt, lastInt):
             
-            self.remove("B%08d" % i)
+            self.remove(Batch.getNameFromID(i))
+
+from batch import Batch

trunk/ippToPsps/jython/odm.py

@@ -6 +6 @@
 from xml.etree.ElementTree import ElementTree, Element, tostring
 from subprocess import call, PIPE, Popen
+
+from batch import Batch
 
 '''
@@ -25 +27 @@
     def checkBatch(self, batchID, results):
 
-        batch = "B%08d" % batchID
+        batch = Batch.getNameFromID(batchID)
 
         tempFile = tempfile.NamedTemporaryFile(mode='w+b')