remove API compatibility wrappers

2 files changed, 6 insertions, 86 deletions

diff --git a/src/carquinyol/datastore.py b/src/carquinyol/datastore.py
index 7cd95f5..3330b3f 100644
--- a/src/carquinyol/datastore.py
+++ b/src/carquinyol/datastore.py
@@ -116,46 +116,6 @@ class DataStore(dbus.service.Object):
             return True
 
     @dbus.service.method(DS_DBUS_INTERFACE,
-                         in_signature='a{sv}sb',
-                         out_signature='ss',
-                         byte_arrays=True)
-    @trace()
-    def create(self, props, file_path, transfer_ownership):
-        """
-        Short-term compatibility wrapper for save().
-        """
-        tree_id, child_id = self._save('', '', props, file_path, transfer_ownership)
-        self.Created(tree_id, child_id)
-        return (tree_id, child_id)
-
-    @trace()
-    @dbus.service.signal(DS_DBUS_INTERFACE, signature="ss")
-    def Created(self, tree_id, version_id):
-        pass
-
-    @dbus.service.method(DS_DBUS_INTERFACE,
-             in_signature='ssa{sv}sb',
-             out_signature='ss',
-             byte_arrays=True)
-    @trace()
-    def update(self, tree_id, version_id, props, file_path, transfer_ownership):
-        """
-        Short-term compatibility wrapper for save() / change_metadata().
-        """
-        if file_path :
-            tree_id, child_id = self._save(tree_id, version_id, props, file_path, transfer_ownership)
-        else :
-            self.change_metadata(tree_id, version_id, props)
-            child_id = version_id
-
-        self.Updated(tree_id, child_id)
-        return (tree_id, child_id)
-
-    @dbus.service.signal(DS_DBUS_INTERFACE, signature="ss")
-    def Updated(self, tree_id, version_id):
-        pass
-
-    @dbus.service.method(DS_DBUS_INTERFACE,
              in_signature='ssa{sv}sb',
              out_signature='ss',
              byte_arrays=True)
@@ -240,23 +200,15 @@ class DataStore(dbus.service.Object):
              out_signature='aa{sv}u')
     @trace()
     def textsearch(self, querystring, query, options) :
-        return self._find(query, options, querystring = querystring)
+        return self._find(query, options, querystring)
 
     def _find(self, query, options, querystring = None) :
         t = time.time()
 
-        # don't expose internal details
-        # FIXME: short-term compatibility option
-        #if 'query' in query :
-        #    del query['query']
-
-        if querystring :
-            query['query'] = querystring
-
         tvids = None
         if layoutmanager.get_instance().index_updated:
             try:
-                tvids, count = self._index_store.find(query, options)
+                tvids, count = self._index_store.find(query, querystring, options)
             except Exception:
                 logging.error('Failed to query index, will rebuild\n%s' \
                         % traceback.format_exc())
@@ -298,17 +250,6 @@ class DataStore(dbus.service.Object):
              out_signature='s',
              sender_keyword='sender')
     @trace()
-    def get_filename(self, tree_id, version_id, sender=None):
-        """
-        Short-term compatibility wrapper for get_filename().
-        """
-        return self.get_data(tree_id, version_id, sender)
-
-    @dbus.service.method(DS_DBUS_INTERFACE,
-             in_signature='ss',
-             out_signature='s',
-             sender_keyword='sender')
-    @trace()
     def get_data(self, tree_id, version_id, sender=None):
         # TODO: copy docstring from datastore-redesign.html
         user_id = dbus.Bus().get_unix_user(sender)
@@ -329,26 +270,6 @@ class DataStore(dbus.service.Object):
         return mime.get_primary_extension(mime_type)
 
     @dbus.service.method(DS_DBUS_INTERFACE,
-                         in_signature='ss',
-                         out_signature='a{sv}')
-    @trace()
-    def get_properties(self, tree_id, version_id):
-        metadata = self._metadata_store.retrieve(tree_id,version_id)
-        if metadata is None :
-            raise sugar.datastore.InvalidArgumentError("Given tree_id/version_id does not exist")
-
-        return metadata
-
-    @dbus.service.method(DS_DBUS_INTERFACE,
-                         in_signature='sa{sv}',
-                         out_signature='as')
-    def get_uniquevaluesfor(self, propertyname, query=None):
-        """
-        Short-term compatibility wrapper for find_unique_values().
-        """
-        return self.find_unique_values(query, propertyname)
-
-    @dbus.service.method(DS_DBUS_INTERFACE,
                          in_signature='sa{sv}',
                          out_signature='as')
     def find_unique_values(self, query, metadata_name):
diff --git a/src/carquinyol/indexstore.py b/src/carquinyol/indexstore.py
index 313e6df..2aa90c3 100644
--- a/src/carquinyol/indexstore.py
+++ b/src/carquinyol/indexstore.py
@@ -127,14 +127,14 @@ class IndexStore(object):
                 text += value
         return text
 
-    def find(self, query, options):
+    def find(self, query, querystring, options):
         enquire = Enquire(self._database)
 
         offset = options.pop('offset', 0)
         limit = options.pop('limit', MAX_QUERY_LIMIT)
         all_versions = options.pop('all_versions', False)
 
-        enquire.set_query(self._parse_query(query))
+        enquire.set_query(self._parse_query(query, querystring))
 
         # This will assure that the results count is exact.
         check_at_least = offset + limit + 1
@@ -161,12 +161,11 @@ class IndexStore(object):
         'activity_id': _PREFIX_ACTIVITY_ID,
         'keep': _PREFIX_KEEP,
     }
-    def _parse_query(self, query_dict):
+    def _parse_query(self, query_dict, query_str):
         logging.debug('_parse_query %r' % query_dict)
         queries = []
 
-        query_str = query_dict.pop('query', None)
-        if query_str is not None:
+        if query_str:
             query_parser = QueryParser()
             query_parser.set_database(self._database)
             #query_parser.set_default_op(Query.OP_AND)