Changeset 34971

Timestamp:

Jan 18, 2013, 10:22:19 AM (13 years ago)

Author:

eugene

Message:

accept configDir argument; set settings directory unless using old-style local path

File:

• branches/eam_branches/ipp-20121219/ippToPsps/jython/config.py (modified) (1 diff)

branches/eam_branches/ipp-20121219/ippToPsps/jython/config.py

@@ -19 +19 @@
     Basically reads the entire config and stores values to class variables
     '''
-    def __init__(self, programName, name):
+    def __init__(self, programName, name, configDir):
 
         self.programName = programName
         self.name = name
-        self.settingsPath = "../config/settings.xml" # TODO
+        self.configDir = configDir
+
+        # self.configdir is set in ipptopsps.jy on init based on env(IPPTOPSPS_DATA)
+        if self.configDir is None:
+          self.settingsPath = "../config/settings.xml" # TODO
+        else:
+          self.settingsPath = self.configDir + "settings.xml"
+
         self.logger = None