Changeset 32852 for branches/eam_branches/ipp-20111122/ippToPsps/jython/ipptopspsdb.py

Timestamp:

Dec 2, 2011, 11:45:13 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/ippToPsps/jython/ipptopspsdb.py (modified) (6 diffs)

branches/eam_branches/ipp-20111122/ippToPsps/jython/ipptopspsdb.py

@@ -103 +103 @@
     '''
     Returns a list of processed batch IDs that are not loaded to the datastore
+    NB we have a date constraint here because, before this time, it is possible that
+    a test batch would be labelled as processed but not loaded to datastore, and we would NOT
+    want to load a test batch to PSPS
+
+    We also check that these batches are more than 4 HOURs old, so that we don't attempt to 
+    publish something simulataneously with the client that it producing it
     '''
     def getProcessedButFailedDatastoreBatchIDs(self, epoch, dvoGpc1Label, batchType):
@@ -112 +118 @@
                AND dvo_db = '" + dvoGpc1Label + "' \
                AND processed = 1\
-               AND loaded_to_datastore = -1"
+               AND loaded_to_datastore != 1 \
+               AND timestamp > '2011-10-27' \
+               AND timestamp < now() -  INTERVAL 4 HOUR"
 
         ids = []
@@ -466 +474 @@
                AND batch_type = '" + batchType + "' \
                AND dvo_db = '" + dvoGpc1Label + "' \
-               AND timestamp BETWEEN now() - INTERVAL 2 HOUR AND now()"
+               AND timestamp BETWEEN now() - INTERVAL 4 HOUR AND now()"
 
         try:
@@ -499 +507 @@
 
     '''
-    Have we already processed and published this batch?
+    Have we already processed this stage_id?
     '''
     def alreadyProcessed(self, batchType, stage_id, epoch, dvoGpc1Label):
@@ -509 +517 @@
                AND timestamp > '" + epoch + "' \
                AND dvo_db = '" + dvoGpc1Label + "' \
-               AND processed = 1 \
-               AND loaded_to_datastore != 0"
+               AND processed = 1"
 
         try:
@@ -655 +662 @@
         self.execute(sql)
 
+    '''
+    Resets a batch ready for re-loading to the datastore
+    '''
+    def resetBatch(self, batchID):
+
+        sql = "UPDATE batch SET \
+               loaded_to_datastore = 0, \
+               loaded_to_ODM = 0, \
+               deleted_datastore = 0, \
+               deleted_dxlayer = 0, \
+               comment = 'This batch was reset, ready for re-load to datastore' \
+               WHERE batch_id = " + str(batchID)
+
+        self.execute(sql)
 
     '''