Changeset 3518

Timestamp:

08/07/08 17:46:40 (4 months ago)

Author:

dgollub

Message:

Do resource initializinon in ds_server_init_databases().
Update syncml-obex-client for Resource renaming.

Location:

plugins/syncml/src

Files:

• syncml-obex-client (modified) (2 diffs)
• syncml_common.c (modified) (3 diffs)
• syncml_common.h (modified) (1 diff)
• syncml_ds_client.c (modified) (2 diffs)
• syncml_ds_server.c (modified) (2 diffs)

plugins/syncml/src/syncml-obex-client

@@ -144 +144 @@
 
     <!-- To be filed by UI or hand:
-  <Resources>
-    <Resource>
+  <Ressources>
+    <Ressource>
      <Enabled>1</Enabled>
      <Formats>
@@ -154 +154 @@
      <Name>Contacts</Name>
      <ObjType>contact</ObjType>
-    </Resource>
-  </Resources>
+    </Ressource>
+  </Ressources>
 
     -->

plugins/syncml/src/syncml_common.c

@@ -238 +238 @@
 }
 
-SmlDatabase *syncml_config_parse_database(SmlPluginEnv *env, OSyncPluginInfo *info, OSyncObjTypeSink *sink, OSyncError **error)
-{
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, env, info, sink, error);
+SmlDatabase *syncml_config_parse_database(SmlPluginEnv *env, OSyncPluginRessource *res, OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, env, res, error);
         g_assert(env);
-        g_assert(info);
-        g_assert(sink);
-
-        OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
-        OSyncPluginConfig *config = osync_plugin_info_get_config(info);
-        const char *objtype = osync_objtype_sink_get_name(sink);
-        g_assert(objtype);
-        OSyncPluginResource *res = osync_plugin_config_find_active_resource(config, objtype); 
         g_assert(res);
 
@@ -257 +249 @@
 
         database->env = env;
-        database->sink = sink;
         database->syncChanges = NULL;
         database->syncContexts = NULL;
 
-        database->url = osync_plugin_resource_get_name(res);
+        database->url = osync_plugin_ressource_get_name(res);
         if (!database->url) {
                 osync_error_set(error, OSYNC_ERROR_GENERIC, "Database name not set");
@@ -267 +258 @@
         }
 
-        database->objtype = osync_plugin_resource_get_objtype(res);
+        database->objtype = osync_plugin_ressource_get_objtype(res);
         if (!database->objtype) {
                 osync_error_set(error, OSYNC_ERROR_GENERIC, "\"objtype\" of a database not set");
                 goto error_free_database;
         }
-
-        /* TODO: Handle all available format sinks! */
-        OSyncList *fs = osync_plugin_resource_get_objformat_sinks(res);
-        OSyncObjFormatSink *fmtsink = osync_list_nth_data(fs, 0);
-        const char *objformat = osync_objformat_sink_get_objformat(fmtsink);
-
-        database->objformat = osync_format_env_find_objformat(formatenv, objformat);
-        osync_objformat_ref(database->objformat);
-
-        g_assert(database->objformat);
-
-        env->databases = g_list_append(env->databases, database);
 
         osync_trace(TRACE_EXIT, "%s: %p", __func__, database);

plugins/syncml/src/syncml_common.h

@@ -205 +205 @@
 SmlDatabase *syncml_config_parse_database(
                         SmlPluginEnv *env,
-                        OSyncPluginInfo *info,
-                        OSyncObjTypeSink *sink,
+                        OSyncPluginRessource *res,
                         OSyncError **error);
 

plugins/syncml/src/syncml_ds_client.c

@@ -2 +2 @@
 #include "syncml_callbacks.h"
 
-SmlBool ds_client_init_databases(SmlPluginEnv *env, OSyncPluginInfo *info, OSyncObjTypeSink *sink, OSyncError **error)
+SmlBool ds_client_init_databases(SmlPluginEnv *env, OSyncPluginInfo *info, OSyncError **error)
 {
         SmlDatabase *database = NULL;
         OSyncPluginConfig *config = osync_plugin_info_get_config(info);
-        OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
         unsigned int i, num_objtypes = osync_plugin_info_num_objtypes(info);
 
@@ -22 +21 @@
                 functions.batch_commit = ds_client_batch_commit;
 
-                OSyncPluginResource *res = osync_plugin_config_find_active_resource(config, objtype);
-                if (!syncml_config_parse_database(env, formatenv, res, error))
+                OSyncPluginRessource *res = osync_plugin_config_find_active_ressource(config, objtype);
+                if (!(database = syncml_config_parse_database(env, res, error)))
                         goto error;
                 

plugins/syncml/src/syncml_ds_server.c

@@ -5 +5 @@
 {
         SmlDatabase *database = NULL;
+        OSyncPluginConfig *config = osync_plugin_info_get_config(info);
+        OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
         unsigned int i, num_objtypes = osync_plugin_info_num_objtypes(info);
 
@@ -18 +20 @@
                 functions.batch_commit = ds_server_batch_commit;
 
-                if (!(database = syncml_config_parse_database(env, info, sink, error)))
+                OSyncPluginRessource *res = osync_plugin_config_find_active_ressource(config, objtype);
+                if (!(database = syncml_config_parse_database(env, res, error)))
                         goto error;
                 
+                database->sink = sink;
+
+                /* TODO: Handle all available format sinks! */
+                OSyncList *fs = osync_plugin_ressource_get_objformat_sinks(res);
+                OSyncObjFormatSink *fmtsink = osync_list_nth_data(fs, 0);
+                const char *objformat = osync_objformat_sink_get_objformat(fmtsink);
+
+                database->objformat = osync_format_env_find_objformat(formatenv, objformat);
+
+                g_assert(database->objformat);
+
                 osync_objtype_sink_set_functions(sink, functions, database);
+
+                env->databases = g_list_append(env->databases, database);
         }
         return TRUE;