Changeset 37165 for trunk/ippTools

Timestamp:

Jul 31, 2014, 3:54:49 PM (12 years ago)

Author:

bills

Message:

accept arugment -replace in releastool -setrelstacktocalibrated and
replace the calibration regardless of state. Used to correct errors

Location:

trunk/ippTools

Files:

• share/releasetool_setrelstackcalibratedfromskycal.sql (modified) (1 diff)
• src/releasetool.c (modified) (3 diffs)
• src/releasetoolConfig.c (modified) (1 diff)

trunk/ippTools/share/releasetool_setrelstackcalibratedfromskycal.sql

@@ -9 +9 @@
     relStack.zpt_stdev = skycalResult.zpt_stdev,
     relStack.state = 'calibrated'
-WHERE relStack.state = 'processed'

trunk/ippTools/src/releasetool.c

@@ -1124 +1124 @@
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    PXOPT_LOOKUP_BOOL(replace, config->args, "-replace", false);
 
     psString query = pxDataGet("releasetool_setrelstackcalibratedfromskycal.sql");
@@ -1132 +1133 @@
     }
 
+    if (replace) {
+        // don't cut on relStack.state
+        psStringAppend(&query, "\nWHERE ");;
+    } else {
+        // normal path only update rows in state processed
+        psStringAppend(&query, "\nWHERE relStack.state = 'processed'\nAND ");;
+    }
+        
     // Add in the where conditions
     psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-    psStringAppend(&query, "\nAND %s", whereClause);
+    psStringAppend(&query, "%s", whereClause);
     psFree(whereClause);
 
@@ -1233 +1242 @@
 
     PXOPT_COPY_STR(config->args, where, "-surveyName",  "survey.surveyName", "LIKE");
-    PXOPT_COPY_S32(config->args, where, "-rel_id",      "relExp.rel_id", "==");
+    PXOPT_COPY_S32(config->args, where, "-rel_id",      "relStack.rel_id", "==");
     pxskycellAddWhere(config, where);
 

trunk/ippTools/src/releasetoolConfig.c

@@ -277 +277 @@
     pxskycellAddArguments(calibraterelstackArgs);
 
+    psMetadataAddBool(calibraterelstackArgs, PS_LIST_TAIL, "-replace",   0, "replace any existing calibrations", false);
     psMetadataAddU64(calibraterelstackArgs, PS_LIST_TAIL,  "-limit",   0, "limit result set to N items", 0);