Changeset 42597

Timestamp:

Jan 20, 2024, 10:44:12 AM (2 years ago)

Author:

eugene

Message:

all of the xcfftool modes seem to work at the basic table-interaction level

Location:

branches/eam_branches/ipp-20230313/ippTools

Files:

• share/xcfftool_summary.sql (modified) (1 diff)
• share/xcfftool_toadvance.sql (modified) (1 diff)
• src/xcfftool.c (modified) (3 diffs)
• src/xcfftoolConfig.c (modified) (1 diff)

branches/eam_branches/ipp-20230313/ippTools/share/xcfftool_summary.sql

@@ -9 +9 @@
     xcForceRun.tess_id,
     xcForceRun.skycell_id,
-    'summary' AS dist_component,
+    'summary' AS dist_component
 FROM xcForceRun
     JOIN xcForceSummary USING(xcff_id)

branches/eam_branches/ipp-20230313/ippTools/share/xcfftool_toadvance.sql

@@ -9 +9 @@
     LEFT JOIN xcForceResult USING(xcff_id, warp_id)
     LEFT JOIN xcForceSummary USING(xcff_id)
-WHERE xcForceRun.state = 'new' AND xcForceSummary.ff_id IS NULL
+WHERE xcForceRun.state = 'new' AND xcForceSummary.xcff_id IS NULL
     -- WHERE hook %s
     GROUP BY xcff_id

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

@@ -539 +539 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-xcff_id",    "xcForceRun.xcff_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-xccal_id",  "xcForceRun.xccal_id", "==");
     PXOPT_COPY_S64(config->args, where, "-warp_id",    "xcForceResult.warp_id", "==");
     PXOPT_COPY_S64(config->args, where, "-exp_id",     "rawExp.exp_id", "==");
     PXOPT_COPY_STR(config->args, where, "-exp_name",   "rawExp.exp_name", "==");
-    PXOPT_COPY_S64(config->args, where, "-xccal_id",  "xcForceRun.xccal_id", "==");
-    PXOPT_COPY_S64(config->args, where, "-stack_id",   "stackRun.stack_id", "==");
+    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_STR(config->args, where, "-label",      "xcForceRun.label", "==");
     PXOPT_COPY_STR(config->args, where, "-data_group", "xcForceRun.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_STR(config->args, where, "-filter",      "stackRun.filter", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-filter",     "rawExp.filter", "LIKE");
     PXOPT_COPY_S16(config->args, where, "-fault",      "xcForceResult.fault", "==");
     PXOPT_COPY_S16(config->args, where, "-quality",    "xcForceResult.quality", "==");
@@ -625 +624 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_S64(config->args, where, "-xcff_id", "xcForceRun.ff_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-xcff_id", "xcForceRun.xcff_id", "==");
     PXOPT_COPY_S64(config->args, where, "-warp_id", "xcForceResult.warp_id", "==");
     pxAddLabelSearchArgs(config, where, "-label", "xcForceRun.label", "==");
@@ -991 +990 @@
     }
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_S64(config->args, where, "-ff_id", "ff_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-xcff_id", "xcff_id", "==");
 
     ExportTable tables [] = {

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

@@ -119 +119 @@
     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, "-filter", 0, "search by rawExp filter", NULL);
     psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group (LIKE comparison)", NULL);
-    psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-quality", 0, "search by quality value", 0);
     pxskycellAddArguments(resultArgs);
     psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
+    psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-quality", 0, "search by quality value", 0);
     psMetadataAddU64(resultArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
     psMetadataAddBool(resultArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);