1.1 --- a/iixr/index.py Sat Nov 20 00:00:01 2010 +0100
1.2 +++ b/iixr/index.py Sat Nov 20 23:54:05 2010 +0100
1.3 @@ -3,7 +3,7 @@
1.4 """
1.5 High-level classes.
1.6
1.7 -Copyright (C) 2009 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2009, 2010 Paul Boddie <paul@boddie.org.uk>
1.9
1.10 This program is free software; you can redistribute it and/or modify it under
1.11 the terms of the GNU General Public License as published by the Free Software
1.12 @@ -187,6 +187,9 @@
1.13 self.dict_reader = get_term_reader(pathname, "merged")
1.14 self.field_dict_reader = get_field_reader(pathname, "merged")
1.15
1.16 + def get_terms(self):
1.17 + return self.dict_reader.get_terms()
1.18 +
1.19 def find_terms(self, term):
1.20 return self.dict_reader.find_terms(term)
1.21
2.1 --- a/iixr/merging.py Sat Nov 20 00:00:01 2010 +0100
2.2 +++ b/iixr/merging.py Sat Nov 20 23:54:05 2010 +0100
2.3 @@ -3,7 +3,7 @@
2.4 """
2.5 Dictionary merging classes.
2.6
2.7 -Copyright (C) 2009 Paul Boddie <paul@boddie.org.uk>
2.8 +Copyright (C) 2009, 2010 Paul Boddie <paul@boddie.org.uk>
2.9
2.10 This program is free software; you can redistribute it and/or modify it under
2.11 the terms of the GNU General Public License as published by the Free Software
2.12 @@ -31,7 +31,10 @@
2.13 def close(self):
2.14 for reader in self.readers:
2.15 reader.close()
2.16 - self.writer.close()
2.17 + self.readers = []
2.18 + if self.writer is not None:
2.19 + self.writer.close()
2.20 + self.writer = None
2.21
2.22 class TermDictionaryMerger(Merger):
2.23
3.1 --- a/iixr/terms.py Sat Nov 20 00:00:01 2010 +0100
3.2 +++ b/iixr/terms.py Sat Nov 20 23:54:05 2010 +0100
3.3 @@ -332,6 +332,12 @@
3.4
3.5 # Query methods.
3.6
3.7 + def get_terms(self):
3.8 +
3.9 + "Return a list of all terms."
3.10 +
3.11 + return self.terms
3.12 +
3.13 def find_terms(self, term):
3.14
3.15 "Return all terms whose values start with the value of 'term'."