1.1 --- a/test_scan.py Sat Oct 01 15:07:17 2011 +0200
1.2 +++ b/test_scan.py Sat Oct 01 16:01:22 2011 +0200
1.3 @@ -5,8 +5,8 @@
1.4
1.5 try:
1.6 separator = sys.argv.index("--")
1.7 - filename = sys.argv[1]
1.8 - keys = map(int, sys.argv[2:separator])
1.9 + filename, numeric = sys.argv[1:3]
1.10 + keys = map(int, sys.argv[3:separator])
1.11 terms = groups(sys.argv[separator+1:], len(keys))
1.12 except (IndexError, ValueError):
1.13 print >>sys.stderr, "Usage: %s <filename> <key>... -- <term value>..." % sys.argv[0]
1.14 @@ -14,13 +14,13 @@
1.15
1.16 f = open(filename)
1.17 reader = TextFile(f)
1.18 -accessor = DelimitedRecord(keys)
1.19 +accessor = DelimitedRecord(keys, numeric=(numeric == "true"))
1.20 try:
1.21 for term in terms:
1.22 reader.seek(0)
1.23
1.24 t = time.time()
1.25 - line = find_in_file(reader, accessor, term)
1.26 + line = find_in_file(reader, accessor, accessor.convert(term))
1.27 if line:
1.28 print "Found (at %s seconds)...\n%s" % (time.time() - t, line)
1.29 finally: