[Opensync-commits] r5486 - plugins/syncml/src

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

Author: bellmich
Date: Tue Mar 31 14:42:35 2009
New Revision: 5486
URL: http://www.opensync.org/changeset/5486

Log:
migrated from OSyncAnchor to OSyncSinkStateDB

Modified:
   plugins/syncml/src/syncml_callbacks.c
   plugins/syncml/src/syncml_common.c
   plugins/syncml/src/syncml_common.h
   plugins/syncml/src/syncml_ds_client.c

Modified: plugins/syncml/src/syncml_callbacks.c
==============================================================================
--- plugins/syncml/src/syncml_callbacks.c	Tue Mar 31 14:32:43 2009	(r5485)
+++ plugins/syncml/src/syncml_callbacks.c	Tue Mar 31 14:42:35 2009	(r5486)
@@ -254,9 +254,14 @@
 {
 	SmlPluginEnv *env = userdata;
 	OSyncError *oerror = NULL;
-	osync_assert(env->anchor);
-	/* TODO: error report - via SmlError? */
-	return osync_anchor_retrieve(env->anchor, &oerror);
+	osync_assert(env->stateDB);
+	char *value = osync_sink_state_get(env->stateDB, name, &oerror);
+	if (oerror) {
+		smlErrorSet(error, SML_ERROR_GENERIC, "%s", osync_error_print(&oerror));
+		osync_error_unref(&oerror);
+		value = NULL;
+	}
+	return value;
 }
 
 SmlBool _set_anchor(
@@ -268,9 +273,14 @@
 {
 	SmlPluginEnv *env = userdata;
 	OSyncError *oerror = NULL;
-	osync_assert(env->anchor);
-	/* TODO: error reporting - via SmlError? */
-	return osync_anchor_update(env->anchor, value, &oerror);
+	osync_assert(env->stateDB);
+	SmlBool result = osync_sink_state_set(env->stateDB, name, value, &oerror);
+	if (oerror) {
+		smlErrorSet(error, SML_ERROR_GENERIC, "%s", osync_error_print(&oerror));
+		osync_error_unref(&oerror);
+		result = FALSE;
+	}
+	return result;
 }
 
 /* ************************************ */

Modified: plugins/syncml/src/syncml_common.c
==============================================================================
--- plugins/syncml/src/syncml_common.c	Tue Mar 31 14:32:43 2009	(r5485)
+++ plugins/syncml/src/syncml_common.c	Tue Mar 31 14:42:35 2009	(r5486)
@@ -804,12 +804,12 @@
 
 	osync_objtype_sink_set_userdata(mainsink, env);
 
-	/* Prepare anchor */
-	osync_objtype_sink_enable_anchor(mainsink, TRUE);
-	if (!osync_objtype_sink_load_anchor(mainsink, info, oerror))
+	/* Prepare state database */
+	osync_objtype_sink_enable_state_db(mainsink, TRUE);
+	if (!osync_objtype_sink_open_state_db(mainsink, info, oerror))
 		goto error_free_env;
 
-	env->anchor = osync_objtype_sink_get_anchor(mainsink);
+	env->stateDB = osync_objtype_sink_get_state_db(mainsink);
 
 	osync_plugin_info_set_main_sink(info, mainsink);
 	osync_objtype_sink_unref(mainsink);

Modified: plugins/syncml/src/syncml_common.h
==============================================================================
--- plugins/syncml/src/syncml_common.h	Tue Mar 31 14:32:43 2009	(r5485)
+++ plugins/syncml/src/syncml_common.h	Tue Mar 31 14:42:35 2009	(r5486)
@@ -99,7 +99,7 @@
 	/* environment data */
 
 	OSyncPluginInfo *pluginInfo;
-	OSyncAnchor *anchor;
+	OSyncSinkStateDB *stateDB;
 
 	GSource *source;
 	GSourceFuncs *source_functions;

Modified: plugins/syncml/src/syncml_ds_client.c
==============================================================================
--- plugins/syncml/src/syncml_ds_client.c	Tue Mar 31 14:32:43 2009	(r5485)
+++ plugins/syncml/src/syncml_ds_client.c	Tue Mar 31 14:42:35 2009	(r5486)
@@ -45,8 +45,8 @@
                 osync_objtype_sink_set_get_changes_func(sink, ds_client_get_changeinfo);
 		osync_objtype_sink_set_batch_commit_func(sink, ds_client_batch_commit);
 
-		// Request an anchor from the framework.
-		osync_objtype_sink_enable_anchor(sink, TRUE);
+		/* Request a state database from the framework. */
+		osync_objtype_sink_enable_state_db(sink, TRUE);
 
 		const char *objtype = osync_objtype_sink_get_name(sink);
 		OSyncPluginResource *res = osync_plugin_config_find_active_resource(config, objtype);