Changeset 26138 for trunk/ippTools/src/difftool.c

Timestamp:

Nov 13, 2009, 2:03:25 PM (16 years ago)

Author:

Paul Price

Message:

Need to limit the selection of warps so query doesn't take forever.

File:

• trunk/ippTools/src/difftool.c (modified) (8 diffs)

trunk/ippTools/src/difftool.c

@@ -95 +95 @@
         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 +210 @@
     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 +914 @@
     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 +923 @@
     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 +930 @@
       }
     }
-    
+
     return true;
 }
@@ -948 +948 @@
   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 +1221 @@
     }
 
-    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 +2062 @@
     return(false);
   }
-  
+
   return(true);
 }