diff options
| -rw-r--r-- | src/olpc/datastore/datastore.py | 7 | ||||
| -rw-r--r-- | src/olpc/datastore/model.py | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/olpc/datastore/datastore.py b/src/olpc/datastore/datastore.py index b5d67b9..9073845 100644 --- a/src/olpc/datastore/datastore.py +++ b/src/olpc/datastore/datastore.py @@ -255,9 +255,9 @@ class DataStore(dbus.service.Object): #@utils.sanitize_dbus @dbus.service.method(DS_DBUS_INTERFACE, - in_signature='a{sv}as', + in_signature='a{sv}', out_signature='aa{sv}u') - def find(self, query=None, properties=None, **kwargs): + def find(self, query=None, **kwargs): """find(query) takes a dict of parameters and returns data in the following format @@ -294,7 +294,8 @@ class DataStore(dbus.service.Object): else: if 'query' not in kwargs: kwargs['query'] = query - + + properties = kwargs.pop("properties", []) include_files = kwargs.pop('include_files', False) order_by = kwargs.pop('order_by', []) diff --git a/src/olpc/datastore/model.py b/src/olpc/datastore/model.py index 773fdcf..9b00e2c 100644 --- a/src/olpc/datastore/model.py +++ b/src/olpc/datastore/model.py @@ -252,6 +252,7 @@ class Content(object): ext = mime.get_primary_extension(mt) # .ksh is a strange ext for plain text if ext and ext == '.ksh': ext = '.txt' + if ext and ext == '.jpe': ext = '.jpg' # fixes #3163 if ext: return None, ext return None, None |