ZakForm*::xml_parsing now removes nodes that use (closes #1011).

diff --git a/src/form.c b/src/form.c
index 2570956ec27d71d6ff2f399f25ca7e9f8d9eb9e4..a1730973c6f687b4eee2d9c2d3acb2a84730849c 100644 (file)
--- a/src/form.c
+++ b/src/form.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2016 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -169,11 +169,16 @@ zak_form_form_element_xml_parsing (ZakFormForm *zakform, ZakFormElement *element
        FormElementValidatorConstructorFunc validator_constructor;
        FormElementValidatorXmlParsingFunc validator_xml_parsing;
 
+       gboolean to_unlink;
+       xmlNode *xnode_tmp;
+
        priv = zak_form_form_get_instance_private (zakform);
 
        xnode = xnode->children;
        while (xnode)
                {
+                       to_unlink = FALSE;
+
                    if (xmlStrcmp (xnode->name, (const xmlChar *)"filter") == 0)
                                {
                                        type = xmlGetProp (xnode, (const xmlChar *)"type");
@@ -208,6 +213,8 @@ zak_form_form_element_xml_parsing (ZakFormForm *zakform, ZakFormElement *element
                                                {
                                                        g_warning ("Filter «%s» not found.", type);
                                                }
+
+                                       to_unlink = TRUE;
                                }
                    else if (xmlStrcmp (xnode->name, (const xmlChar *)"validator") == 0)
                                {
@@ -243,9 +250,22 @@ zak_form_form_element_xml_parsing (ZakFormForm *zakform, ZakFormElement *element
                                                {
                                                        g_warning ("Validator «%s» not found.", type);
                                                }
+
+                                       to_unlink = TRUE;
+                               }
+
+                       if (to_unlink)
+                               {
+                                       xnode_tmp = xnode;
                                }
 
                        xnode = xnode->next;
+
+                       if (to_unlink)
+                               {
+                                       xmlUnlinkNode (xnode_tmp);
+                                       xmlFreeNode (xnode_tmp);
+                               }
                }
 }
 
@@ -330,6 +350,9 @@ zak_form_form_load_from_xml (ZakFormForm *zakform, xmlDoc *xmldoc)
                                                                                                                                                                        element_xml_parsing (element, cur_clean);
                                                                                                                                                                }
                                                                                                                                                }
+
+                                                                                                                                       xmlUnlinkNode (cur_clean);
+                                                                                                                                       xmlFreeNode (cur_clean);
                                                                                                                                }
                                                                                                                        break;
                                                                                                                }

diff --git a/src/formelement.c b/src/formelement.c
index 94d8dc03ba60b4461cade63c956bea0a45e31363..afa6b53480f8972df9dbd47b0a724f5d651baa4c 100644 (file)
--- a/src/formelement.c
+++ b/src/formelement.c
@@ -1110,24 +1110,33 @@ zak_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode)
 {
        xmlNode *cur;
 
+       gboolean to_unlink;
+       xmlNode *xnode_tmp;
+
        cur = xmlnode->children;
        while (cur)
                {
+                       to_unlink = FALSE;
+
                    if (xmlStrcmp (cur->name, (const xmlChar *)"name") == 0)
                                {
                                        zak_form_element_set_name (element, (const gchar *)xmlNodeGetContent (cur));
+                                       to_unlink = TRUE;
                                }
                    else if (xmlStrcmp (cur->name, (const xmlChar *)"is-key") == 0)
                                {
                                        zak_form_element_set_is_key (element, xmlStrEqual ((const gchar *)xmlNodeGetContent (cur), "TRUE"));
+                                       to_unlink = TRUE;
                                }
                    else if (xmlStrcmp (cur->name, (const xmlChar *)"type") == 0)
                                {
                                        zak_form_element_set_provider_type (element, (const gchar *)xmlNodeGetContent (cur));
+                                       to_unlink = TRUE;
                                }
                    else if (xmlStrcmp (cur->name, (const xmlChar *)"default-value") == 0)
                                {
                                        zak_form_element_set_default_value (element, (const gchar *)xmlNodeGetContent (cur));
+                                       to_unlink = TRUE;
                                }
                    else if (xmlStrcmp (cur->name, (const xmlChar *)"format") == 0)
                                {
@@ -1148,24 +1157,40 @@ zak_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode)
 
                                        zak_form_element_set_format (element, ht);
                                        g_hash_table_unref (ht);
+                                       to_unlink = TRUE;
                                }
                    else if (xmlStrcmp (cur->name, (const xmlChar *)"visible") == 0)
                                {
                                        zak_form_element_set_visible (element, xmlStrEqual ((const gchar *)xmlNodeGetContent (cur), "TRUE"));
+                                       to_unlink = TRUE;
                                }
                    else if (xmlStrcmp (cur->name, (const xmlChar *)"editable") == 0)
                                {
                                        zak_form_element_set_editable (element, xmlStrEqual ((const gchar *)xmlNodeGetContent (cur), "TRUE"));
+                                       to_unlink = TRUE;
                                }
                    else if (xmlStrcmp (cur->name, (const xmlChar *)"to-load") == 0)
                                {
                                        zak_form_element_set_to_load (element, xmlStrEqual ((const gchar *)xmlNodeGetContent (cur), "TRUE"));
+                                       to_unlink = TRUE;
                                }
                    else if (xmlStrcmp (cur->name, (const xmlChar *)"to-save") == 0)
                                {
                                        zak_form_element_set_to_save (element, xmlStrEqual ((const gchar *)xmlNodeGetContent (cur), "TRUE"));
+                                       to_unlink = TRUE;
+                               }
+
+                       if (to_unlink)
+                               {
+                                       xnode_tmp = cur;
                                }
 
                        cur = cur->next;
+
+                       if (to_unlink)
+                               {
+                                       xmlUnlinkNode (xnode_tmp);
+                                       xmlFreeNode (xnode_tmp);
+                               }
                }
 }