Changeset 3458

Timestamp:

07/17/08 12:45:02 (2 months ago)

Author:

bricks

Message:

Initialise schema list in osync engine.

Files:

• trunk/opensync/engine/opensync_engine.c (modified) (7 diffs)
• trunk/opensync/engine/opensync_engine_internals.h (modified) (2 diffs)

trunk/opensync/engine/opensync_engine.c

@@ -37 +37 @@
-#include "opensync_engine_internals.h"
-
+#ifdef OPENSYNC_UNITTESTS
+#include "xmlformat/opensync-xmlformat_internals.h"
+#endif
+
-static void osync_engine_set_error(OSyncEngine *engine, OSyncError *error)
-{
@@ -119 +123 @@
-
-        return ret;
+}
+
+gboolean foreach_schema(void *key, void *value, void *userdata) {
+        osync_xmlformat_schema_unref((OSyncXMLFormatSchema *)value);
+        return TRUE;
+}
+
+static void _osync_engine_finalize_internal_schemas(OSyncEngine *engine)
+{
+
+        if ( engine->internalSchemas != NULL ) {
+                g_hash_table_foreach_remove(engine->internalSchemas, foreach_schema, NULL);
+        } 
+
+}
+
+static void _osync_engine_set_internal_schema(OSyncEngine *engine, const char *objtype, OSyncError **error) 
+{
+        osync_trace(TRACE_INTERNAL, "Setting internal schema for objtype %s", objtype);
+
+        // init OSyncXMLFormatSchemas
+        OSyncXMLFormat *xmlformat = osync_xmlformat_new(objtype, NULL);
+#ifdef OPENSYNC_UNITTESTS
+        OSyncXMLFormatSchema *schema = osync_xmlformat_schema_get_instance_with_path(xmlformat, engine->schema_dir, error);
+#else
+        OSyncXMLFormatSchema *schema = osync_xmlformat_schema_get_instance(xmlformat, error);
+#endif
+        osync_xmlformat_unref(xmlformat);
+        g_hash_table_insert(engine->internalSchemas, g_strdup(objtype), schema);
-}
-
@@ -367 +400 @@
-        
-        engine->internalFormats = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+        engine->internalSchemas = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-        
-        engine->context = g_main_context_new();
@@ -501 +535 @@
-                if (engine->error)
-                        osync_error_unref(&(engine->error));
+
+                if (engine->internalSchemas)
+                        g_hash_table_destroy(engine->internalSchemas);
-                
-                g_free(engine);
@@ -1074 +1111 @@
-        _osync_engine_set_internal_format(engine, "todo", osync_format_env_find_objformat(engine->formatenv, "xmlformat-todo"));
-        _osync_engine_set_internal_format(engine, "note", osync_format_env_find_objformat(engine->formatenv, "xmlformat-note"));
+        /* init schemas */
+        _osync_engine_set_internal_schema(engine, "contact", error);
+        _osync_engine_set_internal_schema(engine, "event", error);
+        _osync_engine_set_internal_schema(engine, "todo", error);
+        _osync_engine_set_internal_schema(engine, "note", error);
-        
-        osync_trace(TRACE_INTERNAL, "Running the main loop");
@@ -1159 +1201 @@
-                engine->pluginenv = NULL;
-        }
+        
+        /* free internal schemas */
+        _osync_engine_finalize_internal_schemas(engine);
-
-        if (!engine->error)
@@ -1817 +1862 @@
-}
-
+#ifdef OPENSYNC_UNITTESTS
+/** @brief Set the schemadir for schema validation to a custom directory.
+ *  This is actually only inteded for UNITTESTS to run tests without 
+ *  having OpenSync installed.
+ * 
+ * @param engine Pointer to engine
+ * @param schemadir Custom schemadir path
+ * 
+ */
+void osync_engine_set_schemadir(OSyncEngine *engine, const char *schema_dir)
+{
+        osync_assert(engine);
+        osync_assert(schema_dir);
+
+        if (engine->schema_dir)
+                g_free(engine->schema_dir);
+
+        engine->schema_dir = g_strdup(schema_dir); 
+}
+#endif /* OPENSYNC_UNITTESTS */
+

trunk/opensync/engine/opensync_engine_internals.h

@@ -46 +46 @@
-        char *plugin_dir;
-        char *format_dir;
-
+
+
+
-        OSyncFormatEnv *formatenv;
-        OSyncPluginEnv *pluginenv;
@@ -112 +114 @@
-        
-        GHashTable *internalFormats;
+        GHashTable *internalSchemas;
-};
-
+#ifdef OPENSYNC_UNITTESTS
+void osync_engine_set_schemadir(OSyncEngine *engine, const char *schema_dir);
+#endif /* OPENSYNC_UNITTESTS */
+
-#endif /*OPENSYNC_ENGINE_INTERNALS_H_*/