diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-11-29 14:04:25 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-11-29 14:04:25 (GMT) |
| commit | 8557e8bbf7c9cf7f855dee9a8422c074f81539d8 (patch) | |
| tree | 2bda8465b84838e0da9ebafdcfbd4edc0eb46bd6 | |
| parent | 044a1f5b297da0ffa963eef4cee9f43f8a10486e (diff) | |
Revert '#4662 Correctly fix properties not in the model'.
| -rw-r--r-- | src/olpc/datastore/model.py | 1 | ||||
| -rw-r--r-- | src/olpc/datastore/xapianindex.py | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/olpc/datastore/model.py b/src/olpc/datastore/model.py index cdaee9f..acabae3 100644 --- a/src/olpc/datastore/model.py +++ b/src/olpc/datastore/model.py @@ -399,5 +399,6 @@ defaultModel = Model().addFields( ('icon-color', 'string'), ('preview', 'external'), ('buddies', 'text'), + ('source', 'text'), ) diff --git a/src/olpc/datastore/xapianindex.py b/src/olpc/datastore/xapianindex.py index dfef53c..06041aa 100644 --- a/src/olpc/datastore/xapianindex.py +++ b/src/olpc/datastore/xapianindex.py @@ -104,12 +104,6 @@ class IndexManager(object): datamodel = kwargs.get('model', model.defaultModel) datamodel.apply(self) - # configure the model according to the database - for field_name in self.write_index._field_actions: - if field_name not in datamodel.fields: - datamodel.addField(field_name, 'string') - self.fields.add(field_name) - # store a reference self.datamodel = datamodel @@ -314,7 +308,6 @@ class IndexManager(object): d = {} add_anything = False for k,v in props.iteritems(): - k = str(k) p, added = self.datamodel.fromstring(k, v, allowAddition=True) if added is True: |