Changeset 33415 for branches/meh_branches/ppstack_test/ippToPsps/jython/removeFromDatastore.py

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippToPsps/jython/removeFromDatastore.py (modified) (2 diffs)

branches/meh_branches/ppstack_test/ippToPsps/jython/removeFromDatastore.py

@@ -5 +5 @@
 import sys
 import getopt
+
+
+from config import Config
 from pslogger import PSLogger
+from ipptopspsdb import IppToPspsDb
 
-from xml.etree.ElementTree import ElementTree, Element, tostring
 
 
@@ -14 +17 @@
     sys.exit(1)
 
-CONFIG = sys.argv[1]
-configDoc = ElementTree(file=CONFIG)
+CONFIGFILE = sys.argv[1]
 
-logging.setLoggerClass(PSLogger)
-logger = logging.getLogger("removeFromDatastore")
-logger.setup(configDoc, "removeFromDatastore")
-
-datastore = Datastore(logger, configDoc)
+# create objects
+config = Config(CONFIGPATH)
+logger = config.getLogger(sys.argv[0])
+ippToPspsDb = IppToPspsDb(logger, config)
+datastore = Datastore(logger, config, ippToPspsDb)
 
 if len(sys.argv) < 4: