1.1 --- a/iixr/terms.py Sat Oct 03 03:03:32 2009 +0200
1.2 +++ b/iixr/terms.py Fri Jan 08 00:44:59 2010 +0100
1.3 @@ -208,7 +208,6 @@
1.4 self.info_reader = info_reader
1.5 self.index_reader = index_reader
1.6 self.position_dict_reader = position_dict_reader
1.7 - self.position_dict_iterator = None # for sequential/iterator access
1.8
1.9 self.terms = []
1.10 try:
1.11 @@ -302,7 +301,8 @@
1.12 documents equal to the given 'doc_frequency'.
1.13 """
1.14
1.15 - return self.position_dict_reader.read_term_positions(offset, doc_frequency)
1.16 + self.position_dict_reader.seek(offset, doc_frequency)
1.17 + return self.position_dict_reader
1.18
1.19 # Iterator convenience methods.
1.20
1.21 @@ -330,12 +330,8 @@
1.22
1.23 term, offset, frequency, doc_frequency = self.info_reader.read_term()
1.24
1.25 - # For sequential access, attempt to reuse any iterator.
1.26 -
1.27 - if self.position_dict_iterator is None:
1.28 - self.position_dict_iterator = self._get_positions(offset, doc_frequency)
1.29 -
1.30 - return term, frequency, doc_frequency, ResetPositionDictionaryIterator(self.position_dict_iterator, offset, doc_frequency)
1.31 + self.position_dict_reader.seek(offset, doc_frequency)
1.32 + return term, frequency, doc_frequency, self.position_dict_reader
1.33
1.34 # Query methods.
1.35
1.36 @@ -412,8 +408,5 @@
1.37 self.info_reader.close()
1.38 self.index_reader.close()
1.39 self.position_dict_reader.close()
1.40 - if self.position_dict_iterator is not None:
1.41 - self.position_dict_iterator.close()
1.42 - self.position_dict_iterator = None
1.43
1.44 # vim: tabstop=4 expandtab shiftwidth=4