Changeset 32141 for trunk/ippToPsps

Timestamp:

Aug 19, 2011, 11:48:34 AM (15 years ago)

Author:

rhenders

Message:

changed updateMinMaxObjID() method to updateDetectionStats(); now storing total detections in the Db; getMergedButNotDeletedBatchIDs() method now taking batch type as arg

File:

• trunk/ippToPsps/jython/ipptopspsdb.py (modified) (3 diffs)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -59 +59 @@
     Returns a list of processed batch IDs that are merged but not yet deleted
     '''
-    def getMergedButNotDeletedBatchIDs(self, epoch, dvoGpc1Label):
+    def getMergedButNotDeletedBatchIDs(self, batchType, epoch, dvoGpc1Label):
 
         sql = "SELECT DISTINCT batch_id \
                FROM batch \
                WHERE timestamp > '" + epoch + "' \
+               AND batch_type = '" + batchType + "' \
                AND dvo_db = '" + dvoGpc1Label + "' \
                AND merged \
@@ -174 +175 @@
 
         hours = minutes/60.0
-        days = float(hours)/24.0
-        weeks = float(days)/7.0
+        days = hours/24.0
+        weeks = days/7.0
 
         if minutes < 60: return "%.1f minutes ago" % minutes
@@ -237 +238 @@
     Updates min/max object ID on this table and batch 
     '''
-    def updateMinMaxObjID(self, batchID, minObjID, maxObjID):
+    def updateDetectionStats(self, batchID, minObjID, maxObjID, totalDetections):
 
         sql = "UPDATE batch SET \
                min_obj_id = " + str(minObjID) + ", \
-               max_obj_id = " + str(maxObjID) + " \
+               max_obj_id = " + str(maxObjID) + ", \
+               total_detections = " + str(totalDetections) + " \
                WHERE batch_id = " + str(batchID)