From: Andrea Zagli Date: Thu, 18 Dec 2014 15:11:42 +0000 (+0100) Subject: Implemented Confi::remove_path in plugins. X-Git-Tag: v0.10.0~10 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=4320678a835d5f10be634cb5f71ce22229369215;p=zakconfi%2Flibzakconfi Implemented Confi::remove_path in plugins. --- diff --git a/plugins/db/plgdb.c b/plugins/db/plgdb.c index 90c2b07..4c1c96f 100644 --- a/plugins/db/plgdb.c +++ b/plugins/db/plgdb.c @@ -729,6 +729,90 @@ static ConfiKey return ck; } +static gboolean +confi_db_plugin_delete_id_from_db_values (ConfiPluggable *pluggable, gint id) +{ + gboolean ret; + gchar *sql; + + ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (pluggable); + + sql = g_strdup_printf ("DELETE FROM %cvalues%c" + " WHERE id_configs = %d" + " AND id = %d", + priv->chrquot, priv->chrquot, + priv->id_config, + id); + + if (gdaex_execute (priv->gdaex, sql) >= 0) + { + ret = TRUE; + } + else + { + ret = FALSE; + } + g_free (sql); + + return ret; +} + +static gboolean +confi_db_plugin_remove_path_traverse_func (GNode *node, gpointer data) +{ + ConfiKey *ck = (ConfiKey *)node->data; + if (ck->id != 0) + { + confi_db_plugin_delete_id_from_db_values ((ConfiPluggable *)data, ck->id); + } + + return FALSE; +} + +static gboolean +confi_db_plugin_remove_path (ConfiPluggable *pluggable, const gchar *path) +{ + gboolean ret = FALSE; + GdaDataModel *dm; + + ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (pluggable); + + dm = confi_db_plugin_path_get_data_model (pluggable, confi_path_normalize (pluggable, path)); + + if (dm != NULL && gda_data_model_get_n_rows (dm) > 0) + { + gchar *path_ = g_strdup (path); + + /* removing every child key */ + GNode *node, *root; + gint id = gdaex_data_model_get_field_value_integer_at (dm, 0, "id"); + + node = g_node_new (path_); + confi_db_plugin_get_children (pluggable, node, id, path_); + + root = g_node_get_root (node); + + if (g_node_n_nodes (root, G_TRAVERSE_ALL) > 1) + { + g_node_traverse (root, G_PRE_ORDER, G_TRAVERSE_ALL, -1, confi_db_plugin_remove_path_traverse_func, (gpointer)pluggable); + } + + /* removing the path */ + ret = confi_db_plugin_delete_id_from_db_values (pluggable, id); + } + else + { + g_warning ("Path %s doesn't exists.", path); + } + if (dm != NULL) + { + g_object_unref (dm); + } + + return ret; +} + + static void confi_db_plugin_class_init (ConfiDBPluginClass *klass) { @@ -756,6 +840,7 @@ confi_pluggable_iface_init (ConfiPluggableInterface *iface) iface->get_tree = confi_db_plugin_get_tree; iface->add_key = confi_db_plugin_add_key; iface->path_get_confi_key = confi_db_plugin_path_get_confi_key; + iface->remove_path = confi_db_plugin_remove_path; } static void diff --git a/plugins/file/plgfile.c b/plugins/file/plgfile.c index b3181eb..581745e 100644 --- a/plugins/file/plgfile.c +++ b/plugins/file/plgfile.c @@ -508,6 +508,38 @@ static ConfiKey return ck; } +static gboolean +confi_file_plugin_remove_path (ConfiPluggable *pluggable, const gchar *path) +{ + gboolean ret; + + gchar *group; + gchar *key; + + GError *error; + + ConfiFilePluginPrivate *priv = CONFI_FILE_PLUGIN_GET_PRIVATE (pluggable); + + group = NULL; + key = NULL; + if (confi_file_plugin_path_get_group_and_key (pluggable, path, &group, &key)) + { + error = NULL; + ret = g_key_file_remove_key (priv->kfile, group, key, &error); + if (error != NULL) + { + g_warning ("Error on removing key from file: %s.", + error != NULL && error->message != NULL ? error->message : "no details"); + } + } + else + { + ret = FALSE; + } + + return ret; +} + static void confi_file_plugin_class_init (ConfiFilePluginClass *klass) { @@ -535,6 +567,7 @@ confi_pluggable_iface_init (ConfiPluggableInterface *iface) iface->get_tree = confi_file_plugin_get_tree; iface->add_key = confi_file_plugin_add_key; iface->path_get_confi_key = confi_file_plugin_path_get_confi_key; + iface->remove_path = confi_file_plugin_remove_path; } static void diff --git a/src/confipluggable.c b/src/confipluggable.c index 9286d72..e655a21 100644 --- a/src/confipluggable.c +++ b/src/confipluggable.c @@ -232,3 +232,23 @@ ConfiKey return iface->path_get_confi_key (pluggable, path); } + +/** + * confi_pluggable_remove_path: + * @confi: a #Confi object. + * @path: the path to remove. + * + * Removes @path and every child key. + */ +gboolean +confi_pluggable_remove_path (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->remove_path != NULL, FALSE); + + return iface->remove_path (pluggable, path); +} diff --git a/src/confipluggable.h b/src/confipluggable.h index 04f2f61..1b0b9e5 100644 --- a/src/confipluggable.h +++ b/src/confipluggable.h @@ -66,6 +66,8 @@ struct _ConfiPluggableInterface { GNode *(*get_tree) (ConfiPluggable *pluggable); 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); + }; /* @@ -89,6 +91,7 @@ ConfiKey *confi_pluggable_add_key (ConfiPluggable *pluggable, const gchar *key, const gchar *value); ConfiKey *confi_pluggable_path_get_confi_key (ConfiPluggable *pluggable, const gchar *path); +gboolean confi_pluggable_remove_path (ConfiPluggable *pluggable, const gchar *path); G_END_DECLS diff --git a/src/libconfi.c b/src/libconfi.c index df9b22c..421860f 100644 --- a/src/libconfi.c +++ b/src/libconfi.c @@ -50,9 +50,6 @@ static void confi_get_property (GObject *object, static ConfiPluggable *confi_get_confi_pluggable_from_cnc_string (const gchar *cnc_string); -static gboolean confi_delete_id_from_db_values (Confi *confi, gint id); -static gboolean confi_remove_path_traverse_func (GNode *node, gpointer data); - #define CONFI_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_CONFI, ConfiPrivate)) typedef struct _ConfiPrivate ConfiPrivate; @@ -386,41 +383,17 @@ confi_key_set_key (Confi *confi, gboolean confi_remove_path (Confi *confi, const gchar *path) { - gboolean ret = FALSE; - GdaDataModel *dm; - + gboolean ret; ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - //dm = path_get_data_model (confi, path_normalize (confi, path)); - - if (dm != NULL && gda_data_model_get_n_rows (dm) > 0) + if (priv->pluggable == NULL) { - gchar *path_ = g_strdup (path); - - /* removing every child key */ - GNode *node, *root; - gint id = gdaex_data_model_get_field_value_integer_at (dm, 0, "id"); - - node = g_node_new (path_); - get_children (confi, node, id, path_); - - root = g_node_get_root (node); - - if (g_node_n_nodes (root, G_TRAVERSE_ALL) > 1) - { - g_node_traverse (root, G_PRE_ORDER, G_TRAVERSE_ALL, -1, confi_remove_path_traverse_func, (gpointer)confi); - } - - /* removing the path */ - ret = confi_delete_id_from_db_values (confi, id); + g_warning ("Not initialized."); + ret = FALSE; } else { - g_warning ("Path %s doesn't exists.", path); - } - if (dm != NULL) - { - g_object_unref (dm); + ret = confi_pluggable_remove_path (priv->pluggable, path); } return ret; @@ -691,43 +664,3 @@ confi_get_property (GObject *object, guint property_id, GValue *value, GParamSpe break; } } - -static gboolean -confi_delete_id_from_db_values (Confi *confi, gint id) -{ - gboolean ret; - gchar *sql; - - ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - - sql = g_strdup_printf ("DELETE FROM %cvalues%c " - "WHERE id_configs = %d " - "AND id = %d", - priv->chrquot, priv->chrquot, - priv->id_config, - id); - - if (gdaex_execute (priv->gdaex, sql) >= 0) - { - ret = TRUE; - } - else - { - ret = FALSE; - } - g_free (sql); - - return ret; -} - -static gboolean -confi_remove_path_traverse_func (GNode *node, gpointer data) -{ - ConfiKey *ck = (ConfiKey *)node->data; - if (ck->id != 0) - { - confi_delete_id_from_db_values ((Confi *)data, ck->id); - } - - return FALSE; -}