1.1 --- a/test.py Wed Sep 09 01:18:04 2009 +0200
1.2 +++ b/test.py Thu Sep 10 23:19:13 2009 +0200
1.3 @@ -60,7 +60,7 @@
1.4 w.close()
1.5
1.6 f = open("testP", "rb")
1.7 -r = iixr.PositionReader(f)
1.8 +r = iixr.PositionIterator(f, None)
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 @@ -97,8 +97,7 @@
1.13 offsets.append((offset, doc_frequency))
1.14 w.close()
1.15
1.16 -f = open("testPI", "rb")
1.17 -r = iixr.PositionIndexReader(f)
1.18 +r = iixr.PositionIndexOpener("testPI")
1.19 offsets.reverse()
1.20 indexed_positions.reverse()
1.21 for (offset, doc_frequency), term_positions in zip(offsets, indexed_positions):
1.22 @@ -122,10 +121,8 @@
1.23 offsets.append((offset, doc_frequency))
1.24 wd.close()
1.25
1.26 -f = open("testP", "rb")
1.27 -r = iixr.PositionReader(f)
1.28 -f2 = open("testPI", "rb")
1.29 -r2 = iixr.PositionIndexReader(f2)
1.30 +r = iixr.PositionOpener("testP")
1.31 +r2 = iixr.PositionIndexOpener("testPI")
1.32 rd = iixr.PositionDictionaryReader(r, r2)
1.33 offsets.reverse()
1.34 all_doc_positions.reverse()
1.35 @@ -293,10 +290,8 @@
1.36 r = iixr.TermReader(f)
1.37 f2 = open("testI", "rb")
1.38 r2 = iixr.TermIndexReader(f2)
1.39 -f3 = open("testP", "rb")
1.40 -r3 = iixr.PositionReader(f3)
1.41 -f4 = open("testPI", "rb")
1.42 -r4 = iixr.PositionIndexReader(f4)
1.43 +r3 = iixr.PositionOpener("testP")
1.44 +r4 = iixr.PositionIndexOpener("testPI")
1.45 rp = iixr.PositionDictionaryReader(r3, r4)
1.46 rd = iixr.TermDictionaryReader(r, r2, rp)
1.47 terms_reversed = terms[:]
1.48 @@ -357,10 +352,8 @@
1.49 r = iixr.TermReader(f)
1.50 f2 = open("testI", "rb")
1.51 r2 = iixr.TermIndexReader(f2)
1.52 -f3 = open("testP", "rb")
1.53 -r3 = iixr.PositionReader(f3)
1.54 -f4 = open("testPI", "rb")
1.55 -r4 = iixr.PositionIndexReader(f4)
1.56 +r3 = iixr.PositionOpener("testP")
1.57 +r4 = iixr.PositionIndexOpener("testPI")
1.58 rp = iixr.PositionDictionaryReader(r3, r4)
1.59 rd = iixr.TermDictionaryReader(r, r2, rp)
1.60 terms_reversed = terms_with_positions[:]