1.1 --- a/test_scan.py Sat Oct 01 20:49:15 2011 +0200
1.2 +++ b/test_scan.py Sat Oct 01 22:06:03 2011 +0200
1.3 @@ -6,18 +6,17 @@
1.4 try:
1.5 separator = sys.argv.index("--")
1.6 filename, numeric = sys.argv[1:3]
1.7 - keys = map(int, sys.argv[3:separator])
1.8 - terms = groups(sys.argv[separator+1:], len(keys))
1.9 + fields = map(int, sys.argv[3:separator])
1.10 + terms = groups(sys.argv[separator+1:], len(fields))
1.11 except (IndexError, ValueError):
1.12 - print >>sys.stderr, "Usage: %s <filename> <key>... -- <term value>..." % sys.argv[0]
1.13 + print >>sys.stderr, "Usage: %s <filename> <field>... -- <term value>..." % sys.argv[0]
1.14 sys.exit(1)
1.15
1.16 f = open(filename)
1.17 -accessor = DelimitedRecord(keys, converter=(numeric == "true" and ConvertNumeric() or None))
1.18 +converters = [(numeric == "true" and int or None) for field in fields]
1.19 +accessor = Converted(DelimitedRecord(fields), converters)
1.20 reader = TextFile(f, Iterator(accessor))
1.21
1.22 -print "Sort command:", accessor.get_sort_command()
1.23 -
1.24 try:
1.25 for term in terms:
1.26 reader.seek(0)