1.1 --- a/test.py Sun Aug 30 03:10:20 2009 +0200
1.2 +++ b/test.py Sun Aug 30 21:29:10 2009 +0200
1.3 @@ -82,7 +82,7 @@
1.4 f = open("testF", "wb")
1.5 w = iixr.FieldWriter(f)
1.6 for docnum, fields in doc_fields:
1.7 - w.write_fields(docnum, fields)
1.8 + w.write_fields(docnum, list(enumerate(fields)))
1.9 w.close()
1.10
1.11 f = open("testF", "rb")
1.12 @@ -90,7 +90,7 @@
1.13 for docnum, fields in doc_fields:
1.14 dn, df = r.read_fields()
1.15 print docnum == dn, docnum, dn
1.16 - print fields == df, fields, df
1.17 + print list(enumerate(fields)) == df, list(enumerate(fields)), df
1.18 r.close()
1.19
1.20 # Test field index files.
1.21 @@ -123,7 +123,7 @@
1.22 w2 = iixr.FieldIndexWriter(f2)
1.23 wd = iixr.FieldDictionaryWriter(w, w2, 3)
1.24 for docnum, fields in doc_fields:
1.25 - wd.write_fields(docnum, fields)
1.26 + wd.write_fields(docnum, list(enumerate(fields)))
1.27 wd.close()
1.28
1.29 f = open("testF", "rb")
1.30 @@ -134,11 +134,19 @@
1.31 doc_fields_reversed = doc_fields[:]
1.32 doc_fields_reversed.reverse()
1.33 for docnum, fields in doc_fields_reversed:
1.34 - df = rd.read_fields(docnum)
1.35 - print fields == df, fields, df
1.36 + df = rd.get_fields(docnum)
1.37 + print list(enumerate(fields)) == df, list(enumerate(fields)), df
1.38 for docnum in (13579, 246810):
1.39 - df = rd.read_fields(docnum)
1.40 + df = rd.get_fields(docnum)
1.41 print df is None, df
1.42 +
1.43 +# (Test sequential access.)
1.44 +
1.45 +rd.rewind()
1.46 +for docnum, fields in doc_fields:
1.47 + dn, df = rd.read_fields()
1.48 + print docnum == dn, docnum, dn
1.49 + print list(enumerate(fields)) == df, list(enumerate(fields)), df
1.50 rd.close()
1.51
1.52 # Test terms.
1.53 @@ -297,7 +305,7 @@
1.54 for docnum, text in docs:
1.55 for position, term in enumerate(text.split()):
1.56 wi.add_position(term, docnum, position)
1.57 - wi.add_fields(docnum, [text])
1.58 + wi.add_field(docnum, 123, text)
1.59 wi.close()
1.60
1.61 rd = index.get_reader()
1.62 @@ -308,7 +316,7 @@
1.63 print frequency == fr, frequency, fr
1.64 for docnum, text in docs:
1.65 df = rd.get_fields(docnum)
1.66 - print text == df[0], text, df[0]
1.67 + print (123, text) == df[0], (123, text), df[0]
1.68 index.close()
1.69
1.70 # vim: tabstop=4 expandtab shiftwidth=4