Changeset 29666

Timestamp:

Nov 4, 2010, 12:35:10 PM (16 years ago)

Author:

watersc1

Message:

fix stack-stack diff queuing

File:

• tags/ipp-20101029/ippTools/src/difftool.c (modified) (2 diffs)

tags/ipp-20101029/ippTools/src/difftool.c

@@ -2050 +2050 @@
     }
 
-    if (!p_psDBRunQueryF(config->dbh, query, stack2Query, stack1Query, diffQuery0, stack1Query)) {
+
+    psString queryCopy = psStringCopy(query);
+    psFree(query);
+    query = queryCopy;
+    
+    psStringSubstitute(&query, stack1Query, "@STACK1_QUERY@");
+    psStringSubstitute(&query, stack2Query, "@STACK2_QUERY@");
+    psStringSubstitute(&query, diffQuery0,  "@DIFF0_QUERY@");
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -2121 +2130 @@
         psFree(thisWhere);
 
-        psTrace("difftool",1, query,stack2Query,this_stack1Query,diffQuery1,this_stack1Query);
+
+        psString queryCopy = psStringCopy(query);
+        psFree(query);
+        query = queryCopy;
+    
+
+        psStringSubstitute(&query, this_stack1Query, "@STACK1_QUERY@");
+        psStringSubstitute(&query, stack2Query,      "@STACK2_QUERY@");
+        psStringSubstitute(&query, diffQuery1,       "@DIFF1_QUERY@");
+
+        psTrace("difftool", 1, "%s", query);
         if (!psDBTransaction(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");