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

Timestamp:

Feb 16, 2010, 11:20:32 AM (16 years ago)

Author:

watersc1

Message:

This should fix the stack-stack overqueueing bug. The test case for input_label = MD03.nightlyscience now only finds stacks from data_group MD03.20100215, which do not appear to have been queued for SS diffs before.

File:

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

trunk/ippTools/src/difftool.c

@@ -1894 +1894 @@
   psString diffQuery = NULL;
   if (! (reRun || newTemplates) ) {
-    psStringAppend(&diffQuery, "\n AND diff_id IS NULL");
+    psStringAppend(&diffQuery, "\n AND diffExp.diff_id IS NULL");
   } else {
     diffQuery = psStringCopy("\n");
@@ -1905 +1905 @@
     return(false);
   }
-
+  psTrace("difftool",1,query,stack2Query,diffQuery,stack1Query,stack1Query);
+/*   exit(10); */
+          
   if (!psDBTransaction(config->dbh)) {
     psError(PS_ERR_UNKNOWN, false, "database error");
@@ -1911 +1913 @@
   }
 
-  if (!p_psDBRunQueryF(config->dbh, query, stack2Query, diffQuery, stack1Query, stack1Query)) {
+  if (!p_psDBRunQueryF(config->dbh, query, stack2Query, stack1Query, diffQuery, stack1Query)) {
     psError(PS_ERR_UNKNOWN, false, "database error");
     psFree(query);
@@ -1919 +1921 @@
     return false;
   }
+
   psFree(query);
 
@@ -1978 +1981 @@
     psFree(thisWhere);
 
-/*     psTrace("difftool",1, query,stack2Query,diffQuery,this_stack1Query,this_stack1Query); */
+    psTrace("difftool",1, query,stack2Query,diffQuery,this_stack1Query,this_stack1Query);
     if (!psDBTransaction(config->dbh)) {
       psError(PS_ERR_UNKNOWN, false, "database error");
@@ -1984 +1987 @@
     }
 
-    if (!p_psDBRunQueryF(config->dbh, query, stack2Query, diffQuery, this_stack1Query, this_stack1Query)) {
+    if (!p_psDBRunQueryF(config->dbh, query, stack2Query, this_stack1Query, diffQuery, this_stack1Query)) {
       psError(PS_ERR_UNKNOWN, false, "database error");
       psFree(query);