From: Andrea Zagli Date: Thu, 18 Dec 2014 15:36:05 +0000 (+0100) Subject: Implemented Confi::key_set_key in plugins. X-Git-Tag: v0.10.0~7 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=3558f5bbd709c92630928f9b920f32744f81fae5;p=zakconfi%2Flibzakconfi Implemented Confi::key_set_key in plugins. --- diff --git a/plugins/db/plgdb.c b/plugins/db/plgdb.c index fcf953a..408219a 100644 --- a/plugins/db/plgdb.c +++ b/plugins/db/plgdb.c @@ -687,6 +687,35 @@ static ConfiKey return ck; } +static gboolean +confi_db_plugin_key_set_key (ConfiPluggable *pluggable, + ConfiKey *ck) +{ + gboolean ret; + gchar *sql; + + ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (pluggable); + + sql = g_strdup_printf ("UPDATE %cvalues%c" + " SET %ckey%c = '%s'," + " value = '%s'," + " description = '%s'" + " WHERE id_configs = %d" + " AND id = %d", + priv->chrquot, priv->chrquot, + priv->chrquot, priv->chrquot, + gdaex_strescape (ck->key, NULL), + gdaex_strescape (ck->value, NULL), + gdaex_strescape (ck->description, NULL), + priv->id_config, + ck->id); + + ret = (gdaex_execute (priv->gdaex, sql) >= 0); + g_free (sql); + + return ret; +} + static ConfiKey *confi_db_plugin_path_get_confi_key (ConfiPluggable *pluggable, const gchar *path) { @@ -871,6 +900,7 @@ confi_pluggable_iface_init (ConfiPluggableInterface *iface) iface->path_set_value = confi_db_plugin_path_set_value; iface->get_tree = confi_db_plugin_get_tree; iface->add_key = confi_db_plugin_add_key; + iface->key_set_key = confi_db_plugin_key_set_key; iface->path_get_confi_key = confi_db_plugin_path_get_confi_key; iface->remove_path = confi_db_plugin_remove_path; iface->remove = confi_db_plugin_remove; diff --git a/plugins/file/plgfile.c b/plugins/file/plgfile.c index 4f35a80..91f4849 100644 --- a/plugins/file/plgfile.c +++ b/plugins/file/plgfile.c @@ -469,6 +469,23 @@ static ConfiKey return ck; } +static gboolean +confi_file_plugin_key_set_key (ConfiPluggable *pluggable, + ConfiKey *ck) +{ + gboolean ret; + + gchar *path; + + ConfiFilePluginPrivate *priv = CONFI_FILE_PLUGIN_GET_PRIVATE (pluggable); + + path = g_strdup_printf ("%s/%s", ck->path, ck->key); + ret = confi_file_plugin_path_set_value (pluggable, path, ck->value); + g_free (path); + + return ret; +} + static ConfiKey *confi_file_plugin_path_get_confi_key (ConfiPluggable *pluggable, const gchar *path) { @@ -586,6 +603,7 @@ confi_pluggable_iface_init (ConfiPluggableInterface *iface) iface->path_set_value = confi_file_plugin_path_set_value; iface->get_tree = confi_file_plugin_get_tree; iface->add_key = confi_file_plugin_add_key; + iface->key_set_key = confi_file_plugin_key_set_key; iface->path_get_confi_key = confi_file_plugin_path_get_confi_key; iface->remove_path = confi_file_plugin_remove_path; iface->remove = confi_file_plugin_remove; diff --git a/src/confipluggable.c b/src/confipluggable.c index 78ebeb8..5b7b510 100644 --- a/src/confipluggable.c +++ b/src/confipluggable.c @@ -213,6 +213,26 @@ ConfiKey return iface->add_key (pluggable, parent, key, value); } +/** + * confi_pluggable_key_set_key: + * @pluggable: a #ConfiPluggable object. + * @ck: a #ConfiKey struct. + * + */ +gboolean +confi_pluggable_key_set_key (ConfiPluggable *pluggable, + ConfiKey *ck) +{ + ConfiPluggableInterface *iface; + + g_return_val_if_fail (CONFI_IS_PLUGGABLE (pluggable), FALSE); + + iface = CONFI_PLUGGABLE_GET_IFACE (pluggable); + g_return_val_if_fail (iface->key_set_key != NULL, FALSE); + + return iface->key_set_key (pluggable, ck); +} + /** * confi_pluggable_path_get_confi_key: * @pluggable: a #ConfiPluggable object. diff --git a/src/confipluggable.h b/src/confipluggable.h index 65a1571..a8c2947 100644 --- a/src/confipluggable.h +++ b/src/confipluggable.h @@ -61,13 +61,19 @@ struct _ConfiPluggableInterface { const gchar *filter); gchar *(*path_get_value) (ConfiPluggable *pluggable, const gchar *path); gboolean (*path_set_value) (ConfiPluggable *pluggable, - const gchar *path, - const gchar *value); + const gchar *path, + const gchar *value); GNode *(*get_tree) (ConfiPluggable *pluggable); - ConfiKey *(*add_key) (ConfiPluggable *pluggable, const gchar *parent, const gchar *key, const gchar *value); + ConfiKey *(*add_key) (ConfiPluggable *pluggable, + const gchar *parent, + const gchar *key, + const gchar *value); ConfiKey *(*path_get_confi_key) (ConfiPluggable *pluggable, const gchar *path); - gboolean (*remove_path) (ConfiPluggable *pluggable, const gchar *path); + gboolean (*remove_path) (ConfiPluggable *pluggable, + const gchar *path); gboolean (*remove) (ConfiPluggable *pluggable); + gboolean (*key_set_key) (ConfiPluggable *pluggable, + ConfiKey *ck); }; /* @@ -90,6 +96,8 @@ ConfiKey *confi_pluggable_add_key (ConfiPluggable *pluggable, const gchar *parent, const gchar *key, const gchar *value); +gboolean confi_pluggable_key_set_key (ConfiPluggable *pluggable, + ConfiKey *ck); ConfiKey *confi_pluggable_path_get_confi_key (ConfiPluggable *pluggable, const gchar *path); gboolean confi_pluggable_remove_path (ConfiPluggable *pluggable, const gchar *path); gboolean confi_pluggable_remove (ConfiPluggable *pluggable); diff --git a/src/libconfi.c b/src/libconfi.c index e813a62..71a7791 100644 --- a/src/libconfi.c +++ b/src/libconfi.c @@ -349,26 +349,18 @@ confi_key_set_key (Confi *confi, ConfiKey *ck) { gboolean ret; - gchar *sql; ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - sql = g_strdup_printf ("UPDATE %cvalues%c" - " SET %ckey%c = '%s'," - " value = '%s'," - " description = '%s'" - " WHERE id_configs = %d" - " AND id = %d", - priv->chrquot, priv->chrquot, - priv->chrquot, priv->chrquot, - gdaex_strescape (ck->key, NULL), - gdaex_strescape (ck->value, NULL), - gdaex_strescape (ck->description, NULL), - priv->id_config, - ck->id); - - ret = (gdaex_execute (priv->gdaex, sql) >= 0); - g_free (sql); + if (priv->pluggable == NULL) + { + g_warning ("Not initialized."); + ret = FALSE; + } + else + { + ret = confi_pluggable_key_set_key (priv->pluggable, ck); + } return ret; }