Changeset 27739

Timestamp:

Apr 23, 2010, 11:21:34 AM (16 years ago)

Author:

bills

Message:

Various changes to -processedexp to support the postage stamp server

Location:

trunk/ippTools

Files:

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

trunk/ippTools/share/camtool_find_processedexp.sql

@@ -5 +5 @@
     camRun.magicked,
     chipRun.chip_id,
+    chipRun.state as chip_state,
     chipRun.magicked as chip_magicked,
     rawExp.exp_tag,

trunk/ippTools/src/camtool.c

@@ -681 +681 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false);
+    PXOPT_LOOKUP_BOOL(pstamp_order, config->args, "-pstamp_order", false);
 
     // generate restrictions
@@ -741 +742 @@
     }
 
-    // order by cam_id so that the postage stamp parser can easliy find the 'latest' astrometry
-    psStringAppend(&query, " ORDER BY exp_id, cam_id");
+
+    if (pstamp_order) {
+        // put runs in order of exposure id with newest chip Runs first
+        // The postage stamp parser depends on this behavior
+        psStringAppend(&query, " ORDER BY exp_id, cam_id DESC");
+    }
 
     // treat limit == 0 as "no limit"

trunk/ippTools/src/camtoolConfig.c

@@ -184 +184 @@
     pxmagicAddArguments(processedexpArgs);
 
+    psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-pstamp_order",  0,      "order the results for the postage stamp server", false);
+
     psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit",    0,            "limit result set to N items", 0);
     psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-all",     0,            "list everything without restriction", false);