Changeset 3321

Timestamp:

05/04/08 22:45:48 (3 months ago)

Author:

dgollub

Message:

Adapt use of OSyncObjFormatSink in OpenSync? engine.

Files:

• trunk/opensync/engine/opensync_engine.c (modified) (3 diffs)
• trunk/opensync/engine/opensync_obj_engine.c (modified) (3 diffs)

trunk/opensync/engine/opensync_engine.c

@@ -136 +136 @@
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, proxy, userdata, change);
-
-
+
+
-        const char *uid = osync_change_get_uid(change);         
-int
+OSyncChangeType
-        const char *format = osync_objformat_get_name(osync_change_get_objformat(change));
-        const char *format_config = osync_objformat_get_config(osync_change_get_objformat(change));
-        const char *objtype = osync_change_get_objtype(change);
-
-
+
+
+
-        
-        OSyncData *data = osync_change_get_data(change);
@@ -156 +158 @@
-        if (internalFormat && osync_group_get_converter_enabled(engine->group) && (osync_change_get_changetype(change) != OSYNC_CHANGE_TYPE_DELETED)) {
-                osync_trace(TRACE_INTERNAL, "converting to common format %s", osync_objformat_get_name(internalFormat));
-
+
-                OSyncFormatConverterPath *path = osync_format_env_find_path_with_detectors(engine->formatenv, osync_change_get_data(change), internalFormat, &error);
-
@@ -162 +164 @@
-                        goto error;
-        
-
+
+
+
-
-                if (!osync_format_env_convert(engine->formatenv, path, data, &error)) {

trunk/opensync/engine/opensync_obj_engine.c

@@ -823 +823 @@
-}
-
-static OSyncObjFormat **_get_member_formats(OSyncFormatEnv *env, OSyncClientProxy *proxy, const char *objtype, OSyncError **error)
-{
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, env, proxy, objtype, error);
-        OSyncMember *member = osync_client_proxy_get_member(proxy);
-        
-        const OSyncList *formats = osync_member_get_objformats(member, objtype, error);
-        if (!formats) {
-                if (!osync_error_is_set(error))
-                        osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to find a valid target format");
-                goto error;
-        }
-
-        osync_trace(TRACE_INTERNAL, "Found %i possible sink formats", osync_list_length(formats));
-                                                
-        int num = osync_list_length(formats);
-        
-        OSyncObjFormat **formatArray = osync_try_malloc0(sizeof(OSyncObjFormat *) * (num + 1), error);
-        if (!formatArray)
-                goto error;
-        
-        const OSyncList *f = NULL;
-        int i = 0;
-        for (f = formats; f; f = f->next) {
-                const char **format_vertice = f->data;
-                const char *formatstr = format_vertice[0];
-                const char *format_configstr = format_vertice[1];
-                OSyncObjFormat *format = osync_format_env_find_objformat(env, formatstr);
-                osync_objformat_set_config(format, format_configstr);
-                if (!format) {
-                        g_free(formatArray);
-                        osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to find a valid object format for \"%s\"", formatstr);
-                        goto error;
-                }
-                
-                formatArray[i] = format;
-                i++;
-        }
-        formatArray[i] = NULL;
-        
-        osync_trace(TRACE_EXIT, "%s: %p", __func__, formatArray);
-        return formatArray;
-
-error:  
-        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
-        return NULL;
-}
-
-osync_bool osync_obj_engine_command(OSyncObjEngine *engine, OSyncEngineCmd cmd, OSyncError **error)
-{
@@ -1019 +972 @@
-                                                        /* Now we have to convert to one of the formats
-                                                         * that the client can understand */
-
-
-
-
-
-
-
+
+
+
-                                                                goto error;
-                                                        }
-
-
+
+
+
+
+
+
-                                                        OSyncFormatConverter *converter = osync_converter_path_nth_edge(path, length - 1);
-                                                        if (converter) {
-                                                                OSyncObjFormat *format = osync_converter_get_targetformat(converter);
-
+
+
-                                                        }
-
-                                                        g_free(formats);
-                                                        
-                                                        if (!osync_format_env_convert(engine->formatenv, path, osync_change_get_data(entry_engine->change), error)) {
-                                                                osync_converter_path_unref(path);
@@ -1050 +1002 @@
-                                                }
-                                                
-
+
+
+
+
+
+
-        
-                                                if (!osync_client_proxy_commit_change(sinkengine->proxy, _osync_obj_engine_commit_change_callback, entry_engine, osync_entry_engine_get_change(entry_engine), error))