Changeset 38156 for trunk/ippTools

Timestamp:

Apr 20, 2015, 12:30:33 PM (11 years ago)

Author:

bills

Message:

Add column ippRelease.accessLevelMin which is an integer that defines the minimum
user accessLevel required to access data from the given release. This will be
used to restrict access to stacks that use post PS1SC data.

Location:

trunk/ippTools/src

Files:

• releasetool.c (modified) (4 diffs)
• releasetoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/releasetool.c

@@ -195 +195 @@
     PXOPT_LOOKUP_STR(dvodb, config->args,         "-set_dvodb",  false, false);
     PXOPT_LOOKUP_STR(ubercal_file, config->args,  "-set_ubercal_file",  false, false);
+    PXOPT_LOOKUP_S32(accessLevelMin,    config->args,   "-set_accessLevelMin", false, false);
 
     if (!ippReleaseInsert(config->dbh,
@@ -204 +205 @@
         priority,
         dvodb,
-        ubercal_file
+        ubercal_file,
+        accessLevelMin
     )) {
         psError(PS_ERR_UNKNOWN, false, "failed to insert ippRelease");
@@ -229 +231 @@
     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) {
+    PXOPT_LOOKUP_S32(accessLevelMin,    config->args,   "-set_accessLevelMin", false, false);
+    if (!release_state && priority == 0 && dataRelease == -1 && !dvodb && !ubercal_file && accessLevelMin < 0) {
         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;
@@ -252 +255 @@
     if (dataRelease != -1) {
         psStringAppend(&query, "%s dataRelease = %d", sep, dataRelease);
+        sep = comma;
+    }
+    if (accessLevelMin != -1) {
+        psStringAppend(&query, "%s accessLevelMin = %d", sep, accessLevelMin);
         sep = comma;
     }

trunk/ippTools/src/releasetoolConfig.c

@@ -62 +62 @@
     psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_release_name", 0,   "define release name (required)", NULL);
     psMetadataAddS32(definereleaseArgs, PS_LIST_TAIL, "-set_dataRelease", 0,   "define dataRelease", -1);
+    psMetadataAddS32(definereleaseArgs, PS_LIST_TAIL, "-set_accessLevelMin", 0,   "define accessLevelMin", 0);
     psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_release_state", 0, "define release state", NULL);
     psMetadataAddS32(definereleaseArgs, PS_LIST_TAIL, "-set_priority", 0,      "define release priority", 0);
@@ -77 +78 @@
     psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_priority", 0,       "define new release priority", 0);
     psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_dataRelease", 0,    "define data release", -1);
+    psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_accessLevelMin", 0,   "define accessLevelMin", -1);
     psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_dvodb", 0,         "define new dvo db name", NULL);
     psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_ubercal_file", 0,  "define new ubercal file name", NULL);