Changeset 30118 for branches/czw_branch/20101203/ippTools/src/difftool.c

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ippTools (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/difftool.c (modified) (4 diffs)

branches/czw_branch/20101203/ippTools/src/difftool.c

@@ -483 +483 @@
     psFree(where);
 
-     psStringAppend(&query, "\nORDER by priority DESC, diff_id");
+     psStringAppend(&query, "\nORDER by priority DESC, diff_id, skycell_id");
 
     // treat limit == 0 as "no limit"
@@ -1978 +1978 @@
     PXOPT_COPY_STR(config->args, stack2Where, "-skycell_id", "stackRun.skycell_id", "==");
     PXOPT_COPY_STR(config->args, stack1Where, "-input_label", "stackRun.label","==");
+    PXOPT_COPY_STR(config->args, stack1Where, "-input_data_group", "stackRun.data_group","==");
     PXOPT_COPY_STR(config->args, stack2Where, "-template_label", "stackRun.label","==");
     PXOPT_COPY_F32(config->args, stack1Where, "-good_frac", "stackSumSkyfile.good_frac", ">=");
@@ -2042 +2043 @@
     }
 
-    psString queryCopy = psStringCopy(query);
-    psFree(query);
-    query = queryCopy;
-    
     psStringSubstitute(&query, stack1Query, "@STACK1_QUERY@");
     psStringSubstitute(&query, stack2Query, "@STACK2_QUERY@");
@@ -2120 +2117 @@
         psStringAppend(&this_stack1Query,"AND %s", thisWhere);
         psFree(thisWhere);
-
-        psString queryCopy = psStringCopy(query);
-        psFree(query);
-        query = queryCopy;
-    
 
         psStringSubstitute(&query, this_stack1Query, "@STACK1_QUERY@");