From: Andrea Zagli Date: Sat, 7 Nov 2015 21:10:48 +0000 (+0100) Subject: Loading of filters and validators from xml. X-Git-Tag: debian/0.0.1-1~35 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=acd2f0580be64f1c4bd483674697529a892bca4f;p=zakform%2Flibzakform Loading of filters and validators from xml. --- diff --git a/src/form.c b/src/form.c index 1661830..7fe02ff 100644 --- 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 @@ -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 5cb348a..6acafbd 100644 --- 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 9d49611..d74e0bf 100644 --- a/src/formelementfiltertrim.h +++ b/src/formelementfiltertrim.h @@ -22,6 +22,8 @@ #include +#include + #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 51ff245..343e2ab 100644 --- 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 8d82bf7..b4885bf 100644 --- a/src/formelementvalidatornotempty.h +++ b/src/formelementvalidatornotempty.h @@ -22,6 +22,8 @@ #include +#include + #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 a56bf40..6279769 100644 --- 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 627deab..d59f91e 100644 --- a/src/formelementvalidatorregex.h +++ b/src/formelementvalidatorregex.h @@ -22,6 +22,8 @@ #include +#include + #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