Changeset 32337 for branches/eam_branches/ipp-20110710/ippToPsps/jython/removeFromDatastore.py

Timestamp:

Sep 6, 2011, 11:00:22 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110710/ippToPsps/jython

Files:

• . (modified) (1 prop)
• removeFromDatastore.py (modified) (1 diff)

branches/eam_branches/ipp-20110710/ippToPsps/jython/removeFromDatastore.py

@@ -5 +5 @@
 import sys
 import getopt
+from pslogger import PSLogger
+
+from xml.etree.ElementTree import ElementTree, Element, tostring
 
 
-logging.config.fileConfig("logging.conf")
-logger = logging.getLogger("datastore")
+if len(sys.argv) < 3:
+    print "** Usage: " + sys.argv[0] + " <configPath> <firstBatchToRemove> [<lastBatchToRemove>]"
+    sys.exit(1)
 
+CONFIG = sys.argv[1]
+configDoc = ElementTree(file=CONFIG)
 
+logging.setLoggerClass(PSLogger)
+logger = logging.getLogger("removeFromDatastore")
+logger.setup(configDoc, "removeFromDatastore")
 
+datastore = Datastore(logger, configDoc)
 
-datastore = Datastore(logger)
-datastore.remove(str(sys.argv[1]))
+if len(sys.argv) < 4:
+    datastore.remove(str(sys.argv[2]))
+else:
+    datastore.removeRange(str(sys.argv[2]), str(sys.argv[3]))