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

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

File:

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

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 [] = {