Changeset 19434

Timestamp:

Sep 9, 2008, 9:28:07 AM (18 years ago)

Author:

Paul Price

Message:

Adding search on label to stacktool -tosum

Location:

trunk/ippTools

Files:

• share/stacktool_tosum.sql (modified) (1 diff)
• src/stacktool.c (modified) (5 diffs)
• src/stacktoolConfig.c (modified) (1 diff)

trunk/ippTools/share/stacktool_tosum.sql

@@ -4 +4 @@
     stackRun.skycell_id,
     stackRun.workdir,
+    stackRun.label,
     rawExp.camera
 FROM stackRun

trunk/ippTools/src/stacktool.c

@@ -315 +315 @@
             "new",                      // state
             workdir,
-            label,
-            reduction,
-            dvodb,
+            label,
+            reduction,
+            dvodb,
             registered,
             skycell_id,
@@ -356 +356 @@
         // this insert needs to use exactly the same restrictions (race condition is probably not critical)
         // the insert below seems to only restrict matches to the skycell, tess, and filter
-        if ((randomLimit > 0 && !p_psDBRunQuery(config->dbh, thisInsert, skycell_id, filter, randomLimit)) ||
+        if ((randomLimit > 0 && !p_psDBRunQuery(config->dbh, thisInsert, skycell_id, filter, randomLimit)) ||
             (randomLimit <= 0 && !p_psDBRunQuery(config->dbh, thisInsert, skycell_id, filter))) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -419 +419 @@
         "new",                          // state
         workdir,
-        label,
-        reduction,
-        dvodb,
+        label,
+        reduction,
+        dvodb,
         registered,
         skycell_id,
@@ -611 +611 @@
     PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
     PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -708 +709 @@
                                uri,
                                path_base,
-                               "full",  // data_state
+                               "full",  // data_state
                                bg,
                                bg_stdev,

trunk/ippTools/src/stacktoolConfig.c

@@ -114 +114 @@
     psMetadata *tosumArgs = psMetadataAlloc();
     psMetadataAddS64(tosumArgs, PS_LIST_TAIL, "-stack_id", 0,            "search by stack ID", 0);
+    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
     psMetadataAddS64(tosumArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warp ID", 0);
     psMetadataAddU64(tosumArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);