Index: trunk/ippToPsps/jython/ipptopspsdb.py
===================================================================
--- trunk/ippToPsps/jython/ipptopspsdb.py	(revision 32193)
+++ trunk/ippToPsps/jython/ipptopspsdb.py	(revision 32209)
@@ -59,5 +59,5 @@
     Returns a list of processed batch IDs that are merged but not yet deleted
     '''
-    def getMergedButNotDeletedBatchIDs(self, batchType, epoch, dvoGpc1Label):
+    def getMergedButNotDeletedBatchIDs(self, batchType, epoch, dvoGpc1Label, column):
 
         sql = "SELECT DISTINCT batch_id \
@@ -67,5 +67,5 @@
                AND dvo_db = '" + dvoGpc1Label + "' \
                AND merged = 1\
-               AND deleted = 0"
+               AND " + column + " = 0"
 
         ids = []
@@ -84,11 +84,31 @@
 
     '''
+    Returns a list of processed batch IDs that are merged but not deleted from local disk
+    '''
+    def getMergedButNotDeletedFromLocalDisk(self, batchType, epoch, dvoGpc1Label):
+        return self.getMergedButNotDeletedBatchIDs(batchType, epoch, dvoGpc1Label, "deleted_local")
+
+    '''
+    Returns a list of processed batch IDs that are merged but not deleted from datastore
+    '''
+    def getMergedButNotDeletedFromDatastore(self, batchType, epoch, dvoGpc1Label):
+        return self.getMergedButNotDeletedBatchIDs(batchType, epoch, dvoGpc1Label, "deleted_datastore")
+
+    '''
+    Returns a list of processed batch IDs that are merged but not deleted from DXLayer
+    '''
+    def getMergedButNotDeletedFromDXLayer(self, batchType, epoch, dvoGpc1Label):
+        return self.getMergedButNotDeletedBatchIDs(batchType, epoch, dvoGpc1Label, "deleted_dxlayer")
+
+
+    '''
     Returns a list of processed batch IDs that are not loaded to the datastore
     '''
-    def getProcessedButFailedDatastoreBatchIDs(self, epoch, dvoGpc1Label):
+    def getProcessedButFailedDatastoreBatchIDs(self, epoch, dvoGpc1Label, batchType):
 
         sql = "SELECT DISTINCT batch_id \
                FROM batch \
                WHERE timestamp > '" + epoch + "' \
+               AND batch_type = '" + batchType + "' \
                AND dvo_db = '" + dvoGpc1Label + "' \
                AND processed = 1\
@@ -292,8 +312,20 @@
 
     '''
-    Updates batch deleted field 
-    '''
-    def updateDeleted(self, batchID, deleted):
-        self.updateColumn(batchID, "deleted", deleted)
+    Updates batch deleted local field 
+    '''
+    def updateDeletedLocal(self, batchID, value):
+        self.updateColumn(batchID, "deleted_local", value)
+
+    '''
+    Updates batch deleted datastore field 
+    '''
+    def updateDeletedDatastore(self, batchID, value):
+        self.updateColumn(batchID, "deleted_datastore", value)
+
+    '''
+    Updates batch deleted dxlayer field 
+    '''
+    def updateDeletedDxlayer(self, batchID, value):
+        self.updateColumn(batchID, "deleted_dxlayer", value)
 
     '''