Changeset 38296 for trunk/ippTools

Timestamp:

May 21, 2015, 8:13:08 AM (11 years ago)

Author:

bills

Message:

Minor changes to staticskytool to support "updating" runs.
Add path_base to -todo mode. This will list NULL for new runs and
the existing path base for runs in state update.
Add -set_quality option to -updateresult

Location:

trunk/ippTools

Files:

• share/staticskytool_todo.sql (modified) (2 diffs)
• src/staticskytool.c (modified) (1 diff)
• src/staticskytoolConfig.c (modified) (1 diff)

trunk/ippTools/share/staticskytool_todo.sql

@@ -12 +12 @@
     skycell.glong,
     skycell.glat,
+    staticskyResult.path_base,
     IFNULL(Label.priority, 10000) AS priority
 FROM staticskyRun
@@ -20 +21 @@
 LEFT JOIN Label ON staticskyRun.label = Label.label
 WHERE
-   (staticskyRun.state = 'new' AND staticskyResult.sky_id IS NULL)
+   ((staticskyRun.state = 'new' AND staticskyResult.sky_id IS NULL)
+    OR (staticskyRun.state = 'update' AND staticskyResult.fault = 0))
+    
    AND (Label.active OR Label.active IS NULL)
 

trunk/ippTools/src/staticskytool.c

@@ -787 +787 @@
 
     PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
+    PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false);
 
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-sky_id",   "sky_id",   "==");
 
-    if (!pxSetFaultCode(config->dbh, "staticskyResult", where, fault, 0)) {
+    if (!pxSetFaultCode(config->dbh, "staticskyResult", where, fault, quality)) {
         psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
         psFree (where);

trunk/ippTools/src/staticskytoolConfig.c

@@ -148 +148 @@
     psMetadataAddS64(updateresultArgs, PS_LIST_TAIL, "-sky_id", 0, "define staticksky ID (required)", 0);
     psMetadataAddS16(updateresultArgs, PS_LIST_TAIL, "-fault", 0, "set fault code (required)", 0);
+    psMetadataAddS16(updateresultArgs, PS_LIST_TAIL, "-set_quality",  0, "set quality", 0);
 
     // -exportrun