[Opensync-commits] r5505 - trunk/wrapper

[<svn...@op...>]

Author: cdfrey
Date: Wed Apr  1 00:13:25 2009
New Revision: 5505
URL: http://www.opensync.org/changeset/5505

Log:
Updated python wrapper with API changes... wrapper should now compile

- get_conflict_resolution's long long change
- anchor / state_db rename
- set_functions/set_userdata API change

Modified:
   trunk/wrapper/opensync-group.i
   trunk/wrapper/opensync-helper.i
   trunk/wrapper/opensync-plugin.i

Modified: trunk/wrapper/opensync-group.i
==============================================================================
--- trunk/wrapper/opensync-group.i	Wed Apr  1 00:12:31 2009	(r5504)
+++ trunk/wrapper/opensync-group.i	Wed Apr  1 00:13:25 2009	(r5505)
@@ -179,8 +179,8 @@
 
 	%apply ConflictResolution *OUTPUT { ConflictResolution *res, int *num };
 	%apply int *OUTPUT { ConflictResolution *res, int *num };
-	void get_conflict_resolution(ConflictResolution *res, int *num) {
-		osync_group_get_conflict_resolution(self, res, num);
+	void get_conflict_resolution(ConflictResolution *res, long long int *winner) {
+		osync_group_get_conflict_resolution(self, res, winner);
 	}
 
 	bool get_merger_enabled() {

Modified: trunk/wrapper/opensync-helper.i
==============================================================================
--- trunk/wrapper/opensync-helper.i	Wed Apr  1 00:12:31 2009	(r5504)
+++ trunk/wrapper/opensync-helper.i	Wed Apr  1 00:13:25 2009	(r5505)
@@ -1,9 +1,9 @@
 %inline %{
-	static bool anchor_compare(OSyncAnchor *anchor, const char *new_anchor) {
+	static bool sink_state_equal(OSyncSinkStateDB *state_db, const char *key, const char *value) {
 		Error *err = NULL;
-                bool ret;
+                osync_bool ret;
 
-		osync_anchor_compare(anchor, new_anchor, &ret, &err);
+		osync_sink_state_equal(state_db, key, value, &ret, &err);
 
                 if (raise_exception_on_error(err))
                         return FALSE;
@@ -11,19 +11,19 @@
                 return ret;
 	}
 
-	static bool anchor_update(OSyncAnchor *anchor, const char *new_anchor) {
+	static bool sink_state_set(OSyncSinkStateDB *state_db, const char *key, const char *value) {
 		Error *err = NULL;
-		osync_anchor_update(anchor, new_anchor, &err);
+		osync_sink_state_set(state_db, key, value, &err);
                 if (raise_exception_on_error(err))
                         return FALSE;
 
                 return TRUE;
 	}
 
-	static char *anchor_retrieve(OSyncAnchor *anchor) {
+	static char *sink_state_get(OSyncSinkStateDB *state_db, const char *key) {
                 Error *err = NULL;
                 char *ret;
-		ret = osync_anchor_retrieve(anchor, &err);
+		ret = osync_sink_state_get(state_db, key, &err);
 
                 if (raise_exception_on_error(err))
                         return NULL;

Modified: trunk/wrapper/opensync-plugin.i
==============================================================================
--- trunk/wrapper/opensync-plugin.i	Wed Apr  1 00:12:31 2009	(r5504)
+++ trunk/wrapper/opensync-plugin.i	Wed Apr  1 00:13:25 2009	(r5505)
@@ -318,10 +318,8 @@
 
 		/* set userdata pointer to supplied python wrapper object */
 		if (callback_obj) {
-			OSyncObjTypeSinkFunctions functions;
 			Py_INCREF(callback_obj);
-			memset(&functions, 0, sizeof(functions));
-			osync_objtype_sink_set_functions(sink, functions, callback_obj);
+			osync_objtype_sink_set_userdata(sink, callback_obj);
 		}
 
 		return sink;
@@ -359,8 +357,8 @@
 		osync_objtype_sink_remove_objformat_sink(self, format_sink);
 	}
 
-        OSyncAnchor *get_anchor() {
-                return osync_objtype_sink_get_anchor(self);
+        OSyncSinkStateDB *get_state_db() {
+                return osync_objtype_sink_get_state_db(self);
         }
 
         OSyncHashTable *get_hashtable() {