Changeset 19525

Timestamp:

Sep 11, 2008, 3:30:13 PM (18 years ago)

Author:

eugene

Message:

allow for selection based on warp_label or stack_label

Location:

trunk/ippTools

Files:

• share/difftool_definebyquery.sql (modified) (3 diffs)
• src/difftool.c (modified) (2 diffs)
• src/difftoolConfig.c (modified) (1 diff)

trunk/ippTools/share/difftool_definebyquery.sql

@@ -7 +7 @@
     warpsToDiff.tess_id,
     warpsToDiff.filter,
+    stacksForDiff.stack_label,
+    warpsToDiff.warp_label,
     warpsToDiff.good_frac,
     warpsToDiff.diff_id,
@@ -22 +24 @@
         warpRun.label,
         filter,
+        warpRun.label as warp_label,
         diffInputs.diff_id,
         diffInputs.kind,
@@ -50 +53 @@
         skycell_id,
         tess_id,
-        filter
+        filter,
+        label as stack_label
     FROM stackRun
     JOIN stackSumSkyfile USING(stack_id)

trunk/ippTools/src/difftool.c

@@ -912 +912 @@
     psMetadata *where = psMetadataAlloc();
 
-    PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-filter", "filter", "==");
-    PXOPT_COPY_STR(config->args, where,  "-kind", "kind", "==");
-    PXOPT_COPY_F32(config->args, where,  "-good_frac", "good_frac", ">=");
-    PXOPT_COPY_STR(config->args, where,  "-select_label", "label", "==");
+    PXOPT_COPY_S64(config->args, where, "-warp_id", "warpsToDiff.warp_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-skycell_id", "warpsToDiff.skycell_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-tess_id", "warpsToDiff.tess_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-filter", "warpsToDiff.filter", "==");
+    PXOPT_COPY_STR(config->args, where, "-stack_label", "stacksForDiff.stack_label", "==");
+    PXOPT_COPY_STR(config->args, where, "-warp_label", "warpsToDiff.warp_label", "==");
+    PXOPT_COPY_STR(config->args, where,  "-kind", "warpsToDiff.kind", "==");
+    PXOPT_COPY_F32(config->args, where,  "-good_frac", "warpsToDiff.good_frac", ">=");
+
     PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", true, false); // required options
     PXOPT_LOOKUP_STR(reduction, config->args, "-reduction", false, false); // option
@@ -942 +944 @@
 
     if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, "warpsToDiff");
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);

trunk/ippTools/src/difftoolConfig.c

@@ -139 +139 @@
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL);
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-stack_label", 0, "search by stack label", NULL);
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-warp_label", 0, "search by warp label", NULL);
     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-good_frac", 0, "minimum good fraction of skycell", NAN);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-kind", 0, "search by kind", NULL);