Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBenjamin Saller <bcsaller@objectrealms.net>2007-07-16 15:16:28 (GMT)
committer Benjamin Saller <bcsaller@objectrealms.net>2007-07-16 15:16:28 (GMT)
commit0e1df235572599b6272ea1b5889ec60c3f519add (patch)
tree7e4a4cf3777b659c3dad35d299dc26c818d90245 /src
parentab458ba8b5ee1c90893255489edcace7953ad62b (diff)
remove mountpoint from update arguments at the lower level
though datastore.get() returns the object from a given mountpoint it would be better to clear up the handling here and handle the explicit case better its unclear that mountpoint makes sense on create but update updates the object inplace
Diffstat (limited to 'src')
-rw-r--r--src/olpc/datastore/datastore.py1
-rw-r--r--src/olpc/datastore/model.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/olpc/datastore/datastore.py b/src/olpc/datastore/datastore.py
index bc7e333..56b55ac 100644
--- a/src/olpc/datastore/datastore.py
+++ b/src/olpc/datastore/datastore.py
@@ -376,6 +376,7 @@ class DataStore(dbus.service.Object):
example. You must create it
"""
content = self.get(uid)
+ mountpoint = props.pop('mountpoint', None)
content.backingstore.update(uid, props, filelike)
if filelike:
self.Updated(content.id)
diff --git a/src/olpc/datastore/model.py b/src/olpc/datastore/model.py
index ccbf396..fbad65f 100644
--- a/src/olpc/datastore/model.py
+++ b/src/olpc/datastore/model.py
@@ -311,7 +311,7 @@ registerPropertyType('number', str, float, 'float', {'store' : True,
registerPropertyType('date', dateenc, datedec, 'float', {'store' : True,
'exact' : True,
'sortable' : True
- },
+ },
for_xapian=encode_datetime,
from_xapain=decode_datetime)