Changeset 95

Timestamp:

07/17/06 16:12:39 (2 years ago)

Author:

robin

Message:

bugfix: ensure a plural param matched as the last field picks up all the tail words

Files:

• freeform/trunk/freeform/match.py (modified) (1 diff)
• freeform/trunk/freeform_tests/profile_match.py (modified) (1 diff)
• freeform/trunk/freeform_tests/test_match.py (modified) (1 diff)

freeform/trunk/freeform/match.py

@@ -229 +229 @@
-        #_debug_current_production(match, candidateforms, formfieldtypes,
-        #    ifield-1,ifield,iword,ipluralstart,fieldcount-1)
+    # if the last field was a plural, make sure we collect all the trailing
+    # words.
+    if ipluralstart > -1:
+        match[-1].extend(words[iword:])
-    return match, candidateforms
-

freeform/trunk/freeform_tests/profile_match.py

@@ -8 +8 @@
-
-try:
-
+#
-    PROFILE=1
-except ImportError:

freeform/trunk/freeform_tests/test_match.py

@@ -199 +199 @@
-
-class TestDisambiguation(unittest.TestCase):
+    def test_plurals_as_last_candidatefield(self):
+        compiler = self.compiler
+        commandforms,e = compiler(['''\
+easy_track:
+    easytrac {label} {location} from {track(s)};'''])
+        formtable = formtable_prepare(create_formtable(*commandforms))
+        result = match_command(formtable,
+            'easytrac barnwel-1 barnwell from tG,tS:0,60 0,60 25,40'.split())
+        self.assertNotEqual(result, None)
+        self.assertNotEqual(result[0], None)
+        (cmd,form),valuemap=result
+        self.assertEqual(cmd, 'easy_track')
+        self.assertEqual(valuemap.has_key('track'), True)
+        self.assertEqual(len(valuemap['track'][0]), 3)
+
-    def _generic_source_tests(self, name, compiler = None):
-        compiler = compiler or self.compiler