Changeset 42699 for branches/eam_branches/ipp-20230313/ippTools/src/xcfftool.c

Timestamp:

Jun 24, 2024, 9:16:02 AM (2 years ago)

Author:

eugene

Message:

shakedown the xcstack-related tools; make staticsky definebyquery skycell_id selection a LIKE

File:

• branches/eam_branches/ipp-20230313/ippTools/src/xcfftool.c (modified) (2 diffs)

branches/eam_branches/ipp-20230313/ippTools/src/xcfftool.c

@@ -180 +180 @@
     PXOPT_COPY_S64(config->args, warpWhereMD, "-select_warp_id",         "warpRun.warp_id",         "==");
     PXOPT_COPY_F32(config->args, warpWhereMD, "-select_good_frac_min",   "warpSkyfile.good_frac",  ">=");
-    // XXX is is really necessary to limit the warps?
+    // it is necessary to limit the warps otherwise the warpQueryTemplate (line 282) will be ill-formed
     if (!psListLength(warpWhereMD->list)) {
         psError(PXTOOLS_ERR_CONFIG, false, "warp search parameters are required");
@@ -279 +279 @@
     psString warpQueryTemplate = pxDataGet("xcfftool_definebyquery_select_warps.sql");
 
+    // note the GROUP BY: if warpWhereMD is empty, this contruction
+    // will yield nonsense
     whereClause = psDBGenerateWhereConditionSQL(warpWhereMD, NULL);
-    psStringAppend(&warpQueryTemplate, "\n AND %s", whereClause);
+    psStringAppend(&warpQueryTemplate, "\n AND %s GROUP BY warp_id", whereClause);
 
     for (long i = 0; i < output->n; i++) {