Changeset 29664

Timestamp:

Nov 4, 2010, 12:05:06 PM (16 years ago)

Author:

eugene

Message:

fix the diff query for stackstack and update to use the @word@ replacement technique

Location:

branches/eam_branches/ipp-20101103/ippTools

Files:

• share/difftool_definestackstack_part0.sql (modified) (2 diffs)
• share/difftool_definestackstack_part1.sql (modified) (3 diffs)
• src/difftool.c (modified) (5 diffs)

branches/eam_branches/ipp-20101103/ippTools/share/difftool_definestackstack_part0.sql

@@ -22 +22 @@
            stackRun.state = 'full' AND
            stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0
-           -- template where hook %s
+           @STACK2_QUERY@ -- template condition
      GROUP BY
            skycell_id,
@@ -38 +38 @@
           JOIN stackSumSkyfile USING(stack_id)
           WHERE 1
-          -- input where hook %s
+          @STACK1_QUERY@ -- input condition
 ) AS diffExp ON diffExp.stack1 = stackRun.stack_id AND diffExp.stack2 = template.max_stack_id
 WHERE
         stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0
-        -- diff where hook %s
-        -- input where hook again %s
+        @DIFF0_QUERY@  -- diff constraint
+        @STACK1_QUERY@ -- input constraint
 ORDER BY stackRun.data_group,stackRun.filter

branches/eam_branches/ipp-20101103/ippTools/share/difftool_definestackstack_part1.sql

@@ -23 +23 @@
            stackRun.state = 'full' AND
            stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0
-           -- template where hook %s
+           @STACK2_QUERY@ -- template constraint
      GROUP BY
            skycell_id,
@@ -39 +39 @@
           JOIN stackSumSkyfile USING(stack_id)
           WHERE 1
-          -- input where hook %s
+          @STACK1_QUERY@ -- input constraint
 ) AS diffExp ON diffExp.stack1 = stackRun.stack_id AND diffExp.stack2 = template.max_stack_id
 WHERE
         stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0
-        -- diff where hook %s
-        -- input where hook again %s
+        @STACK1_QUERY@ -- input constraint
 group by stackRun.stack_id,
        stackRun.data_group,
@@ -54 +53 @@
        template.max_stack_id,
        template.template_label
+       @DIFF1_QUERY@  -- diff constraint
 ORDER BY stackRun.data_group,stackRun.filter,stackRun.skycell_id

branches/eam_branches/ipp-20101103/ippTools/src/difftool.c

@@ -2009 +2009 @@
     if (psListLength(stack1Where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(stack1Where, NULL);
-        psStringAppend(&stack1Query, "\n AND %s", whereClause);
+        psStringAppend(&stack1Query, "AND %s", whereClause);
         psFree(whereClause);
-    } else {
-        stack1Query = psStringCopy("\n");
-    }
+    } 
     psFree(stack1Where);
 
     if (psListLength(stack2Where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(stack2Where, NULL);
-        psStringAppend(&stack2Query, "\n AND %s", whereClause);
+        psStringAppend(&stack2Query, "AND %s", whereClause);
         psFree(whereClause);
-    } else {
-        stack2Query = psStringCopy("\n");
-    }
+    } 
     psFree(stack2Where);
-
   
     // don't queue for stacks that have already been diffed unless requested
@@ -2030 +2025 @@
     psString diffQuery1 = NULL;
     if (! (reRun || newTemplates) ) {
-        psStringAppend(&diffQuery0, "\n AND diffExp.diff_id IS NULL");
-        psStringAppend(&diffQuery1, "\n AND n_diff = 0");
-    } else {
-        diffQuery0 = psStringCopy("\n");
-        diffQuery1 = psStringCopy("\n");
-    }
+        psStringAppend(&diffQuery0, "AND diffExp.diff_id IS NULL");
+        psStringAppend(&diffQuery1, "HAVING n_diff = 0");
+    } 
 
     // find the distinct set of data_groups and filters
@@ -2050 +2042 @@
     }
 
-    if (!p_psDBRunQueryF(config->dbh, query, stack2Query, stack1Query, diffQuery0, stack1Query)) {
+    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);
@@ -2118 +2114 @@
         psString thisWhere = psDBGenerateWhereConditionSQL(row,NULL);
         psStringSubstitute(&thisWhere,"stackRun.","INPUT_");
-        psStringAppend(&this_stack1Query,"\n AND %s", thisWhere);
+        psStringAppend(&this_stack1Query,"AND %s", thisWhere);
         psFree(thisWhere);
 
-        psTrace("difftool",1, query,stack2Query,this_stack1Query,diffQuery1,this_stack1Query);
+        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");
@@ -2127 +2127 @@
         }
 
-        if (!p_psDBRunQueryF(config->dbh, query, stack2Query, this_stack1Query, diffQuery1, this_stack1Query)) {
+        if (!p_psDBRunQuery(config->dbh, query)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(query);