Changeset 31985

Timestamp:

Aug 2, 2011, 4:29:01 PM (15 years ago)

Author:

rhenders

Message:

now passing XML config document to Datastore constructor

Location:

trunk/ippToPsps/jython

Files:

• batch.py (modified) (1 diff)
• datastore.py (modified) (1 diff)

trunk/ippToPsps/jython/batch.py

@@ -82 +82 @@
         self.dataRelease = int(self.doc.find("metadata/dataRelease").text)
 
-        # get datastore info from config
-        self.datastore = Datastore(self.logger)
+        # create datastore object
+        self.datastore = Datastore(self.logger, self.doc)
 
         # create a new batch

trunk/ippToPsps/jython/datastore.py

@@ -17 +17 @@
 
     '''
-    def __init__(self, logger):
+    def __init__(self, logger, doc):
     
         # setup logger
         self.logger = logger
+        self.doc = doc
         self.logger.debug("Datastore constructor")
 
         # open config
-        doc = ElementTree(file="config.xml")
         self.product = doc.find("datastore/product").text
         self.type = doc.find("datastore/type").text