diff options
| author | Peter A. Bigot <pabigot@users.sourceforge.net> | 2010-05-29 13:29:24 -0500 |
|---|---|---|
| committer | Peter A. Bigot <pabigot@users.sourceforge.net> | 2010-05-29 13:29:24 -0500 |
| commit | 7c79b196cc6ce2ab6bfe1cd827a696f747a1416d (patch) | |
| tree | 2c84b5ec8dff74d14fa877e5cac95944d36e33a9 | |
| parent | 94dc9c9f7edb832b25f019322627f6d6d9d9636c (diff) | |
Fix like a87e2c7 but applying to validation
| -rw-r--r-- | pyxb/binding/content.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pyxb/binding/content.py b/pyxb/binding/content.py index 569a20d..0494845 100644 --- a/pyxb/binding/content.py +++ b/pyxb/binding/content.py @@ -765,10 +765,10 @@ class ParticleModel (pyxb.cscRoot): def _validate (self, symbol_set, output_sequence): count = 0 - #print 'Validate %d %s PRT %s' % (self.__minOccurs, self.__maxOccurs, self.__term) + #print 'VAL start %s: %d %s' % (self.__term, self.__minOccurs, self.__maxOccurs) last_size = len(output_sequence) - while self.meetsMaximum(count) and self.__term._validate(symbol_set, output_sequence): - #print 'PRT validated, cnt %d, left %s' % (count, symbol_set) + while (count != self.__maxOccurs) and self.__term._validate(symbol_set, output_sequence): + #print 'VAL %s old cnt %d, left %s' % (self.__term, count, symbol_set) this_size = len(output_sequence) if this_size == last_size: # Validated without consuming anything @@ -777,8 +777,8 @@ class ParticleModel (pyxb.cscRoot): break count += 1 last_size = this_size - result = self.meetsMinimum(count) and self.meetsMaximum(count) - #print 'END PRT %s validate %s: %s %s %s' % (self.__term, result, self.__minOccurs, count, self.__maxOccurs) + result = self.satisfiesOccurrences(count) + #print 'VAL end PRT %s res %s: %s %s %s' % (self.__term, result, self.__minOccurs, count, self.__maxOccurs) return result class _Group (ContentModel_mixin): |