Index: trunk/ippToPsps/jython/metrics.py
===================================================================
--- trunk/ippToPsps/jython/metrics.py	(revision 32452)
+++ trunk/ippToPsps/jython/metrics.py	(revision 32453)
@@ -93,4 +93,17 @@
 
 '''
+Prints various timing stats for this batch type
+'''
+def printStats(batchType):
+
+    logger.info("| %2s | %16.1f | %13d | %17.1f | %16d | %14s |" % 
+            (batchType,
+             ippToPspsDb.countBatchesInLastPeriod(batchType, EPOCH, DVOLABEL, "1 HOUR") / 1.0,
+             ippToPspsDb.countBatchesInLastPeriod(batchType, EPOCH, DVOLABEL, "24 HOUR"),
+             ippToPspsDb.countBatchesInLastPeriod(batchType, EPOCH, DVOLABEL, "1 WEEK") / 7.0, 
+             ippToPspsDb.getTotalDetectionsPublished(batchType, EPOCH, DVOLABEL),
+             ippToPspsDb.getTimeOfLastBatchPublished(batchType, EPOCH, DVOLABEL)))
+
+'''
 Start of program.
 '''
@@ -119,8 +132,12 @@
 logger.infoPair("Loading epoch", EPOCH)
 logger.infoPair("DVO label", DVOLABEL)
-logger.infoPair("P2 batches per hour", "%.1f" % ippToPspsDb.getBatchesPerHour("P2", EPOCH, DVOLABEL, 2))
-logger.infoPair("ST batches per hour", "%.1f" % ippToPspsDb.getBatchesPerHour("ST", EPOCH, DVOLABEL, 2))
-logger.infoPair("Last P2 batch published", ippToPspsDb.getTimeOfLastBatchPublished("P2", EPOCH, DVOLABEL))
-logger.infoPair("Last ST batch published", ippToPspsDb.getTimeOfLastBatchPublished("ST", EPOCH, DVOLABEL))
+
+logger.info("+----+------------------+---------------+-------------------+------------------+----------------+")
+logger.info("|Type| batches per hour | last 24 hours | per day this week | total detections | last published |")
+logger.info("+----+------------------+---------------+-------------------+------------------+----------------+")
+printStats("P2")
+printStats("ST")
+logger.info("+----+------------------+---------------+-------------------+------------------+----------------+")
+
 logger.info("")