Changeset 35470

Timestamp:

May 1, 2013, 6:37:50 PM (13 years ago)

Author:

bills

Message:

in releasetool -listrelstack accept multiple -stack_type entries.
Have postage stamp parser accept 'notnightly' which it turns into -stack_type deep -stack_type reference

Location:

trunk

Files:

• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (1 diff)
• ippTools/src/releasetool.c (modified) (2 diffs)
• ippTools/src/releasetoolConfig.c (modified) (1 diff)

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -497 +497 @@
             my $stack_type = $row->{RUN_TYPE};
             if (!isnull($stack_type)) {
-                $command .= " -stack_type $stack_type";
+                if (lc($stack_type) eq 'notnightly') {
+                    $command .= " -stack_type deep -stack_type reference";
+                } else {
+                    $command .= " -stack_type $stack_type";
+                }
             }
         } else {

trunk/ippTools/src/releasetool.c

@@ -1014 +1014 @@
     PXOPT_COPY_STR(config->args, where, "-tess_id",     "relStack.tess_id", "==");
     PXOPT_COPY_STR(config->args, where, "-skycell_id",  "relStack.skycell_id", "LIKE");
-    PXOPT_COPY_STR(config->args, where, "-stack_type",  "relStack.stack_type", "==");
+//    PXOPT_COPY_STR(config->args, where, "-stack_type",  "relStack.stack_type", "==");
     PXOPT_COPY_STR(config->args, where, "-stack_data_group",  "stackRun.data_group", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-skycal_data_group", "skycalRun.data_group", "LIKE");
@@ -1029 +1029 @@
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+
+    pxAddLabelSearchArgs (config, where, "-stack_type", "relStack.stack_type", "==");
 
     psString query = pxDataGet("releasetool_listrelstack.sql");

trunk/ippTools/src/releasetoolConfig.c

@@ -227 +227 @@
     psMetadataAddStr(listrelstackArgs,  PS_LIST_TAIL, "-tess_id", 0, "select by tess_id", NULL);
     psMetadataAddStr(listrelstackArgs,  PS_LIST_TAIL, "-skycell_id", 0, "select by skycell_id (LIKE comparision)", NULL);
-    psMetadataAddStr(listrelstackArgs,  PS_LIST_TAIL, "-stack_type", 0, "select by stack_type", NULL);
+    psMetadataAddStr(listrelstackArgs,  PS_LIST_TAIL, "-stack_type", PS_META_DUPLICATE_OK, "select by stack_type", NULL);
 
     psMetadataAddStr(listrelstackArgs,  PS_LIST_TAIL, "-stack_data_group", 0, "select by stackRun.data_group (LIKE comparison)", NULL);