# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1317570002 -7200
# Node ID 5a61083be20dd27d4efc1447d388552ea3b8a3ae
# Parent  294a658846b63a015c1cc44b5a3e810ae24cd0b4
Renamed "key" to "field" when referring to columns in delimited data.

diff -r 294a658846b6 -r 5a61083be20d simplex/readers.py
--- a/simplex/readers.py	Sun Oct 02 17:25:31 2011 +0200
+++ b/simplex/readers.py	Sun Oct 02 17:40:02 2011 +0200
@@ -35,17 +35,17 @@
 
     "An accessor using a delimiter to split a record."
 
-    def __init__(self, keys=None, delimiter=None, numeric=0):
+    def __init__(self, fields=None, delimiter=None, numeric=0):
 
         """
-        Initialise the accessor using a sequence of 'keys' indicating the
+        Initialise the accessor using a sequence of 'fields' indicating the
         columns in each record that provide the values in the eventual compound
-        key provided by each record, along with a 'delimiter' indicating how
-        such columns are identified. If 'numeric' is set to a true value, keys
+        field provided by each record, along with a 'delimiter' indicating how
+        such columns are identified. If 'numeric' is set to a true value, fields
         will be interpreted as numbers.
         """
 
-        self.keys = keys or [0]
+        self.fields = fields or [0]
         self.delimiter = delimiter
         self.convert = numeric and self.convert_numeric or (lambda x: x)
 
@@ -54,6 +54,6 @@
 
     def get_key(self, record):
         values = record.split(self.delimiter)
-        return self.convert([values[key] for key in self.keys])
+        return self.convert([values[field] for field in self.fields])
 
 # vim: tabstop=4 expandtab shiftwidth=4
diff -r 294a658846b6 -r 5a61083be20d test_indexed.py
--- a/test_indexed.py	Sun Oct 02 17:25:31 2011 +0200
+++ b/test_indexed.py	Sun Oct 02 17:40:02 2011 +0200
@@ -6,15 +6,15 @@
 try:
     separator = sys.argv.index("--")
     filename, numeric, interval = sys.argv[1:4]
-    keys = map(int, sys.argv[4:separator])
-    terms = groups(sys.argv[separator+1:], len(keys))
+    fields = map(int, sys.argv[4:separator])
+    terms = groups(sys.argv[separator+1:], len(fields))
 except (IndexError, ValueError):
-    print >>sys.stderr, "Usage: %s <filename> <interval> <key>... -- <term value>..." % sys.argv[0]
+    print >>sys.stderr, "Usage: %s <filename> <interval> <field>... -- <term value>..." % sys.argv[0]
     sys.exit(1)
 
 f = open(filename)
 reader = TextFile(f)
-accessor = DelimitedRecord(keys, numeric=(numeric == "true"))
+accessor = DelimitedRecord(fields, numeric=(numeric == "true"))
 try:
     t = time.time()
     l = make_index(reader, accessor.get_key, int(interval))
diff -r 294a658846b6 -r 5a61083be20d test_scan.py
--- a/test_scan.py	Sun Oct 02 17:25:31 2011 +0200
+++ b/test_scan.py	Sun Oct 02 17:40:02 2011 +0200
@@ -6,15 +6,15 @@
 try:
     separator = sys.argv.index("--")
     filename, numeric = sys.argv[1:3]
-    keys = map(int, sys.argv[3:separator])
-    terms = groups(sys.argv[separator+1:], len(keys))
+    fields = map(int, sys.argv[3:separator])
+    terms = groups(sys.argv[separator+1:], len(fields))
 except (IndexError, ValueError):
-    print >>sys.stderr, "Usage: %s <filename> <key>... -- <term value>..." % sys.argv[0]
+    print >>sys.stderr, "Usage: %s <filename> <field>... -- <term value>..." % sys.argv[0]
     sys.exit(1)
 
 f = open(filename)
 reader = TextFile(f)
-accessor = DelimitedRecord(keys, numeric=(numeric == "true"))
+accessor = DelimitedRecord(fields, numeric=(numeric == "true"))
 try:
     for term in terms:
         reader.seek(0)