Changeset 27133

Timestamp:

Mar 2, 2010, 9:54:29 AM (16 years ago)

Author:

bills

Message:

various enhancements to camtool -processedexp to support the postage stamp server

Location:

trunk/ippTools

Files:

• share/camtool_find_processedexp.sql (modified) (2 diffs)
• src/camtool.c (modified) (2 diffs)
• src/camtoolConfig.c (modified) (1 diff)

trunk/ippTools/share/camtool_find_processedexp.sql

@@ -3 +3 @@
     camRun.workdir,
     camRun.label,
+    camRun.magicked,
     chipRun.chip_id,
+    chipRun.magicked as chip_magicked,
     rawExp.exp_tag,
     rawExp.exp_name,
@@ -11 +13 @@
     rawExp.telescope,
     rawExp.filelevel,
+    rawExp.magicked as raw_magicked,
     rawExp.comment
 FROM camRun

trunk/ippTools/src/camtool.c

@@ -686 +686 @@
     PXOPT_COPY_S64(config->args, where, "-cam_id",    "camRun.cam_id",    "==");
     pxAddLabelSearchArgs (config, where, "-label",    "camRun.label",     "==");
+    pxAddLabelSearchArgs (config, where, "-data_group", "camRun.data_group",     "LIKE");
     PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "==");
 
-    if (!psListLength(where->list) &&
+    psString where2 = NULL;
+    if (!pxspaceAddWhere(config, &where2, "rawExp")) {
+        psError(psErrorCodeLast(), false, "pxSpaceAddWhere failed");
+        return false;
+    }
+    if (!pxmagicAddWhere(config, &where2, "chipRun")) {
+        psError(psErrorCodeLast(), false, "pxSpaceAddWhere failed");
+        return false;
+    }
+    if (!psListLength(where->list) && !where2 &&
         !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
@@ -725 +735 @@
     }
     psFree(where);
+    if (where2) {
+        psStringAppend(&query, " %s", where2);
+        psFree(where2);
+    }
 
     // order by cam_id so that the postage stamp parser can easliy find the 'latest' astrometry
-    psStringAppend(&query, " ORDER BY cam_id");
+    psStringAppend(&query, " ORDER BY exp_id, cam_id");
 
     // treat limit == 0 as "no limit"

trunk/ippTools/src/camtoolConfig.c

@@ -178 +178 @@
     psMetadataAddS64(processedexpArgs, PS_LIST_TAIL, "-cam_id",   0,            "search by cam_id", 0);
     psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by camRun label", NULL);
+    psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by camRun data_group (LIKE comparison)", NULL);
     psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-reduction",0,            "search by camRun reduction class", NULL);
+    pxspaceAddArguments(processedexpArgs);
+    pxmagicAddArguments(processedexpArgs);
 
     psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit",    0,            "limit result set to N items", 0);