upstream/oracle/slim_source: comparison usr/src/cmd/ai-webserver/publish

equal deleted inserted replaced

-:fbde90ccfae9
+:6f7e708c38ec
 """
 Convert criteria list into dictionary. This function is intended to be
 called by a main function, or the options parser, so it can potentially
 raise the SystemExit exception.
 Args: criteria in list format: [ criteria=value, criteria=value, ... ]
-where value can be a:  single value
+where value can be a:  single string value
+space-separated string value (list of values)
 range (<lower>-<upper>)
 Returns: dictionary of criteria { criteria: value, criteria: value, ... }
-with all keys and values in lower case
+with all keys in lower case, values are case-sensitive.
 Raises: ValueError on malformed name=value strings in input list.
 """
 cri_dict = {}
 for entry in criteria:
-entries = entry.lower().partition("=")
+entries = entry.partition("=")
 if entries[1]:
 if not entries[0]:
 raise ValueError(_("Missing criteria name in "
 "'%s'\n") % entry)
-elif entries[0] in cri_dict:
+elif entries[0].lower() in cri_dict:
 raise ValueError(_("Duplicate criteria: '%s'\n") %
 entries[0])
 elif not entries[2]:
 raise ValueError(_("Missing value for criteria "
 "'%s'\n") % entries[0])
-cri_dict[entries[0]] = entries[2]
+cri_dict[entries[0].lower()] = entries[2]
 else:
 raise ValueError(_("Criteria must be of the form "
 "<criteria>=<value>\n"))
 return cri_dict
 # collisions with database entries
 for crit in criteria:
 # gather this criteria's values from the manifest
 man_criterion = criteria[crit]
-# check "value" criteria here (check the criteria exists in DB, and
+# Determine if this crit is a range criteria or not.
-# then find collisions)
+is_range_crit = AIdb.isRangeCriteria(db.getQueue(), crit,
-if isinstance(man_criterion, basestring):
+AIdb.MANIFESTS_TABLE)
+# Process "value" criteria here (check if the criteria exists in
+# DB, and then find collisions)
+if not is_range_crit:
 # only check criteria in use in the DB
 if crit not in AIdb.getCriteria(db.getQueue(),
 onlyUsed=False, strip=False):
 raise SystemExit(_("Error:\tCriteria %s is not a " +
 "valid criteria!") % crit)
 excludeManifests=exclude_manifests)
 # will iterate over a list of the form [manName, manInst, crit,
 # None]
 for row in db_criteria:
-# check if the database and manifest values differ
+# check if a value in the list of values to be added is equal
-if(str(row[Fields.CRIT]).lower() ==
+# to a value in the list of values for this criteria for this
-str(man_criterion).lower()):
+# row
-# record manifest name, instance and criteria name
+for value in man_criterion:
-try:
+if AIdb.is_in_list(crit, value, str(row[Fields.CRIT]),
-collisions[row[Fields.MANNAME],
+None):
-row[Fields.MANINST]] += crit + ","
+# record manifest name, instance and criteria name
-except KeyError:
+try:
 collisions[row[Fields.MANNAME],
-row[Fields.MANINST]] = crit + ","
+row[Fields.MANINST]] += crit + ","
+except KeyError:
+collisions[row[Fields.MANNAME],
+row[Fields.MANINST]] = crit + ","
 # This is a range criteria.  (Check that ranges are valid, that
 # "unbounded" gets set to 0/+inf, ensure the criteria exists
 # in the DB, then look for collisions.)
 else:
 "\n\tin criteria: %s!") %
 (man_inst[0], man_inst[1],
 crit.replace('MIN', '', 1).
 replace('MAX', '', 1)))
-# the range did not collide or this is a single value (if we
+# Either the range did not collide or this is not a range
-# differ we can break out knowing we diverge for this
+# criteria.  (If the value of this criteria in the db does
+# not equal the value of this criteria for the set of criteria
+# to check, we can break out knowing we diverge for this
 # manifest/instance)
-elif str(db_criterion).lower() != str(man_criterion).lower():
+elif not db_criterion and not man_criterion:
-# manifests diverge (they don't collide)
+# Neither the value for this criteria in the db nor
+# the value for for this criteria in the given set of
+# criteria to check are populated.  Loop around to
+# check the next criteria.
+continue
+elif not db_criterion or not man_criterion:
+# One of the two are not populated, we can break knowing
+# they're different.
 break
+else:
-# end of for loop and we never broke out (diverged)
+# Both are populated.  If none of values in the list for
+# this criteria to be added are equal to any of the values
+# in the list for this criteria from the db, there will be
+# no collision.  We can break out.
+if not [value for value in man_criterion if \
+AIdb.is_in_list(crit, value, str(db_criterion), None)]:
+break
+# end of for loop and we never broke out (collision)
 else:
 raise SystemExit(_("Error:\tManifest has same criteria as " +
 "manifest: %s/%i!") %
 (man_inst[0], man_inst[1]))
 query += "NULL,NULL,"
 # this is a single value
 else:
 query += "NULL,"
-# this is a single criteria (not a range)
+# Else if this is a value criteria (not a range), insert the value
-elif isinstance(values, basestring):
+# as a space-separated list of values which will account for the case
-# translate "unbounded" to a database NULL
+# where a list of values have been given.
-if values == "unbounded":
+elif not crit.startswith('MAX'):
-query += "NULL,"
+# Join the values of the list with a space separator.
-else:
+query += "'" + AIdb.sanitizeSQL(" ".join(values)) + "',"
-# use lower case for text strings
-query += "'" + AIdb.sanitizeSQL(str(values).lower()) + "',"
 # else values is a range
 else:
 for value in values:
 # translate "unbounded" to a database NULL
 if value == "unbounded":
 root, errors = (verifyXML.verifyRelaxNGManifest(schema,
 StringIO.StringIO(lxml.etree.tostring(crit.getroot()))))
 logging.debug('criteria file passed RNG validation')
 if errors:
-raise ValueError(_("Error:\tFile %s failed validation:\n\t%s") %
+raise ValueError(_("Error:\tFile %s failed validation:\n"
-(criteria_path, root.message))
+"\tline %s: %s") % (criteria_path, errors.line,
+errors.message))
 try:
 verifyXML.prepValuesAndRanges(root, db, table)
 except ValueError, err:
 raise ValueError(_("Error:\tCriteria manifest error: %s") % err)
 raise AssertionError(_("Criteria contains no values"))
 def get_criterion(self, criterion):
 """
 Return criterion out of the criteria DOM
-Returns: A list for range criterion with a min and max entry
+Returns: A two-item list for range criterion with a min and max entry
-A string for value criterion
+A list of one or more values for value criterion
 """
 if self._criteria_root is None:
 return None
 for tag in source.getiterator('ai_criteria'):
 crit = tag.get('name')
 # compare criteria name case-insensitive
 if crit.lower() == criterion.lower():
 for child in tag.getchildren():
-if child.tag == "range":
+if child.text is not None:
-# this is a range response (split on white space)
+# split on white space for both values and ranges
 return child.text.split()
-elif child.tag == "value":
-# this is a value response (strip white space)
-return child.text.strip()
 # should not happen according to schema
-elif child.text is None:
+else:
 raise AssertionError(_("Criteria contains no values"))
 return None
 """
 Look up a requested criteria (akin to dictionary access) but for an

changeset 1160	6f7e708c38ec
parent 1151	95413393ef67
child 1221	31c6d2de5731