Changeset 415 for projects/whoosh/trunk/src/whoosh/qparser/default.py

Timestamp:

02/03/2010 06:45:12 PM (7 months ago)

Author:

matt

Message:

Work on NUMERIC, DATETIME, and BOOLEAN field types.
Changes instances of test_index to testindex.

Files:

• projects/whoosh/trunk/src/whoosh/qparser/default.py (modified) (3 diffs)

projects/whoosh/trunk/src/whoosh/qparser/default.py

@@ -182 +182 @@
     
     def get_term_text(self, field, text, **kwargs):
-        if not field.format:
-            raise Exception("%s field has no format" % field)
-        
         # Just take the first token
-        for token in field.format.analyze(text, mode="query", **kwargs):
-            return token.text
+        for t in field.process_text(text, mode="query", **kwargs):
+            return t
     
     def make_term(self, fieldname, text):
         field = self._field(fieldname)
         if field:
-            text = self.get_term_text(field, text)
-        if not text:
+            if field.parse_query:
+                return field.parse_query(fieldname, text)
+            else:
+                text = self.get_term_text(field, text)
+        
+        if text is None:
             return NullQuery
         return self.termclass(fieldname, text)
@@ -200 +201 @@
         field = self._field(fieldname)
         if field:
-            texts = [t.text for t in field.format.analyze(text, mode="query")]
+            if field.parse_query:
+                return field.parse_query(fieldname, text)
+            
+            texts = list(field.process_text(text, mode="query"))
             if not texts:
                 return self.termclass(fieldname, u'')
@@ -213 +217 @@
         field = self._field(fieldname)
         if field:
-            ptext = self.get_term_text(field, text, tokenize=False, removestops=False)
-            if ptext: text = ptext
+            text = self.get_term_text(field, text, tokenize=False, removestops=False)
         return Wildcard(fieldname, text)