Index: trunk/ippToPsps/jython/cleanup.py
===================================================================
--- trunk/ippToPsps/jython/cleanup.py	(revision 33816)
+++ trunk/ippToPsps/jython/cleanup.py	(revision 33817)
@@ -7,4 +7,5 @@
 import sys
 import time
+import traceback
 import logging.config
 
@@ -50,4 +51,14 @@
    
     '''
+    Reports results of cleanup for this 
+    '''
+    def reportResults(self, name, ids, success):
+
+        if len(ids) > 0:
+            self.logger.infoSeparator()
+            self.logger.infoPair("Removed from " + name, "%d of %d" % (success, len(ids)))
+    
+
+    '''
     Finds stuff to delete for this batch type, then:
 
@@ -63,5 +74,5 @@
 
         loadedDatastoreIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDatastore(batchType)
-        loadedDxlayerIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDXLayer(batchType)
+        deleteFromDxLayerIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDXLayer(batchType)
         mergedLocalIDs = self.ippToPspsDb.getMergedButNotDeletedFromLocalDisk(batchType)
 
@@ -69,15 +80,14 @@
         purgedLocalIDs = self.ippToPspsDb.getPurgedButNotDeletedFromLocalDisk(batchType)
 
-        self.logger.infoPair("Loaded to ODM but still on datastore", "%d" % len(loadedDatastoreIDs))
-        self.logger.infoPair("Loaded to ODM but still in DXLayer", "%d" % len(loadedDxlayerIDs))
-        self.logger.infoPair("Merged but still on local disk", "%d" % len(mergedLocalIDs))
-        self.logger.infoPair("Purged but still on datastore", "%d" % len(purgedDatastoreIDs))
-        self.logger.infoPair("Purged but still on local disk", "%d" % len(purgedLocalIDs))
+        deleteFromDatastoreIDs = loadedDatastoreIDs + purgedDatastoreIDs
+        deleteFromLocalIDs = mergedLocalIDs + purgedLocalIDs
+
+        self.logger.infoPair("To delete from datastore", "%d" % len(deleteFromDatastoreIDs))
+        self.logger.infoPair("To delete from DXLayer", "%d" % len(deleteFromDxLayerIDs))
+        self.logger.infoPair("To delete from local disk", "%d" % len(deleteFromLocalIDs))
     
         if self.config.deleteLocal:
-            self.logger.infoSeparator()
             count = 0
-            ids = mergedLocalIDs + purgedLocalIDs
-            for id in ids:
+            for id in deleteFromLocalIDs:
         
                 if Batch.deleteFromDisk(self.logger, self.config.basePath, batchType, self.config.dvoLabel, id):
@@ -85,14 +95,9 @@
                     count = count + 1
     
-            self.logger.infoSeparator()
-            self.logger.infoPair("Removed from local disk", "%d" % count)
-            self.logger.infoPair("Remaining on local disk", "%d" % (len(ids) - count))
-        
+            self.reportResults("local disk", deleteFromLocalIDs, count) 
     
         if self.config.deleteDatastore:
-            self.logger.infoSeparator()
             count = 0
-            ids = loadedDatastoreIDs + purgedDatastoreIDs
-            for id in ids:
+            for id in deleteFromDatastoreIDs:
         
                 batchName = Batch.getNameFromID(id)
@@ -101,12 +106,9 @@
                     count = count + 1
     
-            self.logger.infoSeparator()
-            self.logger.infoPair("Removed from datastore", "%d" % count)
-            self.logger.infoPair("Remaining on datastore", "%d" % (len(ids) - count))
+            self.reportResults("datastore", deleteFromDatastoreIDs, count) 
         
         if self.config.deleteDxLayer:
-            self.logger.infoSeparator()
             count = 0
-            for id in loadedDxlayerIDs:
+            for id in deleteFromDxLayerIDs:
         
                 if self.dxlayer.deleteBatch(id):
@@ -114,9 +116,6 @@
                     count = count + 1
     
-            self.logger.infoSeparator()
-            self.logger.infoPair("Removed from DXLayer", "%d" % count)
-            self.logger.infoPair("Remaining on DXLayer", "%d" % (len(loadedDxlayerIDs) - count))
+            self.reportResults("DXLayer", deleteFromDxLayerIDs, count) 
        
-
     '''
     Overrides base-class version
@@ -133,3 +132,5 @@
     cleanup.run()
     cleanup.exitProgram("completed")
-except: pass
+except Exception, e:
+    print str(e)
+    traceback.print_exc()