Changeset 35227 for trunk/ippTools/src

Timestamp:

Mar 4, 2013, 2:08:07 PM (13 years ago)

Author:

bills

Message:

updates to release tables. This version was used to create the
tables in gpc1

Location:

trunk/ippTools/src

Files:

• releasetool.c (modified) (2 diffs)
• releasetoolConfig.c (modified) (1 diff)

trunk/ippTools/src/releasetool.c

@@ -214 +214 @@
     PXOPT_LOOKUP_STR(release_state,    config->args, "-set_release_state",  false, false);
     PXOPT_LOOKUP_S32(priority,         config->args, "-set_priority",  false, false);
-    if (!release_state && !priority) {
-        psError(PXTOOLS_ERR_CONFIG, true, "at least one of -set_release_staate and -set_priority is required\n");
+    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");
         return false;
     }
@@ -233 +234 @@
     if (priority != 0) {
         psStringAppend(&query, "%s priority = %d", sep, priority);
+        sep = comma;
+    }
+    if (dataRelease != -1) {
+        psStringAppend(&query, "%s dataRelease = %d", sep, dataRelease);
         sep = comma;
     }

trunk/ippTools/src/releasetoolConfig.c

@@ -74 +74 @@
     psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_release_state", 0,  "define new release state", NULL);
     psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_priority", 0,       "define new release priority", 0);
-
-    // Only support changing state and priority for now
-//    psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_surveyID", 0,       "define surveyID (required)", 0);
-//    psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_release_name", 0,    "define release name (required)", NULL);
-//    psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_dataRelease", 0,    "define dataRelease", -1);
+    psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_dataRelease", 0,    "define data release", -1);