Changeset 33384

Timestamp:

Feb 29, 2012, 7:39:44 AM (14 years ago)

Author:

bills

Message:

Fix bug in staticskytool -result. It was listing the filter in the
output which causes num_filters entries when a staticskyRun has
multiple filters. Change the sql to group by sky_id and list num_filters
instead. Also allow selection by tess_id and skycell_id

Location:

trunk/ippTools

Files:

• share/staticskytool_result.sql (modified) (2 diffs)
• src/staticskytool.c (modified) (2 diffs)
• src/staticskytoolConfig.c (modified) (1 diff)

trunk/ippTools/share/staticskytool_result.sql

@@ -1 @@
-SELECT DISTINCT
+SELECT
     staticskyResult.*,
     staticskyRun.state,
@@ -6 +6 @@
     stackRun.tess_id,
     stackRun.skycell_id,
-    stackRun.filter
+    count(stackRun.filter) AS num_filters
 FROM staticskyRun
 JOIN staticskyResult USING(sky_id)

trunk/ippTools/src/staticskytool.c

@@ -635 +635 @@
     PXOPT_COPY_STR(config->args, where, "-label",      "staticskyRun.label", "==");
     PXOPT_COPY_STR(config->args, where, "-data_group", "staticskyRun.data_group", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-tess_id", "stackRun.tess_id", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "LIKE");
     PXOPT_COPY_S16(config->args, where, "-fault",      "staticskyResult.fault", "==");
 
@@ -659 +661 @@
     psFree(where);
 
+    psStringAppend(&query, "\nGROUP BY sky_id");
+
     // treat limit == 0 as "no limit"
     if (limit) {
         psString limitString = psDBGenerateLimitSQL(limit);
-        psStringAppend(&query, " %s", limitString);
+        psStringAppend(&query, "\n%s", limitString);
         psFree(limitString);
     }

trunk/ippTools/src/staticskytoolConfig.c

@@ -108 +108 @@
     psMetadata *resultArgs= psMetadataAlloc();
     psMetadataAddS64(resultArgs, PS_LIST_TAIL, "-sky_id", 0, "search by staticsky ID", 0);
-    // psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", 0);
-    // psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", 0);
+    psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID (LIKE comparison)", 0);
+    psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID (LIKE comparison)", 0);
     psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
     psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group (LIKE comparison)", NULL);