Changeset 32118

Timestamp:

Aug 17, 2011, 12:37:27 PM (15 years ago)

Author:

rhenders

Message:

added some static methods to getting batch name, paths etc; moved datastore inport to bottom to avoid issue of circular imports

File:

• trunk/ippToPsps/jython/batch.py (modified) (4 diffs)

trunk/ippToPsps/jython/batch.py

@@ -11 +11 @@
 from subprocess import call, PIPE, Popen
 
-from datastore import Datastore
 from scratchdb import ScratchDb
 from gpc1db import Gpc1Db
@@ -97 +96 @@
 
         # get local storage location from config
-        self.batchName = "B%08d" % self.batchID
-        self.subDir = self.doc.find("localOutPath").text + "/" + self.batchType + "/" + dvoGpc1Label
-        self.localOutPath = self.subDir + "/" + self.batchName 
+        self.batchName = Batch.getNameFromID(self.batchID)
+        basePath = self.doc.find("localOutPath").text
+        self.subDir = Batch.getSubDir(
+                basePath,
+                self.batchType, 
+                dvoGpc1Label)
+
+        self.localOutPath = Batch.getOutputPath(
+                basePath,
+                self.batchType, 
+                dvoGpc1Label,
+                self.batchID)
+
         if not os.path.exists(self.localOutPath): os.makedirs(self.localOutPath)
 
@@ -125 +134 @@
 
         self.everythingOK = True
+    
+    '''
+    Static method to generated batch name from batch ID
+    '''
+    @staticmethod
+    def getNameFromID(id):
+       return "B%08d" % id
+
+    '''
+    Static method to generated sub directory for batch on local disk
+    '''
+    @staticmethod
+    def getSubDir(basePath, batchType, dvoLabel):
+       return basePath + "/" + batchType + "/" + dvoLabel
+
+    '''
+    Static method to generated output path for batch
+    '''
+    @staticmethod
+    def getOutputPath(basePath, batchType, dvoLabel, id):
+       return Batch.getSubDir(basePath, batchType, dvoLabel) + "/" + Batch.getNameFromID(id)
 
     '''
@@ -448 +478 @@
         self.logger.infoPair("Batch......", "complete")
 
-
+from datastore import Datastore
+