dbus_helpers.py: metadata renames, add options to find()

1 files changed, 19 insertions, 19 deletions

diff --git a/src/sugar/datastore/dbus_helpers.py b/src/sugar/datastore/dbus_helpers.py
index 5858db1..287a160 100644
--- a/src/sugar/datastore/dbus_helpers.py
+++ b/src/sugar/datastore/dbus_helpers.py
@@ -42,49 +42,49 @@ def _get_data_store():
     return _data_store
 
 def create(properties, filename, transfer_ownership=False):
-    (object_id, version_id) = _get_data_store().create(dbus.Dictionary(properties), filename,
+    (tree_id, version_id) = _get_data_store().create(dbus.Dictionary(properties), filename,
                     transfer_ownership)
-    logging.debug('dbus_helpers.create: (%r,%r)' % (object_id, version_id))
-    return (object_id, version_id)
+    logging.debug('dbus_helpers.create: (%r,%r)' % (tree_id, version_id))
+    return (tree_id, version_id)
 
-def update(uid, vid, properties, filename, transfer_ownership=False,
+def update(tree_id, version_id, properties, filename, transfer_ownership=False,
         reply_handler=None, error_handler=None, timeout=-1):
     debug_props = properties.copy()
     if debug_props.has_key("preview"):
         debug_props["preview"] = "<omitted>"
     logging.debug('dbus_helpers.update: %s, %s, %s, %s, %s' %
-                  (uid, vid, filename, debug_props, transfer_ownership))
+                  (tree_id, version_id, filename, debug_props, transfer_ownership))
     if reply_handler and error_handler:
-        return _get_data_store().update(uid, vid, dbus.Dictionary(properties), filename,
+        return _get_data_store().update(tree_id, version_id, dbus.Dictionary(properties), filename,
                 transfer_ownership,
                 reply_handler=reply_handler,
                 error_handler=error_handler,
                 timeout=timeout)
     else:
-        return _get_data_store().update(uid, vid, dbus.Dictionary(properties),
+        return _get_data_store().update(tree_id, version_id, dbus.Dictionary(properties),
                                  filename, transfer_ownership)
 
-def delete(uid, vid):
-    logging.debug('dbus_helpers.delete: (%r, %r)' % (uid, vid))
-    return _get_data_store().delete(uid, vid)
+def delete(tree_id, version_id):
+    logging.debug('dbus_helpers.delete: (%r, %r)' % (tree_id, version_id))
+    return _get_data_store().delete(tree_id, version_id)
         
-def get_properties(uid, vid):
-    logging.debug('dbus_helpers.get_properties: (%r, %r)' % (uid, vid))
-    return _get_data_store().get_properties(uid, vid, byte_arrays=True)
+def get_properties(tree_id, version_id):
+    logging.debug('dbus_helpers.get_properties: (%r, %r)' % (tree_id, version_id))
+    return _get_data_store().get_properties(tree_id, version_id, byte_arrays=True)
 
-def get_filename(uid, vid):
-    filename = _get_data_store().get_filename(uid, vid)
-    logging.debug('dbus_helpers.get_filename: %s, %s, %s' % (uid, vid, filename))
+def get_filename(tree_id, version_id):
+    filename = _get_data_store().get_filename(tree_id, version_id)
+    logging.debug('dbus_helpers.get_filename: %s, %s, %s' % (tree_id, version_id, filename))
     return filename
 
-def find(query, properties, reply_handler, error_handler):
+def find(query, options, properties, reply_handler, error_handler):
     logging.debug('dbus_helpers.find: %r %r' % (query, properties))
     if reply_handler and error_handler:
-        return _get_data_store().find(query, properties,
+        return _get_data_store().find(query, options, properties,
                 reply_handler=reply_handler, error_handler=error_handler,
                 byte_arrays=True)
     else:
-        return _get_data_store().find(query, properties, byte_arrays=True)
+        return _get_data_store().find(query, options, properties, byte_arrays=True)
 
 def get_unique_values(key):
     return _get_data_store().get_uniquevaluesfor(