Index: trunk/ippTools/share/difftool_definewarpstack_part1.sql
===================================================================
--- trunk/ippTools/share/difftool_definewarpstack_part1.sql	(revision 26113)
+++ trunk/ippTools/share/difftool_definewarpstack_part1.sql	(revision 26138)
@@ -25,4 +25,5 @@
     JOIN chipRun USING(chip_id)
     WHERE warp1 IS NOT NULL
+    -- warp where hook %s
 ) AS diffExp USING(exp_id, warp_id)
 WHERE
Index: trunk/ippTools/src/difftool.c
===================================================================
--- trunk/ippTools/src/difftool.c	(revision 26113)
+++ trunk/ippTools/src/difftool.c	(revision 26138)
@@ -95,6 +95,6 @@
         MODECASE(DIFFTOOL_MODE_IMPORTRUN,             importrunMode);
         MODECASE(DIFFTOOL_MODE_TOCLEANEDSKYFILE,   tocleanedskyfileMode);
-	MODECASE(DIFFTOOL_MODE_TOPURGEDSKYFILE,    topurgedskyfileMode);
-	MODECASE(DIFFTOOL_MODE_TOSCRUBBEDSKYFILE,  toscrubbedskyfileMode);
+        MODECASE(DIFFTOOL_MODE_TOPURGEDSKYFILE,    topurgedskyfileMode);
+        MODECASE(DIFFTOOL_MODE_TOSCRUBBEDSKYFILE,  toscrubbedskyfileMode);
 
         default:
@@ -210,5 +210,5 @@
     PXOPT_LOOKUP_STR(state, config->args, "-state", true, false);
     PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
-    
+
     // Copy of my hacky work around from stacktool.c
     if ((state)&&(diff_id)) {
@@ -914,5 +914,5 @@
     if (magicked) {
       char *query = "UPDATE diffRun SET state = '%s', magicked = %" PRId64 " WHERE diff_id = %"PRId64;
-      
+
       if (!p_psDBRunQueryF(config->dbh, query, state, magicked, diff_id)) {
         psError(PS_ERR_UNKNOWN, false,
@@ -923,5 +923,5 @@
     else {
       char *query = "UPDATE diffRun SET state = '%s' WHERE diff_id = %"PRId64;
-      
+
       if (!p_psDBRunQueryF(config->dbh, query, state, diff_id)) {
         psError(PS_ERR_UNKNOWN, false,
@@ -930,5 +930,5 @@
       }
     }
-    
+
     return true;
 }
@@ -948,5 +948,5 @@
   if (!p_psDBRunQueryF(config->dbh,query,state,label)) {
     psError(PS_ERR_UNKNOWN, false,
-	    "failed to change state for label %s", label);
+            "failed to change state for label %s", label);
     return(false);
   }
@@ -1221,5 +1221,5 @@
     }
 
-    if (!p_psDBRunQueryF(config->dbh, query, warpQuery, expQuery, diffQuery)) {
+    if (!p_psDBRunQueryF(config->dbh, query, warpQuery, warpQuery, expQuery, diffQuery)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -2062,5 +2062,5 @@
     return(false);
   }
-  
+
   return(true);
 }