Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 34764)
+++ trunk/ippTools/share/Makefile.am	(revision 34766)
@@ -88,4 +88,5 @@
 	chiptool_listrun.sql \
 	chiptool_pendingcleanupimfile.sql \
+	chiptool_pendingcleanupimfile_all.sql \
 	chiptool_pendingcleanuprun.sql \
 	chiptool_pendingimfile.sql \
@@ -172,4 +173,5 @@
 	difftool_pendingcleanuprun.sql \
 	difftool_pendingcleanupskyfile.sql \
+	difftool_pendingcleanupskyfile_all.sql \
 	difftool_revertdiffskyfile_delete.sql \
 	difftool_revertdiffskyfile_updated.sql \
@@ -423,4 +425,5 @@
 	warptool_pendingcleanuprun.sql \
 	warptool_pendingcleanupskyfile.sql \
+	warptool_pendingcleanupskyfile_all.sql \
 	warptool_revertoverlap.sql \
 	warptool_revertwarped_delete.sql \
Index: trunk/ippTools/share/camtool_pendingcleanuprun.sql
===================================================================
--- trunk/ippTools/share/camtool_pendingcleanuprun.sql	(revision 34764)
+++ trunk/ippTools/share/camtool_pendingcleanuprun.sql	(revision 34766)
@@ -2,4 +2,6 @@
     camRun.cam_id,
     rawExp.camera,
+    rawExp.exp_tag,
+    camRun.workdir,
     camRun.state
 FROM camRun
Index: trunk/ippTools/share/chiptool_pendingcleanupimfile_all.sql
===================================================================
--- trunk/ippTools/share/chiptool_pendingcleanupimfile_all.sql	(revision 34766)
+++ trunk/ippTools/share/chiptool_pendingcleanupimfile_all.sql	(revision 34766)
@@ -0,0 +1,16 @@
+-- list of chipProcessedImfiles for runs in a goto_cleaned like state without regard to 
+-- data_state or quality. Used for confirming that a run is really in the cleaned state
+SELECT
+    chipProcessedImfile.*,
+    chipRun.state,
+    chipRun.workdir,
+    chipRun.label,
+    chipRun.reduction,
+    chipRun.expgroup,
+    chipRun.dvodb,
+    chipRun.tess_id,
+    chipRun.end_stage
+FROM chipRun
+JOIN chipProcessedImfile
+    USING(chip_id)
+WHERE ( chipRun.state = 'goto_cleaned' OR chipRun.state = 'goto_scrubbed' OR chipRun.state = 'goto_purged' )
Index: trunk/ippTools/share/chiptool_pendingcleanuprun.sql
===================================================================
--- trunk/ippTools/share/chiptool_pendingcleanuprun.sql	(revision 34764)
+++ trunk/ippTools/share/chiptool_pendingcleanuprun.sql	(revision 34766)
@@ -1,6 +1,8 @@
-SELECT
+SELECT DISTINCT
     chipRun.chip_id,
     rawExp.camera,
-    chipRun.state
+    rawExp.exp_tag,
+    chipRun.state,
+    chipRun.workdir
 FROM chipRun
 JOIN rawExp 
Index: trunk/ippTools/share/difftool_pendingcleanuprun.sql
===================================================================
--- trunk/ippTools/share/difftool_pendingcleanuprun.sql	(revision 34764)
+++ trunk/ippTools/share/difftool_pendingcleanuprun.sql	(revision 34766)
@@ -6,4 +6,6 @@
 	    rawExp.camera,
 	    diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
 	    diffRun.label
 	FROM diffRun
@@ -35,4 +37,6 @@
 	    rawExp.camera,
 	    diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
 	    diffRun.label
 	FROM diffRun
@@ -64,4 +68,6 @@
 	    rawExp.camera,
 	    diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
 	    diffRun.label
 	FROM diffRun
@@ -93,4 +99,6 @@
 	    rawExp.camera,
 	    diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
 	    diffRun.label
 	FROM diffRun
Index: trunk/ippTools/share/difftool_pendingcleanupskyfile_all.sql
===================================================================
--- trunk/ippTools/share/difftool_pendingcleanupskyfile_all.sql	(revision 34766)
+++ trunk/ippTools/share/difftool_pendingcleanupskyfile_all.sql	(revision 34766)
@@ -0,0 +1,10 @@
+SELECT
+    diffSkyfile.*,
+    diffRun.state,
+    diffRun.workdir,
+    diffRun.dvodb,
+    diffRun.tess_id
+FROM diffRun
+JOIN diffSkyfile
+    USING(diff_id)
+WHERE ( diffRun.state = 'goto_cleaned' OR diffRun.state = 'goto_scrubbed' OR diffRun.state = 'goto_purged')
Index: trunk/ippTools/share/warptool_pendingcleanuprun.sql
===================================================================
--- trunk/ippTools/share/warptool_pendingcleanuprun.sql	(revision 34764)
+++ trunk/ippTools/share/warptool_pendingcleanuprun.sql	(revision 34766)
@@ -1,5 +1,7 @@
 SELECT
     warpRun.warp_id,
+    warpRun.workdir,
     rawExp.camera,
+    rawExp.exp_tag,
     warpRun.state
 FROM warpRun
Index: trunk/ippTools/share/warptool_pendingcleanupskyfile_all.sql
===================================================================
--- trunk/ippTools/share/warptool_pendingcleanupskyfile_all.sql	(revision 34766)
+++ trunk/ippTools/share/warptool_pendingcleanupskyfile_all.sql	(revision 34766)
@@ -0,0 +1,11 @@
+SELECT
+    warpSkyfile.*,
+    warpRun.state,
+    warpRun.workdir,
+    warpRun.label,
+    warpRun.dvodb,
+    warpRun.end_stage
+FROM warpRun
+JOIN warpSkyfile
+    USING(warp_id)
+WHERE (warpRun.state = 'goto_cleaned' OR warpRun.state = 'goto_scrubbed' OR warpRun.state = 'goto_purged')
Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 34764)
+++ trunk/ippTools/src/chiptool.c	(revision 34766)
@@ -1311,4 +1311,5 @@
     PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
@@ -1319,5 +1320,6 @@
     pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
-    psString query = pxDataGet("chiptool_pendingcleanupimfile.sql");
+    char *sql_file = all ? "chiptool_pendingcleanupimfile_all.sql" : "chiptool_pendingcleanupimfile.sql";
+    psString query = pxDataGet(sql_file);
     if (!query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
Index: trunk/ippTools/src/chiptoolConfig.c
===================================================================
--- trunk/ippTools/src/chiptoolConfig.c	(revision 34764)
+++ trunk/ippTools/src/chiptoolConfig.c	(revision 34766)
@@ -296,4 +296,5 @@
     psMetadataAddS64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-chip_id", 0,          "search by chip ID", 0);
     psMetadataAddStr(pendingcleanupimfileArgs, PS_LIST_TAIL, "-exp_id",                 0,            "search by exp_id", NULL);
+    psMetadataAddBool(pendingcleanupimfileArgs, PS_LIST_TAIL, "-all",  0,            "list all components regardless of data_state", false);
     psMetadataAddBool(pendingcleanupimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     psMetadataAddU64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
Index: trunk/ippTools/src/difftool.c
===================================================================
--- trunk/ippTools/src/difftool.c	(revision 34764)
+++ trunk/ippTools/src/difftool.c	(revision 34766)
@@ -2561,4 +2561,5 @@
 
     PXOPT_LOOKUP_S64(diff_id, config->args, "-diff_id", false, false);
+    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -2570,5 +2571,6 @@
     pxAddLabelSearchArgs (config, where, "-label", "diffRun.label", "==");
 
-    psString query = pxDataGet("difftool_pendingcleanupskyfile.sql");
+    char * sql_file  = all ? "difftool_pendingcleanupskyfile_all.sql": "difftool_pendingcleanupskyfile.sql" ;
+    psString query = pxDataGet(sql_file);
     if (!query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
Index: trunk/ippTools/src/difftoolConfig.c
===================================================================
--- trunk/ippTools/src/difftoolConfig.c	(revision 34764)
+++ trunk/ippTools/src/difftoolConfig.c	(revision 34766)
@@ -395,4 +395,5 @@
     psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
     psMetadataAddS64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,          "search by diff ID", 0);
+    psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-all",  0,            "list all skycells regardless of data_state", false);
     psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     psMetadataAddU64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 34764)
+++ trunk/ippTools/src/warptool.c	(revision 34766)
@@ -1838,4 +1838,5 @@
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
 
     psMetadata *where = psMetadataAlloc();
@@ -1843,5 +1844,6 @@
     pxAddLabelSearchArgs (config, where, "-label", "warpRun.label", "==");
 
-    psString query = pxDataGet("warptool_pendingcleanupskyfile.sql");
+    char * sql_file = all ? "warptool_pendingcleanupskyfile_all.sql" : "warptool_pendingcleanupskyfile.sql";
+    psString query = pxDataGet(sql_file);
     if (!query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
Index: trunk/ippTools/src/warptoolConfig.c
===================================================================
--- trunk/ippTools/src/warptoolConfig.c	(revision 34764)
+++ trunk/ippTools/src/warptoolConfig.c	(revision 34766)
@@ -364,4 +364,5 @@
     psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
     psMetadataAddS64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,          "search by warp ID (required)", 0);
+    psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-all",  0,            "list all skycells regardless of data_state", false);
     psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     psMetadataAddU64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);