Changeset 32337 for branches/eam_branches/ipp-20110710/ippToPsps/jython/datastore.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)
• datastore.py (modified) (5 diffs)

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

@@ -5 +5 @@
 import logging
 import sys
+import re
 from xml.etree.ElementTree import ElementTree, Element, tostring
-
 
 '''
@@ -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
@@ -51 +51 @@
 
         if p.returncode != 0:
-            self.logger.error("Datastore publish failed")
+            self.logger.errorPair("Datastore publish",  "failed")
             ret = False
         else:
@@ -57 +57 @@
             ret = True
             
-
         tempFile.close()
         return ret
 
+    '''
+    Removes an item from the datastore
 
-    '''
-    Removes an item to the datastore
+    NB this will return a success if the batch is not found on the datastore
     '''
     def remove(self, name):
@@ -72 +72 @@
                    --product " + self.product
 
-        p = Popen(command, shell=True, stdout=PIPE)
+        p = Popen(command, shell=True, stdout=PIPE, stderr=PIPE)
         p.wait()
+        output, errors = p.communicate()
 
         if p.returncode != 0:
-            self.logger.error("Datastore removal of " + name + " failed")
-            ret = False
+            if re.search("not found in", errors):
+                self.logger.infoPair("Datastore batch not found", name)
+                ret = True
+            else:
+                self.logger.infoPair("Datastore removal FAILED", name)
+                ret = False
         else:
+            self.logger.infoPair("Datastore removal successful", name)
             ret = True
-            self.logger.infoPair("Datastore removal successful", name)
             
         return ret
 
+    '''
+    Removes a range of items from the datastore
+    '''
+    def removeRange(self, first, last):
+
+        firstInt = int(first[1:])
+        lastInt = int(last[1:])
+
+        for i in range(firstInt, lastInt):
+            
+            self.remove(Batch.getNameFromID(i))
+
+from batch import Batch