Changeset 32452 for trunk/ippToPsps/jython/ipptopspsdb.py

Timestamp:

Sep 26, 2011, 1:22:07 PM (15 years ago)

Author:

rhenders

Message:

added seconds to method get time of last publish. stacks are fast

File:

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

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -300 +300 @@
     '''
     def getStages(self):
-        return ['processed', 'loaded_to_datastore', 'loaded_to_ODM', 'merge_worthy', 'deleted_datastore', 'merged', 'deleted_dxlayer', 'deleted_local']
+        return ['processed', 'loaded_to_datastore', 'loaded_to_ODM', 'merge_worthy', 'merged', 'deleted_datastore', 'deleted_dxlayer', 'deleted_local']
 
     '''
@@ -330 +330 @@
         minutes = None
 
-        sql = "SELECT TIMESTAMPDIFF(MINUTE, timestamp, now()) \
+        sql = "SELECT TIMESTAMPDIFF(SECOND, timestamp, now()) \
                FROM batch \
                WHERE batch_type = '" + batchType + "' \
@@ -340 +340 @@
         try:
             rs = self.executeQuery(sql)
-            if rs.first(): minutes = rs.getFloat(1)
+            if rs.first(): seconds = rs.getFloat(1)
         except:
             self.logger.exception("Unable to get last batch published")
 
-        if not minutes: return "Never"
-
+        if not seconds: return "Never"
+
+        minutes = seconds/60.0
         hours = minutes/60.0
         days = hours/24.0
         weeks = days/7.0
 
-        if minutes < 60: return "%.1f mins ago" % minutes
+        if seconds < 60: return "%.1f secs ago" % seconds
+        elif minutes < 60: return "%.1f mins ago" % minutes
         elif hours < 48: return "%.1f hours ago" % hours
         elif days < 7: return "%.1f days ago" % days