Changeset 26147

Timestamp:

Nov 13, 2009, 3:21:27 PM (16 years ago)

Author:

Paul Price

Message:

Need to restrict stacks by the label. Reworked how the query is generated --- using hooks instead of multiple parts.

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/stacktool_definebyquery_part1.sql (deleted)
• share/stacktool_definebyquery_part2.sql (deleted)
• share/stacktool_definebyquery_select.sql (added)
• src/stacktool.c (modified) (4 diffs)

trunk/ippTools/share/Makefile.am

@@ -247 +247 @@
      stacktool_definebyquery_insert_random_part1.sql \
      stacktool_definebyquery_insert_random_part2.sql \
-     stacktool_definebyquery_part1.sql \
-     stacktool_definebyquery_part2.sql \
+     stacktool_definebyquery_select.sql \
      stacktool_definebyquery_test.sql \
      stacktool_donecleanup.sql \

trunk/ippTools/src/stacktool.c

@@ -150 +150 @@
     PXOPT_COPY_F32(config->args,  where, "-select_iq_m4_min",          "camProcessedExp.iq_m4", ">=");
     PXOPT_COPY_F32(config->args,  where, "-select_iq_m4_max",          "camProcessedExp.iq_m4", "<=");
-    
+
     PXOPT_COPY_STR(config->args,  where, "-select_exp_type",           "rawExp.exp_type", "==");
     PXOPT_COPY_F32(config->args,  where, "-select_good_frac_min",      "warpSkyfile.good_frac", ">=");
@@ -173 +173 @@
     }
 
-    psString select = pxDataGet("stacktool_definebyquery_part1.sql");
+    psString select = pxDataGet("stacktool_definebyquery_select.sql");
     if (!select) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
@@ -179 +179 @@
     }
 
+    psString where1 = psStringCopy("");
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&select, " AND %s", whereClause);
+        psStringAppend(&where1, "\nAND %s", whereClause);
         psFree(whereClause);
     }
-
-    psString groupby = pxDataGet("stacktool_definebyquery_part2.sql");
-    if (!groupby) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
-        psFree(where);
-        return false;
-    }
-    psStringAppend(&select, " %s", groupby);
-    psFree(groupby);
+    psFree(where);
+
+    psString where2 = psStringCopy("");
+    if (label) {
+        psStringAppend(&where2, "\nWHERE stackRun.label = '%s'", label);
+    }
 
     // Restriction on aggregated quantities using HAVING
@@ -224 +222 @@
     psFree(having);
 
-    if (!p_psDBRunQuery(config->dbh, select)) {
+    if (!p_psDBRunQueryF(config->dbh, select, where1, where2)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(select);
-        psFree(where);
+        psFree(where1);
+        psFree(where2);
         return false;
     }
     psFree(select);
+    psFree(where1);
+    psFree(where2);
 
     psArray *output = p_psDBFetchResult(config->dbh);