Changeset 3393

Timestamp:

07/07/08 09:44:38 (1 month ago)

Author:

dgollub

Message:

Update plugin_config.xsd schema to store "ObjType?" of
OSyncPluginRessource in the plugin config.
Updated assembler/parser for plugin_config.
Exteneded tests for assembler/parser for plugin_config.

Files:

• trunk/misc/schemas/plugin_config.xsd (modified) (1 diff)
• trunk/opensync/plugin/opensync_plugin_config.c (modified) (4 diffs)
• trunk/tests/plugin-tests/check_plugin_config.c (modified) (4 diffs)

trunk/misc/schemas/plugin_config.xsd

@@ -53 +53 @@
-    <xsd:sequence>
-      <xsd:element maxOccurs="1" minOccurs="1" name="Enabled" type="xsd:integer" />
+      <xsd:element maxOccurs="1" minOccurs="0" name="Formats" type="Formats" />
-      <xsd:element maxOccurs="1" minOccurs="0" name="Name" type="xsd:string" />
-      <xsd:element maxOccurs="1" minOccurs="0" name="MIME" type="xsd:string" />
-0" name="Formats" type="Formats
+1" name="ObjType" type="xsd:string
-      <xsd:element maxOccurs="1" minOccurs="0" name="Path" type="xsd:string" />
-      <xsd:element maxOccurs="1" minOccurs="0" name="Url" type="xsd:string" />

trunk/opensync/plugin/opensync_plugin_config.c

@@ -451 +451 @@
-                if (!xmlStrcmp(cur->name, (const xmlChar *)"Enabled")) {
-                        osync_plugin_ressource_enable(res, atoi(str));
+                } else if (!xmlStrcmp(cur->name, (const xmlChar *)"Formats")) {
+                        if (!_osync_plugin_config_parse_ressource_formats(res, cur->xmlChildrenNode, error))
+                                goto error_free_str;
-                } else if (!xmlStrcmp(cur->name, (const xmlChar *)"Name")) {
-                        osync_plugin_ressource_set_name(res, str);
-                } else if (!xmlStrcmp(cur->name, (const xmlChar *)"MIME")) {
-                        osync_plugin_ressource_set_mime(res, str);
-
-
-
+
+
-                } else if (!xmlStrcmp(cur->name, (const xmlChar *)"Path")) {
-                        osync_plugin_ressource_set_path(res, str);
@@ -804 +806 @@
-
-        OSyncList *o;
-
+objtype, *
-
-        xmlNode *next, *node = xmlNewChild(cur, NULL, (xmlChar*)"Ressource", NULL);
@@ -814 +816 @@
-        osync_bool res_enabled = osync_plugin_ressource_is_enabled(res);
-        xmlNewChild(node, NULL, (xmlChar*)"Enabled", res_enabled ? (xmlChar*) "1" : (xmlChar*) "0");
-
-        if ((name = osync_plugin_ressource_get_name(res)))
-                xmlNewChild(node, NULL, (xmlChar*)"Name", (xmlChar*)name);
-
-        if ((mime = osync_plugin_ressource_get_mime(res)))
-                xmlNewChild(node, NULL, (xmlChar*)"MIME", (xmlChar*)mime);
-
-        next = xmlNewChild(node, NULL, (xmlChar*)"Formats", NULL);
@@ -827 +823 @@
-                        goto error;
-        }
+
+        if ((name = osync_plugin_ressource_get_name(res)))
+                xmlNewChild(node, NULL, (xmlChar*)"Name", (xmlChar*)name);
+
+        if ((mime = osync_plugin_ressource_get_mime(res)))
+                xmlNewChild(node, NULL, (xmlChar*)"MIME", (xmlChar*)mime);
+
+        objtype = osync_plugin_ressource_get_objtype(res);
+        osync_assert(objtype); /* ObjType for Ressource MUST be set! */
+        xmlNewChild(node, NULL, (xmlChar*)"ObjType", (xmlChar*) objtype);
-
-        if ((path = osync_plugin_ressource_get_path(res)))

trunk/tests/plugin-tests/check_plugin_config.c

@@ -451 +451 @@
-        osync_objformat_sink_unref(format_sink2);
-
+        /* ObjType */
+        osync_plugin_ressource_set_objtype(ressource, "foobar");
+        fail_unless(!strcmp(osync_plugin_ressource_get_objtype(ressource), "foobar"), NULL);
+
+        /* Overwrite (leak check) */
+        osync_plugin_ressource_set_objtype(ressource, "barfoo");
+        fail_unless(!strcmp(osync_plugin_ressource_get_objtype(ressource), "barfoo"), NULL);
+
-        /* Path */
-        osync_plugin_ressource_set_path(ressource, "foobar");
@@ -540 +548 @@
-        osync_plugin_ressource_set_mime(ressource1, "foobar1");
-        osync_plugin_ressource_add_objformat_sink(ressource1, format_sink1);
+        osync_plugin_ressource_set_objtype(ressource1, "foobar1");
-        osync_plugin_ressource_set_path(ressource1, "foobar1");
-        osync_plugin_ressource_set_url(ressource1, "foobar1");
@@ -556 +565 @@
-        osync_plugin_ressource_set_mime(ressource2, "foobar2");
-        osync_plugin_ressource_add_objformat_sink(ressource2, format_sink2);
+        osync_plugin_ressource_set_objtype(ressource2, "foobar2");
-        osync_plugin_ressource_set_path(ressource2, "foobar2");
-        osync_plugin_ressource_set_url(ressource2, "foobar2");
@@ -599 +609 @@
-                fail_unless(!strcmp(osync_plugin_ressource_get_mime(r->data), value), NULL);
-                fail_unless(!strcmp(_format_sink_get_objformat(r->data), value), NULL);
+                fail_unless(!strcmp(osync_plugin_ressource_get_objtype(r->data), value), NULL);
+
-                fail_unless(!strcmp(osync_plugin_ressource_get_path(r->data), value), NULL);
-                fail_unless(!strcmp(osync_plugin_ressource_get_url(r->data), value), NULL);