Changeset 35896 for trunk/ippTools/src/releasetool.c

Timestamp:

Aug 6, 2013, 11:05:55 AM (13 years ago)

Author:

bills

Message:

Add columns ippRelease.dvodb and ippRelease.ubercal_file and relExp.ubercal_dist

File:

• trunk/ippTools/src/releasetool.c (modified) (7 diffs)

trunk/ippTools/src/releasetool.c

@@ -180 +180 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_S32(surveyID,    config->args, "-set_surveyID", true, false);
-    PXOPT_LOOKUP_STR(release_name, config->args, "-set_release_name", true, false);
+    PXOPT_LOOKUP_S32(surveyID,    config->args,   "-set_surveyID", true, false);
+    PXOPT_LOOKUP_STR(release_name, config->args,  "-set_release_name", true, false);
     PXOPT_LOOKUP_STR(release_state, config->args, "-set_release_state",  true, false);
-    PXOPT_LOOKUP_S32(dataRelease, config->args, "-set_dataRelease", false, false);
-    PXOPT_LOOKUP_S32(priority,    config->args, "-set_priority", false, false);
+    PXOPT_LOOKUP_S32(dataRelease, config->args,   "-set_dataRelease", false, false);
+    PXOPT_LOOKUP_S32(priority,    config->args,   "-set_priority", false, false);
+    PXOPT_LOOKUP_STR(dvodb, config->args,         "-set_dvodb",  false, false);
+    PXOPT_LOOKUP_STR(ubercal_file, config->args,  "-set_ubercal_file",  false, false);
 
     if (!ippReleaseInsert(config->dbh,
@@ -192 +194 @@
         release_state,
         dataRelease,
-        priority
+        priority,
+        dvodb,
+        ubercal_file
     )) {
         psError(PS_ERR_UNKNOWN, false, "failed to insert ippRelease");
@@ -215 +219 @@
     PXOPT_LOOKUP_S32(priority,         config->args, "-set_priority",  false, false);
     PXOPT_LOOKUP_S32(dataRelease,      config->args, "-set_dataRelease",  false, false);
-    if (!release_state && priority == 0 && dataRelease == -1) {
-        psError(PXTOOLS_ERR_CONFIG, true, "at least one of -set_release_state -set_priority and -set_dataRelease is required\n");
+    PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb",  false, false);
+    PXOPT_LOOKUP_STR(ubercal_file, config->args, "-set_ubercal_file",  false, false);
+    if (!release_state && priority == 0 && dataRelease == -1 && !dvodb && !ubercal_file) {
+        psError(PXTOOLS_ERR_CONFIG, true, "at least one of -set_release_state -set_priority -set_dvodb -set_ubercal_file and -set_dataRelease is required\n");
         return false;
     }
@@ -366 +372 @@
     PXOPT_LOOKUP_F32(user_zpt_obs, config->args,   "-set_zpt_obs", false, false);
     PXOPT_LOOKUP_F32(user_zpt_stdev, config->args, "-set_zpt_stdev", false, false);
+    PXOPT_LOOKUP_S32(ubercal_dist, config->args, "-set_ubercal_dist", false, false);
     PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false);
     PXOPT_LOOKUP_S16(fault, config->args,     "-set_fault", false, false);
@@ -456 +463 @@
             zpt_obs,
             zpt_stdev,
+            ubercal_dist,
             path_base,
             fault,
@@ -500 +508 @@
     PXOPT_LOOKUP_F32(zpt_stdev,config->args, "-set_zpt_stdev",  false, false);
     PXOPT_LOOKUP_S16(fault,    config->args, "-set_fault",  false, false);
+    PXOPT_LOOKUP_S32(ubercal_dist, config->args, "-set_ubercal_dist", false, false);
     PXOPT_LOOKUP_BOOL(clearfault, config->args, "-clearfault",  false);
-    if (!state && !flags && !path_base && !isfinite(zpt_obs) && !isfinite(zpt_stdev) && !fault && !clearfault) {
+    if (!state && !flags && !path_base && !isfinite(zpt_obs) && !isfinite(zpt_stdev) && !fault && !clearfault && !ubercal_dist) {
         psError(PXTOOLS_ERR_CONFIG, true, "must set at least one column\n");
         return false;
@@ -555 +564 @@
     if (clearfault) {
         psStringAppend(&query, "%s relExp.fault = 0", sep);
+        sep = comma;
+    }
+    if (ubercal_dist) {
+        psStringAppend(&query, "%s relExp.ubercal_dist = %d", sep, ubercal_dist);
         sep = comma;
     }