From: Andrea Zagli Date: Wed, 17 Dec 2014 08:45:45 +0000 (+0100) Subject: Implemented Confi::path_get_value in db plugin. X-Git-Tag: v0.10.0~21 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=9706705f4c579f6b02699a3e89ce8ceacff2422d;p=zakconfi%2Flibzakconfi Implemented Confi::path_get_value in db plugin. --- diff --git a/plugins/db/plgdb.c b/plugins/db/plgdb.c index d3d810e..26725cd 100644 --- a/plugins/db/plgdb.c +++ b/plugins/db/plgdb.c @@ -38,7 +38,10 @@ #include "plgdb.h" -static void confi_pluggable_iface_init (ConfiPluggableInterface *iface); +static void confi_pluggable_iface_init (ConfiPluggableInterface *iface); + +static GdaDataModel *confi_db_plugin_path_get_data_model (ConfiPluggable *pluggable, const gchar *path); +static gchar *confi_db_plugin_path_get_value_from_db (ConfiPluggable *pluggable, const gchar *path); #define CONFI_DB_PLUGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CONFI_TYPE_DB_PLUGIN, ConfiDBPluginPrivate)) @@ -53,7 +56,6 @@ struct _ConfiDBPluginPrivate gchar *name; gchar *description; gchar *root; - GHashTable *values; gchar chrquot; }; @@ -79,6 +81,8 @@ confi_db_plugin_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { + gchar *sql; + ConfiDBPlugin *plugin = CONFI_DB_PLUGIN (object); ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (plugin); @@ -89,12 +93,29 @@ confi_db_plugin_set_property (GObject *object, break; case PROP_NAME: + priv->name = g_strdup (g_value_get_string (value)); + sql = g_strdup_printf ("UPDATE configs " + "SET name = '%s' " + "WHERE id = %d", + gdaex_strescape (priv->name, NULL), + priv->id_config); + gdaex_execute (priv->gdaex, sql); + g_free (sql); break; case PROP_DESCRIPTION: + priv->description = g_strdup (g_value_get_string (value)); + sql = g_strdup_printf ("UPDATE configs " + "SET description = '%s' " + "WHERE id = %d", + gdaex_strescape (priv->description, NULL), + priv->id_config); + gdaex_execute (priv->gdaex, sql); + g_free (sql); break; case PROP_ROOT: + priv->root = confi_normalize_root (g_value_get_string (value)); break; default: @@ -139,6 +160,12 @@ confi_db_plugin_get_property (GObject *object, static void confi_db_plugin_init (ConfiDBPlugin *plugin) { + ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (plugin); + + priv->cnc_string = NULL; + priv->gdaex = NULL; + priv->name = NULL; + priv->description = NULL; } static void @@ -160,6 +187,9 @@ confi_db_plugin_initialize (ConfiPluggable *pluggable, const gchar *cnc_string) guint i; guint l; + gchar *sql; + GdaDataModel *dm; + strs = g_strsplit (cnc_string, ";", -1); gstr_cnc_string = g_string_new (""); @@ -191,8 +221,101 @@ confi_db_plugin_initialize (ConfiPluggable *pluggable, const gchar *cnc_string) g_strfreev (strs); priv->gdaex = gdaex_new_from_string (priv->cnc_string); + priv->chrquot = gdaex_get_chr_quoting (priv->gdaex); + + /* check if config exists */ + sql = g_strdup_printf ("SELECT id, name" + " FROM configs" + " WHERE name = '%s'", + gdaex_strescape (priv->name, NULL)); + dm = gdaex_query (priv->gdaex, sql); + g_free (sql); + if (dm != NULL || gda_data_model_get_n_rows (dm) > 0) + { + priv->id_config = gdaex_data_model_get_value_integer_at (dm, 0, 0); + } + if (dm != NULL) + { + g_object_unref (dm); + } - return (priv->gdaex != NULL ? TRUE : FALSE); + return (priv->gdaex != NULL && priv->name != NULL ? TRUE : FALSE); +} + +static GdaDataModel +*confi_db_plugin_path_get_data_model (ConfiPluggable *pluggable, const gchar *path) +{ + gchar **tokens; + gchar *sql; + gchar *token; + guint i; + guint id_parent; + GdaDataModel *dm; + + ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (pluggable); + + if (path == NULL) return NULL; + + dm = NULL; + + tokens = g_strsplit (path, "/", 0); + if (tokens == NULL) return NULL; + + i = 0; + id_parent = 0; + while (tokens[i] != NULL) + { + token = g_strstrip (g_strdup (tokens[i])); + if (strcmp (token, "") != 0) + { + sql = g_strdup_printf ("SELECT * " + "FROM %cvalues%c " + "WHERE id_configs = %d " + "AND id_parent = %d " + "AND %ckey%c = '%s'", + priv->chrquot, priv->chrquot, + priv->id_config, + id_parent, + priv->chrquot, priv->chrquot, + gdaex_strescape (token, NULL)); + dm = gdaex_query (priv->gdaex, sql); + g_free (sql); + if (dm == NULL || gda_data_model_get_n_rows (dm) != 1) + { + /* TO DO */ + g_warning ("Unable to find key «%s».", token); + if (dm != NULL) + { + g_object_unref (dm); + dm = NULL; + } + break; + } + id_parent = gdaex_data_model_get_field_value_integer_at (dm, 0, "id"); + } + + i++; + } + + return dm; +} + +static gchar +*confi_db_plugin_path_get_value_from_db (ConfiPluggable *pluggable, const gchar *path) +{ + gchar *ret; + GdaDataModel *dm; + + ret = NULL; + + dm = confi_db_plugin_path_get_data_model (pluggable, path); + if (dm != NULL) + { + ret = gdaex_data_model_get_field_value_stringify_at (dm, 0, "value"); + g_object_unref (dm); + } + + return ret; } static GList @@ -201,8 +324,14 @@ static GList { GList *lst; + GdaDataModel *dmConfigs; + gchar *sql; - gchar *where = ""; + gchar *where; + + guint row; + guint id; + guint rows; ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (pluggable); @@ -217,16 +346,18 @@ static GList { where = g_strdup_printf (" WHERE name LIKE '%s'", filter); } + else + { + where = g_strdup (""); + } sql = g_strdup_printf ("SELECT * FROM configs%s", where); + g_free (where); - GdaDataModel *dmConfigs = gdaex_query (priv->gdaex, sql); + dmConfigs = gdaex_query (priv->gdaex, sql); + g_free (sql); if (dmConfigs != NULL) { - guint row; - guint id; - guint rows; - rows = gda_data_model_get_n_rows (dmConfigs); if (rows > 0) { @@ -248,6 +379,27 @@ static GList return lst; } +static gchar +*confi_db_plugin_path_get_value (ConfiPluggable *pluggable, const gchar *path) +{ + gchar *ret; + gchar *path_; + + ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (pluggable); + + ret = NULL; + + path_ = confi_path_normalize (pluggable, path); + if (path_ == NULL) + { + return NULL; + } + + ret = confi_db_plugin_path_get_value_from_db (pluggable, path_); + + return ret; +} + static void confi_db_plugin_class_init (ConfiDBPluginClass *klass) { @@ -270,6 +422,7 @@ confi_pluggable_iface_init (ConfiPluggableInterface *iface) { iface->initialize = confi_db_plugin_initialize; iface->get_configs_list = confi_db_plugin_get_configs_list; + iface->path_get_value = confi_db_plugin_path_get_value; } static void diff --git a/src/confipluggable.c b/src/confipluggable.c index f067034..bf455e9 100644 --- a/src/confipluggable.c +++ b/src/confipluggable.c @@ -50,7 +50,7 @@ confi_pluggable_default_init (ConfiPluggableInterface *iface) "Connection string", "Connection string", "", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE)); /** * ConfiPluggable:name: @@ -61,7 +61,7 @@ confi_pluggable_default_init (ConfiPluggableInterface *iface) "Configuraton Name", "The configuration name", "", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE)); /** * ConfiPluggable:description: @@ -72,7 +72,7 @@ confi_pluggable_default_init (ConfiPluggableInterface *iface) "Configuraton Description", "The configuration description", "", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE)); /** * ConfiPluggable:root: @@ -131,3 +131,24 @@ GList return iface->get_configs_list (pluggable, filter); } + +/** + * confi_pluggable_path_get_value: + * @pluggable: A #ConfiPluggable. + * @path: + * + * Returns: the value of the @path. +*/ +gchar +*confi_pluggable_path_get_value (ConfiPluggable *pluggable, const gchar *path) +{ + ConfiPluggableInterface *iface; + + g_return_val_if_fail (CONFI_IS_PLUGGABLE (pluggable), FALSE); + + iface = CONFI_PLUGGABLE_GET_IFACE (pluggable); + g_return_val_if_fail (iface->path_get_value != NULL, FALSE); + + return iface->path_get_value (pluggable, path); +} + diff --git a/src/confipluggable.h b/src/confipluggable.h index f29e5d8..ac52cb0 100644 --- a/src/confipluggable.h +++ b/src/confipluggable.h @@ -57,6 +57,7 @@ struct _ConfiPluggableInterface { gboolean (*initialize) (ConfiPluggable *pluggable, const gchar *cnc_string); GList *(*get_configs_list) (ConfiPluggable *pluggable, const gchar *filter); + gchar *(*path_get_value) (ConfiPluggable *pluggable, const gchar *path); }; /* @@ -68,6 +69,8 @@ gboolean confi_pluggable_initialize (ConfiPluggable *pluggable, const gchar *cnc GList *confi_pluggable_get_configs_list (ConfiPluggable *pluggable, const gchar *filter); +gchar *confi_pluggable_path_get_value (ConfiPluggable *pluggable, const gchar *path); + G_END_DECLS diff --git a/src/libconfi.c b/src/libconfi.c index 2becfaf..1a7edbb 100644 --- a/src/libconfi.c +++ b/src/libconfi.c @@ -26,7 +26,6 @@ #include #include "libconfi.h" -#include "confipluggable.h" ConfiConfi @@ -104,9 +103,6 @@ static void confi_get_property (GObject *object, static ConfiPluggable *confi_get_confi_pluggable_from_cnc_string (const gchar *cnc_string); -static gchar *path_normalize (Confi *confi, const gchar *path); -static GdaDataModel *path_get_data_model (Confi *confi, const gchar *path); -static gchar *path_get_value_from_db (Confi *confi, const gchar *path); static void get_children (Confi *confi, GNode *parentNode, gint idParent, gchar *path); static gboolean confi_delete_id_from_db_values (Confi *confi, gint id); static gboolean confi_remove_path_traverse_func (GNode *node, gpointer data); @@ -125,7 +121,6 @@ struct _ConfiPrivate gchar chrquot; - PeasPluginInfo *ppinfo; ConfiPluggable *pluggable; }; @@ -170,6 +165,9 @@ confi_class_init (ConfiClass *klass) static void confi_init (Confi *confi) { + ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); + + priv->pluggable = NULL; } static ConfiPluggable @@ -308,45 +306,47 @@ GNode } /** - * confi_set_root: + * confi_normalize_set_root: * @confi: a #Confi object. * @root: the root. * + * Returns: a correct value for root property. */ -gboolean -confi_set_root (Confi *confi, const gchar *root) +gchar +*confi_normalize_root (const gchar *root) { - ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - - gchar *root_; + GString *root_; + gchar *strret; if (root == NULL) { - root_ = g_strdup ("/"); + root_ = g_string_new ("/"); } else { - root_ = g_strstrip (g_strdup (root)); - if (strcmp (root_, "") == 0) + root_ = g_string_new (root); + g_strstrip (root_->str); + if (g_strcmp0 (root_->str, "") == 0) { - root_ = g_strdup ("/"); + g_string_printf (root_, "/"); } else { - if (root_[0] != '/') + if (root_->str[0] != '/') { - root_ = g_strconcat ("/", root_, NULL); + g_string_prepend (root_, "/"); } - if (root_[strlen (root_) - 1] != '/') + if (root_->str[root_->len - 1] != '/') { - root_ = g_strconcat (root_, "/", NULL); + g_string_append (root_, "/"); } } } - priv->root = root_; + strret = g_strdup (root_->str); + g_string_free (root_, TRUE); - return TRUE; + return strret; } /** @@ -382,7 +382,7 @@ ConfiKey } else { - dmParent = path_get_data_model (confi, path_normalize (confi, parent_)); + //dmParent = path_get_data_model (confi, path_normalize (confi, parent_)); if (dmParent == NULL) { id_parent = -1; @@ -543,7 +543,7 @@ confi_remove_path (Confi *confi, const gchar *path) ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - dm = path_get_data_model (confi, path_normalize (confi, path)); + //dm = path_get_data_model (confi, path_normalize (confi, path)); if (dm != NULL && gda_data_model_get_n_rows (dm) > 0) { @@ -589,39 +589,17 @@ gchar *confi_path_get_value (Confi *confi, const gchar *path) { gchar *ret; - gchar *path_; - gpointer *gp; ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - ret = NULL; - - path_ = path_normalize (confi, path); - if (path_ == NULL) + if (priv->pluggable == NULL) { - return NULL; - } - - gp = g_hash_table_lookup (priv->values, (gconstpointer)path_); - - if (gp == NULL) - { - /* load value from db if path exists */ - ret = path_get_value_from_db (confi, path_); - - if (ret != NULL) - { - /* and insert it on values */ - g_hash_table_insert (priv->values, (gpointer)path_, (gpointer)ret); - } - else - { - /* TO DO */ - } + g_warning ("Not initialized."); + ret = NULL; } else { - ret = g_strdup ((gchar *)gp); + ret = confi_pluggable_path_get_value (priv->pluggable, path); } return ret; @@ -637,10 +615,11 @@ gchar gboolean confi_path_set_value (Confi *confi, const gchar *path, const gchar *value) { + GdaDataModel *dm; gchar *sql; gboolean ret; - GdaDataModel *dm = path_get_data_model (confi, path_normalize (confi, path)); + //dm = path_get_data_model (confi, path_normalize (confi, path)); ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); @@ -679,15 +658,18 @@ confi_path_set_value (Confi *confi, const gchar *path, const gchar *value) gboolean confi_path_move (Confi *confi, const gchar *path, const gchar *parent) { + GdaDataModel *dmPath; + GdaDataModel *dmParent; + gboolean ret; gchar *sql; ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - GdaDataModel *dmPath = path_get_data_model (confi, path_normalize (confi, path)); + //dmPath = path_get_data_model (confi, path_normalize (confi, path)); if (dmPath == NULL) return FALSE; - GdaDataModel *dmParent = path_get_data_model (confi, path_normalize (confi, parent)); + //dmParent = path_get_data_model (confi, path_normalize (confi, parent)); if (dmParent == NULL) return FALSE; ret = TRUE; @@ -716,18 +698,19 @@ confi_path_move (Confi *confi, const gchar *path, const gchar *parent) ConfiKey *confi_path_get_confi_key (Confi *confi, const gchar *path) { + GdaDataModel *dm; gchar *path_; ConfiKey *ck; ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - path_ = path_normalize (confi, path); + //path_ = path_normalize (confi, path); if (path_ == NULL) { return NULL; } - GdaDataModel *dm = path_get_data_model (confi, path_); + //dm = path_get_data_model (confi, path_); if (dm == NULL || gda_data_model_get_n_rows (dm) <= 0) { if (dm != NULL) @@ -814,16 +797,21 @@ confi_destroy (Confi *confi) g_free (priv->root); } -/* PRIVATE */ -static gchar -*path_normalize (Confi *confi, const gchar *path) +/** + * confi_path_normalize: + * @pluggable: a #ConfiPluggable object. + * + * Returns: a normalize path (with root). + */ +gchar +*confi_path_normalize (ConfiPluggable *pluggable, const gchar *path) { GString *ret; gchar *strret; guint lead; - ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); + gchar *root; if (path == NULL) { @@ -855,7 +843,9 @@ static gchar { g_string_erase (ret, 0, lead++); } - g_string_prepend (ret, priv->root); + + g_object_get (pluggable, "root", &root, NULL); + g_string_prepend (ret, root); strret = g_strdup (ret->str); g_string_free (ret, TRUE); @@ -863,80 +853,7 @@ static gchar return strret; } -static GdaDataModel -*path_get_data_model (Confi *confi, const gchar *path) -{ - gchar **tokens; - gchar *sql; - gchar *token; - guint i; - guint id_parent; - GdaDataModel *dm = NULL; - - ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - - if (path == NULL) return NULL; - - tokens = g_strsplit (path, "/", 0); - if (tokens == NULL) return NULL; - - i = 0; - id_parent = 0; - while (tokens[i] != NULL) - { - token = g_strstrip (g_strdup (tokens[i])); - if (strcmp (token, "") != 0) - { - sql = g_strdup_printf ("SELECT * " - "FROM %cvalues%c " - "WHERE id_configs = %d " - "AND id_parent = %d " - "AND %ckey%c = '%s'", - priv->chrquot, priv->chrquot, - priv->id_config, - id_parent, - priv->chrquot, priv->chrquot, - gdaex_strescape (token, NULL)); - dm = gdaex_query (priv->gdaex, sql); - g_free (sql); - if (dm == NULL || gda_data_model_get_n_rows (dm) != 1) - { - /* TO DO */ - g_warning ("Unable to find key «%s».", token); - if (dm != NULL) - { - g_object_unref (dm); - dm = NULL; - } - break; - } - id_parent = gdaex_data_model_get_field_value_integer_at (dm, 0, "id"); - } - - i++; - } - - return dm; -} - -static gchar -*path_get_value_from_db (Confi *confi, const gchar *path) -{ - gchar *ret; - GdaDataModel *dm; - - ret = NULL; - - dm = path_get_data_model (confi, path); - if (dm != NULL) - { - ret = gdaex_data_model_get_field_value_stringify_at (dm, 0, "value"); - g_object_unref (dm); - } - - return ret; -} - +/* PRIVATE */ static void get_children (Confi *confi, GNode *parentNode, gint idParent, gchar *path) { @@ -1014,7 +931,7 @@ confi_set_property (GObject *object, guint property_id, const GValue *value, GPa break; case PROP_ROOT: - confi_set_root (confi, g_value_get_string (value)); + priv->root = confi_normalize_root (g_value_get_string (value)); break; default: diff --git a/src/libconfi.h b/src/libconfi.h index 46000ba..a59a7d9 100644 --- a/src/libconfi.h +++ b/src/libconfi.h @@ -25,6 +25,9 @@ G_BEGIN_DECLS +#include "confipluggable.h" + + #define CONFI_TYPE_CONFI (confi_confi_get_type ()) GType confi_confi_get_type (); @@ -89,8 +92,7 @@ GList *confi_get_configs_list (const gchar *cnc_string, GNode *confi_get_tree (Confi *confi); -gboolean confi_set_root (Confi *confi, - const gchar *root); +gchar *confi_normalize_root (const gchar *root); ConfiKey *confi_add_key (Confi *confi, const gchar *parent, @@ -123,6 +125,8 @@ gboolean confi_remove (Confi *confi); void confi_destroy (Confi *confi); +gchar *confi_path_normalize (ConfiPluggable *pluggable, const gchar *path); + G_END_DECLS diff --git a/tests/test.c b/tests/test.c index 32af0f6..f7d6fe5 100644 --- a/tests/test.c +++ b/tests/test.c @@ -64,7 +64,7 @@ main (int argc, char **argv) confis = g_list_next (confis); } - /*confi = confi_new (argv[1], "Default", NULL, FALSE); + confi = confi_new (argv[1]); if (confi == NULL) { g_error ("Error on configuration initialization."); @@ -73,7 +73,7 @@ main (int argc, char **argv) g_printf ("Value from key \"folder/key1/key1_2\"\n%s\n\n", confi_path_get_value (confi, "folder/key1/key1_2")); - g_printf ("Traversing the entire tree\n"); + /*g_printf ("Traversing the entire tree\n"); tree = confi_get_tree (confi); g_node_traverse (tree, G_PRE_ORDER, G_TRAVERSE_ALL, -1, traverse_func, NULL); g_printf ("\n");