1.1 --- a/test.py Sat Oct 03 03:03:32 2009 +0200
1.2 +++ b/test.py Fri Jan 08 00:44:59 2010 +0100
1.3 @@ -68,7 +68,7 @@
1.4 w.close()
1.5
1.6 f = open("testP", "rb")
1.7 -r = PositionIterator(f, 0, None)
1.8 +r = PositionReader(f)
1.9 for doc_positions in all_doc_positions:
1.10 for docnum, positions in doc_positions:
1.11 d, p = r.read_positions()
1.12 @@ -105,12 +105,12 @@
1.13 offsets.append((offset, doc_frequency))
1.14 w.close()
1.15
1.16 -r = PositionIndexOpener("testPI")
1.17 +r = PositionIndexReader(open("testPI", "rb"))
1.18 offsets.reverse()
1.19 indexed_positions.reverse()
1.20 for (offset, doc_frequency), term_positions in zip(offsets, indexed_positions):
1.21 - found_positions = r.read_term_positions(offset, doc_frequency)
1.22 - for (docnum, pos_offset, count), (dn, po, c) in zip(term_positions, found_positions):
1.23 + r.seek(offset, doc_frequency)
1.24 + for (docnum, pos_offset, count), (dn, po, c) in zip(term_positions, r):
1.25 print docnum == dn, docnum, dn
1.26 print pos_offset == po, pos_offset, po
1.27 print count == c, count, c
1.28 @@ -129,13 +129,14 @@
1.29 offsets.append((offset, doc_frequency))
1.30 wd.close()
1.31
1.32 -r = PositionOpener("testP")
1.33 -r2 = PositionIndexOpener("testPI")
1.34 +r = PositionReader(open("testP", "rb"))
1.35 +r2 = PositionIndexReader(open("testPI", "rb"))
1.36 rd = PositionDictionaryReader(r, r2)
1.37 offsets.reverse()
1.38 all_doc_positions.reverse()
1.39 for (offset, doc_frequency), doc_positions in zip(offsets, all_doc_positions):
1.40 - dp = list(rd.read_term_positions(offset, doc_frequency))
1.41 + rd.seek(offset, doc_frequency)
1.42 + dp = list(rd)
1.43 print doc_positions == dp, doc_positions, dp
1.44 rd.close()
1.45
1.46 @@ -298,8 +299,8 @@
1.47 r = TermReader(f)
1.48 f2 = open("testI", "rb")
1.49 r2 = TermIndexReader(f2)
1.50 -r3 = PositionOpener("testP")
1.51 -r4 = PositionIndexOpener("testPI")
1.52 +r3 = PositionReader(open("testP", "rb"))
1.53 +r4 = PositionIndexReader(open("testPI", "rb"))
1.54 rp = PositionDictionaryReader(r3, r4)
1.55 rd = TermDictionaryReader(r, r2, rp)
1.56 terms_reversed = terms[:]
1.57 @@ -360,8 +361,8 @@
1.58 r = TermReader(f)
1.59 f2 = open("testI", "rb")
1.60 r2 = TermIndexReader(f2)
1.61 -r3 = PositionOpener("testP")
1.62 -r4 = PositionIndexOpener("testPI")
1.63 +r3 = PositionReader(open("testP", "rb"))
1.64 +r4 = PositionIndexReader(open("testPI", "rb"))
1.65 rp = PositionDictionaryReader(r3, r4)
1.66 rd = TermDictionaryReader(r, r2, rp)
1.67 terms_reversed = terms_with_positions[:]