# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1252167050 -7200
# Node ID ffec42ec943a2286a935bc9a5fe95563cf978b4c
# Parent  db86d8090718462aa744cac580b9981b1bf86968
Fixed comment.
Added common merge method.

diff -r db86d8090718 -r ffec42ec943a iixr.py
--- a/iixr.py	Fri Sep 04 00:07:03 2009 +0200
+++ b/iixr.py	Sat Sep 05 18:10:50 2009 +0200
@@ -642,8 +642,8 @@
             while 1:
                 found_docnum, found_positions = self.iterator.next()
 
-                # Return the desired document positions or those immediately
-                # after.
+                # Return the desired document positions or None (retaining the
+                # positions for the document immediately after).
 
                 if docnum == found_docnum:
                     return found_positions
@@ -1620,9 +1620,7 @@
 
         # Ensure that only one partition exists.
 
-        self.merge_terms()
-        self.merge_fields()
-
+        self.merge()
         return self._get_reader(partition)
 
     def _get_reader(self, partition):
@@ -1635,6 +1633,13 @@
         self.reader = IndexReader(self.pathname)
         return self.reader
 
+    def merge(self):
+
+        "Merge/optimise index partitions."
+
+        self.merge_terms()
+        self.merge_fields()
+
     def merge_terms(self, interval=TERM_INTERVAL, doc_interval=DOCUMENT_INTERVAL):
 
         """