Changeset 33259 for trunk/ippToPsps/jython/datastore.py

Timestamp:

Feb 14, 2012, 12:02:48 PM (14 years ago)

Author:

rhenders

Message:

Big changes to support a new Config class that encapuslates the xml config file

File:

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

trunk/ippToPsps/jython/datastore.py

@@ -19 +19 @@
 
     '''
-    def __init__(self, logger, doc, ippToPspsDb):
+    def __init__(self, logger, config, ippToPspsDb):
     
         # setup logger
         self.logger = logger
-        self.doc = doc
+        self.config = config
         self.ippToPspsDb = ippToPspsDb
-        self.logger.debug("Datastore constructor")
-
-        # open config
-        self.product = doc.find("datastore/product").text
-        self.type = doc.find("datastore/type").text
-
-        self.logger.debug("Using product: '" + self.product + "' and type: '" + self.type + "'")
 
     '''
@@ -49 +42 @@
         command  = "dsreg --add " + name + "\
                     --link --datapath " + path + "\
-                    --type " + self.type + "\
-                    --product " + self.product + "\
+                    --type " + self.config.datastoreType + "\
+                    --product " + self.config.datastoreProduct + "\
                     --list " + tempFile.name
 
@@ -82 +75 @@
                    --del " + name + " \
                    --rm \
-                   --product " + self.product
+                   --product " + self.config.datastoreProduct
 
         p = Popen(command, shell=True, stdout=PIPE, stderr=PIPE)