Correctly handle the case of mixes of character-based names and all-number names

This commit was SVN r24998.

orte/util/regex.c

@@ -229,6 +229,11 @@ int orte_regex_create(char *nodelist, char **regexp)
             OBJ_RELEASE(ndreg);
             continue;
         }
+        /* if there is only one range, and it has only one node in it,
+         * then we don't want to use bracket notation - so treat that
+         * case separately
+         */
+        if (1 == opal_list_get_size(&ndreg->ranges)) {
             /* must be at least one */
             range = (orte_regex_range_t*)opal_list_get_first(&ndreg->ranges);
             /* if there is only one node in the range, then
@@ -253,6 +258,7 @@ int orte_regex_create(char *nodelist, char **regexp)
                 OBJ_RELEASE(ndreg);
                 continue;
             }
+        }
         /* start the regex for this nodeid with the prefix */
         if (NULL != ndreg->prefix) {
             asprintf(&tmp, "%s[%d:", ndreg->prefix, ndreg->num_digits);
@@ -423,6 +429,8 @@ int orte_regex_extract_node_names(char *regexp, char ***names)
                 free(orig);
                 return ret;
             }
+            /* step over the comma */
+            i++;
             /* set base equal to the (possible) next base to look at */
             base = &base[i];
         }