Changeset 234 for branches/mbutscher/work/lib/whoosh/matching.py

Timestamp:

01/09/11 19:37:51 (2 years ago)

Author:

mbutscher

Message:

branches/stable-2.0:
* Bug fixed: Windows: "Invalid handle" error on

command line bridge insertion plugins

branches/mbutscher/work:
* Write last writing program version into wiki db
* Several bug fixes with whoosh (index search)
* Index search: Highlight found terms and jump to

one found term on double-click

* Bug fixed: Windows: "Invalid handle" error on

command line bridge insertion plugins

Files:

• branches/mbutscher/work/lib/whoosh/matching.py (modified) (4 diffs)

branches/mbutscher/work/lib/whoosh/matching.py

@@ -252 +252 @@
     
     def __init__(self, ids, weights=None, values=None, format=None,
-                 scorer=None, position=0):
+                 scorer=None, position=0, all_weights=None):
         """
         :param ids: a list of doc IDs.
@@ -267 +267 @@
         self._ids = ids
         self._weights = weights
+        self._all_weights = all_weights
         self._values = values
         self._i = position
@@ -319 +320 @@
     
     def weight(self):
-        if self._weights:
+        if self._all_weights:
+            return self._all_weights
+        elif self._weights:
             return self._weights[self._i]
         else:
@@ -1023 +1026 @@
             child.skip_to(self._id)
         
-        while (self._id < self.limit
-               and ((child.is_active() and self._id == child.id())
-                    or missing(self._id))):
-            self._id += 1
-            if child.is_active():
+        # While self._id is missing or is in the child matcher, increase it
+        while child.is_active() and self._id < self.limit:
+            if missing(self._id):
+                self._id += 1
+                continue
+
+            if self._id == child.id():
+                self._id += 1
                 child.next()
-    
+                continue
+            
+            break
+        
     def id(self):
         return self._id