Unscrewed Globbing dependencies in text index, fixed non-globbing

vocabularies. redid Lexicon interface.
zopefoundation · Mar 25, 2000 · 884298b · 884298b
1 parent 7cd5167
commit 884298b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Catalog.py b/Catalog.py
@@ -533,6 +533,8 @@ def searchResults(self, REQUEST=None, used=None,
                           type(''): Query.String,
                           }, **kw):
 
+
+
         # Get search arguments:
         if REQUEST is None and not kw:
             try: REQUEST=self.REQUEST

diff --git a/Vocabulary.py b/Vocabulary.py
@@ -156,8 +156,11 @@ def __init__(self, id, title='', globbing=None):
     def query(self, pattern):
         """ """
         result = []
-        for x in self.lexicon.query(pattern):
-            result.append(self.lexicon._inverseLex[x])
+        for x in self.lexicon.get(pattern):
+            if self.globbing:
+                result.append(self.lexicon._inverseLex[x])
+            else:
+                result.append(pattern)
         return result
 
 

diff --git a/ZCatalog.py b/ZCatalog.py
@@ -471,7 +471,7 @@ def searchResults(self, REQUEST=None, used=None,
         Search terms can be passed in the REQUEST or as keyword
         arguments. 
         """
-        
+
         return apply(self._catalog.searchResults,
                      (REQUEST,used, query_map), kw)