# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1254435730 -7200
# Node ID 353e83aab58d83db26600c12db8da608a8fb0769
# Parent  9c0d6a47f814bd368d26cd79834ec7f0f9ec7181
Fixed field interval configuration.
Removed registration of iterators in the PositionDictionaryReader class in
order to prevent objects accumulating.

diff -r 9c0d6a47f814 -r 353e83aab58d iixr/index.py
--- a/iixr/index.py	Thu Oct 01 00:27:29 2009 +0200
+++ b/iixr/index.py	Fri Oct 02 00:22:10 2009 +0200
@@ -89,10 +89,11 @@
     Building term information and writing it to the term and field dictionaries.
     """
 
-    def __init__(self, pathname, interval, doc_interval, flush_interval):
+    def __init__(self, pathname, interval, doc_interval, field_interval, flush_interval):
         self.pathname = pathname
         self.interval = interval
         self.doc_interval = doc_interval
+        self.field_interval = field_interval
         self.flush_interval = flush_interval
 
         self.dict_partition = 0
@@ -231,7 +232,8 @@
         "Return a writer."
 
         self._ensure_directory()
-        self.writer = IndexWriter(self.pathname, self.interval, self.doc_interval, self.flush_interval)
+        self.writer = IndexWriter(self.pathname, self.interval, self.doc_interval,
+            self.field_interval, self.flush_interval)
         return self.writer
 
     def _ensure_directory(self):
diff -r 9c0d6a47f814 -r 353e83aab58d iixr/positions.py
--- a/iixr/positions.py	Thu Oct 01 00:27:29 2009 +0200
+++ b/iixr/positions.py	Fri Oct 02 00:22:10 2009 +0200
@@ -324,7 +324,6 @@
     def __init__(self, position_opener, position_index_opener):
         self.position_opener = position_opener
         self.position_index_opener = position_index_opener
-        self.position_dict_iterators = []
 
     def read_term_positions(self, offset, doc_frequency):
 
@@ -333,15 +332,11 @@
         given 'doc_frequency'.
         """
 
-        it = PositionDictionaryIterator(self.position_opener,
+        return PositionDictionaryIterator(self.position_opener,
             self.position_index_opener, offset, doc_frequency)
-        self.position_dict_iterators.append(it)
-        return it
 
     def close(self):
-        for it in self.position_dict_iterators:
-            it.close()
-        self.position_dict_iterators = []
+        pass
 
 class PositionDictionaryIterator: