Loading of filters and validators from xml.

diff --git a/src/form.c b/src/form.c
index 1661830353e46ef4e284f1c1e722a5089c1cc459..7fe02ffd4f7007610b504b5177896804124d4134 100644 (file)
--- a/src/form.c
+++ b/src/form.c
@@ -27,6 +27,8 @@
 
 #include "form.h"
 #include "formelement.h"
+#include "formelementfilter.h"
+#include "formelementvalidator.h"
 
 #ifdef G_OS_WIN32
        #include <windows.h>
@@ -34,6 +36,10 @@
 
 typedef ZakFormElement *(* FormElementConstructorFunc) (void);
 typedef gboolean (* FormElementXmlParsingFunc) (ZakFormElement *, xmlNodePtr);
+typedef ZakFormElementFilter *(* FormElementFilterConstructorFunc) (void);
+typedef gboolean (* FormElementFilterXmlParsingFunc) (ZakFormElementFilter *, xmlNodePtr);
+typedef ZakFormElementValidator *(* FormElementValidatorConstructorFunc) (void);
+typedef gboolean (* FormElementValidatorXmlParsingFunc) (ZakFormElementValidator *, xmlNodePtr);
 
 static void zak_form_form_class_init (ZakFormFormClass *class);
 static void zak_form_form_init (ZakFormForm *zak_form_form);
@@ -142,6 +148,94 @@ zak_form_form_init (ZakFormForm *zak_form_form)
        zak_form_form_load_modules (zak_form_form);
 }
 
+static void
+zak_form_form_element_xml_parsing (ZakFormForm *zakform, ZakFormElement *element, xmlNode *xnode)
+{
+       ZakFormFormPrivate *priv;
+
+       gchar *type;
+       guint i;
+
+       ZakFormElementFilter *filter;
+       ZakFormElementValidator *validator;
+
+       FormElementFilterConstructorFunc filter_constructor;
+       FormElementFilterXmlParsingFunc filter_xml_parsing;
+       FormElementValidatorConstructorFunc validator_constructor;
+       FormElementValidatorXmlParsingFunc validator_xml_parsing;
+
+       priv = zak_form_form_get_instance_private (zakform);
+
+       xnode = xnode->children;
+       while (xnode)
+               {
+                   if (xmlStrcmp (xnode->name, (const xmlChar *)"filter") == 0)
+                               {
+                                       type = xmlGetProp (xnode, (const xmlChar *)"type");
+
+                                       /* for each module */
+                                       for (i = 0; i < priv->ar_modules->len; i++)
+                                               {
+                                                       if (g_module_symbol ((GModule *)g_ptr_array_index (priv->ar_modules, i),
+                                                                                                g_strconcat (type, "_new", NULL),
+                                                                                                (gpointer *)&filter_constructor))
+                                                               {
+                                                                       if (filter_constructor != NULL)
+                                                                               {
+                                                                                       filter = filter_constructor ();
+                                                                                       zak_form_element_add_filter (element, filter);
+
+                                                                                       if (g_module_symbol ((GModule *)g_ptr_array_index (priv->ar_modules, i),
+                                                                                                                                g_strconcat (type, "_xml_parsing", NULL),
+                                                                                                                                (gpointer *)&filter_xml_parsing))
+                                                                                               {
+                                                                                                       if (filter_xml_parsing != NULL)
+                                                                                                               {
+                                                                                                                       filter_xml_parsing (filter, xnode);
+                                                                                                               }
+                                                                                               }
+
+                                                                                       break;
+                                                                               }
+                                                               }
+                                               }
+                               }
+                   else if (xmlStrcmp (xnode->name, (const xmlChar *)"validator") == 0)
+                               {
+                                       type = xmlGetProp (xnode, (const xmlChar *)"type");
+
+                                       /* for each module */
+                                       for (i = 0; i < priv->ar_modules->len; i++)
+                                               {
+                                                       if (g_module_symbol ((GModule *)g_ptr_array_index (priv->ar_modules, i),
+                                                                                                g_strconcat (type, "_new", NULL),
+                                                                                                (gpointer *)&validator_constructor))
+                                                               {
+                                                                       if (validator_constructor != NULL)
+                                                                               {
+                                                                                       validator = validator_constructor ();
+                                                                                       zak_form_element_add_validator (element, validator);
+
+                                                                                       if (g_module_symbol ((GModule *)g_ptr_array_index (priv->ar_modules, i),
+                                                                                                                                g_strconcat (type, "_xml_parsing", NULL),
+                                                                                                                                (gpointer *)&validator_xml_parsing))
+                                                                                               {
+                                                                                                       if (validator_xml_parsing != NULL)
+                                                                                                               {
+                                                                                                                       validator_xml_parsing (validator, xnode);
+                                                                                                               }
+                                                                                               }
+
+                                                                                       break;
+                                                                               }
+                                                               }
+                                               }
+                               }
+
+                       xnode = xnode->next;
+               }
+}
+
 /**
  * zak_form_form_load_from_xml:
  * @zakform:
@@ -153,6 +247,7 @@ zak_form_form_load_from_xml (ZakFormForm *zakform, xmlDoc *xmldoc)
 {
        ZakFormFormPrivate *priv;
        xmlNode *cur;
+       xmlNode *cur_clean;
 
        gboolean ret;
 
@@ -199,13 +294,17 @@ zak_form_form_load_from_xml (ZakFormForm *zakform, xmlDoc *xmldoc)
                                                                                                                        if (element != NULL)
                                                                                                                                {
                                                                                                                                        zak_form_form_add_element (zakform, element);
+
+                                                                                                                                       cur_clean = xmlCopyNode (cur, 1);
+                                                                                                                                       zak_form_form_element_xml_parsing (zakform, element, cur_clean);
+
                                                                                                                                        if (g_module_symbol ((GModule *)g_ptr_array_index (priv->ar_modules, i),
                                                                                                                                                                 g_strconcat (type, "_xml_parsing", NULL),
                                                                                                                                                                                 (gpointer *)&element_xml_parsing))
                                                                                                                                                {
                                                                                                                                                        if (element_xml_parsing != NULL)
                                                                                                                                                                {
-                                                                                                                                                                       element_xml_parsing (element, cur);
+                                                                                                                                                                       element_xml_parsing (element, cur_clean);
                                                                                                                                                                }
                                                                                                                                                }
                                                                                                                                }
@@ -441,6 +540,21 @@ zak_form_form_load_modules (ZakFormForm* zakform)
 #endif
                                }
 
+                       /* load myself as module (for filters and validators) */
+                       module = g_module_open (NULL, G_MODULE_BIND_LAZY);
+                       if (module == NULL)
+                               {
+                                       g_warning (_("Unable to load module of myself"));
+                               }
+                       else
+                               {
+                                       if (priv->ar_modules == NULL)
+                                               {
+                                                       priv->ar_modules = g_ptr_array_new ();
+                                               }
+                                       g_ptr_array_add (priv->ar_modules, (gpointer)module);
+                               }
+
                        /* for each file in MODULESDIR */
                        error = NULL;
                        dir = g_dir_open (modulesdir, 0, &error);

diff --git a/src/formelementfiltertrim.c b/src/formelementfiltertrim.c
index 5cb348a29e9d6cc3ad5f0b126850e451f794da49..6acafbd59f5ea52b75ed329bc7ebb698ac7e2567 100644 (file)
--- a/src/formelementfiltertrim.c
+++ b/src/formelementfiltertrim.c
@@ -94,6 +94,23 @@ ZakFormElementFilterTrim
        return zak_form_element_filter_trim;
 }
 
+/**
+ * zak_form_element_filter_trim_xml_parsing:
+ * @filter:
+ * @xnode:
+ *
+ */
+gboolean
+zak_form_element_filter_trim_xml_parsing (ZakFormElementFilter *filter, xmlNode *xnode)
+{
+       /* nothing to do */
+
+       /* TODO
+        * add properties: left, right, both
+        */
+       return TRUE;
+}
+
 /* PRIVATE */
 static void
 zak_form_element_filter_trim_set_property (GObject *object,

diff --git a/src/formelementfiltertrim.h b/src/formelementfiltertrim.h
index 9d49611954ae75934d0914763ccb1a5d9270d7ab..d74e0bf4c63489d1733923a4791af836b1a3f414 100644 (file)
--- a/src/formelementfiltertrim.h
+++ b/src/formelementfiltertrim.h
@@ -22,6 +22,8 @@
 
 #include <glib-object.h>
 
+#include <libxml/tree.h>
+
 #include "formelementfilter.h"
 
 
@@ -32,6 +34,7 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (ZakFormElementFilterTrim, zak_form_element_filter_trim, ZAK_FORM, ELEMENT_FILTER_TRIM, ZakFormElementFilter)
 
 ZakFormElementFilterTrim *zak_form_element_filter_trim_new (void);
+gboolean zak_form_element_filter_trim_xml_parsing (ZakFormElementFilter *filter, xmlNode *xnode);
 
 
 G_END_DECLS

diff --git a/src/formelementvalidatornotempty.c b/src/formelementvalidatornotempty.c
index 51ff245f7c1c8feda988017d78fe773b84c5d1d2..343e2abd34ded2f87df49ede5783801e3d7452cc 100644 (file)
--- a/src/formelementvalidatornotempty.c
+++ b/src/formelementvalidatornotempty.c
@@ -94,6 +94,19 @@ ZakFormElementValidatorNotempty
        return zak_form_element_validator_notempty;
 }
 
+/**
+ * zak_form_element_validator_notempty_xml_parsing:
+ * @validator:
+ * @xnode:
+ *
+ */
+gboolean
+zak_form_elemen_validator_notempty_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode)
+{
+       /* nothing to do */
+       return TRUE;
+}
+
 /* PRIVATE */
 static void
 zak_form_element_validator_notempty_set_property (GObject *object,

diff --git a/src/formelementvalidatornotempty.h b/src/formelementvalidatornotempty.h
index 8d82bf709d166dfb23025a1f8ba8a773b6b948db..b4885bf5b98e859d204d9410c83d8a6eb9833368 100644 (file)
--- a/src/formelementvalidatornotempty.h
+++ b/src/formelementvalidatornotempty.h
@@ -22,6 +22,8 @@
 
 #include <glib-object.h>
 
+#include <libxml/tree.h>
+
 #include "formelementvalidator.h"
 
 
@@ -32,6 +34,7 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (ZakFormElementValidatorNotempty, zak_form_element_validator_notempty, ZAK_FORM, ELEMENT_VALIDATOR_NOTEMPTY, ZakFormElementValidator)
 
 ZakFormElementValidatorNotempty *zak_form_element_validator_notempty_new (void);
+gboolean zak_form_element_validator_notempty_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode);
 
 
 G_END_DECLS

diff --git a/src/formelementvalidatorregex.c b/src/formelementvalidatorregex.c
index a56bf40f3696ccc844dc1e464e01ffdad8b1d10e..6279769f25fab3991010b7b73a9d1df5d9ee8bf3 100644 (file)
--- a/src/formelementvalidatorregex.c
+++ b/src/formelementvalidatorregex.c
@@ -104,6 +104,27 @@ ZakFormElementValidatorRegex
        return zak_form_element_validator_regex;
 }
 
+/**
+ * zak_form_element_validator_regex_xml_parsing:
+ * @validator:
+ * @xnode:
+ *
+ */
+gboolean
+zak_form_element_validator_regex_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode)
+{
+       ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (validator);
+
+       if (priv->regex != NULL)
+               {
+                       g_free (priv->regex);
+               }
+       priv->regex = g_strdup ((gchar *)xmlNodeGetContent (xnode));
+       g_message ("regex: %s", priv->regex);
+
+       return TRUE;
+}
+
 /* PRIVATE */
 static void
 zak_form_element_validator_regex_set_property (GObject *object,
@@ -176,6 +197,11 @@ zak_form_element_validator_regex_validate (ZakFormElementValidator *validator_re
 
        ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (validator_regex);
 
+       if (priv->regex == NULL)
+               {
+                       return TRUE;
+               }
+
        error = NULL;
        regex = g_regex_new (priv->regex, 0, 0, &error);
        if (regex == NULL
@@ -187,6 +213,10 @@ zak_form_element_validator_regex_validate (ZakFormElementValidator *validator_re
                }
 
        ret = g_regex_match ((const GRegex *)regex, value, 0, NULL);
+       if (!ret)
+               {
+                       g_warning ("Value «%s» not valid for regex «%s».", value, priv->regex);
+               }
 
        return ret;
 }

diff --git a/src/formelementvalidatorregex.h b/src/formelementvalidatorregex.h
index 627deab62e779f896e3775fa2de189b0aa12cbbc..d59f91ea23fe974265955a821ab017ca0b069779 100644 (file)
--- a/src/formelementvalidatorregex.h
+++ b/src/formelementvalidatorregex.h
@@ -22,6 +22,8 @@
 
 #include <glib-object.h>
 
+#include <libxml/tree.h>
+
 #include "formelementvalidator.h"
 
 
@@ -32,6 +34,7 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (ZakFormElementValidatorRegex, zak_form_element_validator_regex, ZAK_FORM, ELEMENT_VALIDATOR_REGEX, ZakFormElementValidator)
 
 ZakFormElementValidatorRegex *zak_form_element_validator_regex_new (const gchar *regex);
+gboolean zak_form_element_validator_regex_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode);
 
 
 G_END_DECLS