Implemented Confi::get_tree in db plugin.

diff --git a/plugins/db/plgdb.c b/plugins/db/plgdb.c
index 57142f1edb5da4c040b28d2a848e5f67e58f0901..982681b9fd03d8bb1c3fbea952a3337b62bf214e 100644 (file)
--- a/plugins/db/plgdb.c
+++ b/plugins/db/plgdb.c
@@ -42,6 +42,7 @@ 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);
+static void confi_db_plugin_get_children (ConfiPluggable *pluggable, GNode *parentNode, gint idParent, gchar *path);
 
 #define CONFI_DB_PLUGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CONFI_TYPE_DB_PLUGIN, ConfiDBPluginPrivate))
 
@@ -318,6 +319,50 @@ static gchar
        return ret;
 }
 
+static void
+confi_db_plugin_get_children (ConfiPluggable *pluggable, GNode *parentNode, gint idParent, gchar *path)
+{
+       gchar *sql;
+       GdaDataModel *dm;
+
+       ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (pluggable);
+
+       sql = g_strdup_printf ("SELECT * FROM %cvalues%c "
+                                     "WHERE id_configs = %d AND "
+                                     "id_parent = %d",
+                                     priv->chrquot, priv->chrquot,
+                                     priv->id_config,
+                                     idParent);
+
+       dm = gdaex_query (priv->gdaex, sql);
+       g_free (sql);
+       if (dm != NULL)
+               {
+                       guint i;
+                       guint rows;
+
+                       rows = gda_data_model_get_n_rows (dm);
+                       for (i = 0; i < rows; i++)
+                               {
+                                       GNode *newNode;
+                                       ConfiKey *ck = g_new0 (ConfiKey, 1);
+
+                                       ck->id_config = priv->id_config;
+                                       ck->id = gdaex_data_model_get_field_value_integer_at (dm, i, "id");
+                                       ck->id_parent = gdaex_data_model_get_field_value_integer_at (dm, i, "id_parent");
+                                       ck->key = g_strdup (gdaex_data_model_get_field_value_stringify_at (dm, i, "key"));
+                                       ck->value = g_strdup (gdaex_data_model_get_field_value_stringify_at (dm, i, "value"));
+                                       ck->description = g_strdup (gdaex_data_model_get_field_value_stringify_at (dm, i, "description"));
+                                       ck->path = g_strdup (path);
+
+                                       newNode = g_node_append_data (parentNode, ck);
+
+                                       confi_db_plugin_get_children (pluggable, newNode, ck->id, g_strconcat (path, (g_strcmp0 (path, "") == 0 ? "" : "/"), ck->key, NULL));
+                               }
+                       g_object_unref (dm);
+               }
+}
+
 static GList
 *confi_db_plugin_get_configs_list (ConfiPluggable *pluggable,
                                    const gchar *filter)
@@ -400,7 +445,7 @@ static gchar
        return ret;
 }
 
-gboolean
+static gboolean
 confi_db_plugin_path_set_value (ConfiPluggable *pluggable, const gchar *path, const gchar *value)
 {
        GdaDataModel *dm;
@@ -436,6 +481,30 @@ confi_db_plugin_path_set_value (ConfiPluggable *pluggable, const gchar *path, co
        return ret;
 }
 
+GNode
+*confi_db_plugin_get_tree (ConfiPluggable *pluggable)
+{
+       gchar *path;
+       GNode *node;
+
+       ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (pluggable);
+
+       path = g_strdup ("");
+
+       ConfiKey *ck = g_new0 (ConfiKey, 1);
+
+       ck->id_config = priv->id_config;
+       ck->id = 0;
+       ck->id_parent = 0;
+       ck->key = g_strdup ("/");
+
+       node = g_node_new (ck);
+
+       confi_db_plugin_get_children (pluggable, node, 0, path);
+
+       return node;
+}
+
 static void
 confi_db_plugin_class_init (ConfiDBPluginClass *klass)
 {
@@ -460,6 +529,7 @@ confi_pluggable_iface_init (ConfiPluggableInterface *iface)
        iface->get_configs_list = confi_db_plugin_get_configs_list;
        iface->path_get_value = confi_db_plugin_path_get_value;
        iface->path_set_value = confi_db_plugin_path_set_value;
+       iface->get_tree = confi_db_plugin_get_tree;
 }
 
 static void

diff --git a/src/confipluggable.c b/src/confipluggable.c
index e43b06a7f50b5b6d0e3ef2fb776d88c93e0ab696..ba45eb88205ff6ca849d1509dc798ac1a4f278e1 100644 (file)
--- a/src/confipluggable.c
+++ b/src/confipluggable.c
@@ -171,3 +171,22 @@ confi_pluggable_path_set_value (ConfiPluggable *pluggable, const gchar *path, co
 
        return iface->path_set_value (pluggable, path, value);
 }
+
+/**
+ * confi_get_tree:
+ * @pluggable: a #ConfiPluggable object.
+ *
+ * Returns: a #GNode with the entire tree of configurations.
+ */
+GNode
+*confi_pluggable_get_tree (ConfiPluggable *pluggable)
+{
+       ConfiPluggableInterface *iface;
+
+       g_return_val_if_fail (CONFI_IS_PLUGGABLE (pluggable), FALSE);
+
+       iface = CONFI_PLUGGABLE_GET_IFACE (pluggable);
+       g_return_val_if_fail (iface->get_tree != NULL, FALSE);
+
+       return iface->get_tree (pluggable);
+}

diff --git a/src/confipluggable.h b/src/confipluggable.h
index 71a729136867d97c35964b7d61515d0373ac55d4..f7773f1b6fa7ea848b99df2d3533d120a394e024 100644 (file)
--- a/src/confipluggable.h
+++ b/src/confipluggable.h
@@ -61,6 +61,7 @@ struct _ConfiPluggableInterface {
        gboolean (*path_set_value) (ConfiPluggable *pluggable,
                                       const gchar *path,
                                       const gchar *value);
+       GNode *(*get_tree) (ConfiPluggable *pluggable);
 };
 
 /*
@@ -76,6 +77,7 @@ gchar *confi_pluggable_path_get_value (ConfiPluggable *pluggable, const gchar *p
 gboolean confi_pluggable_path_set_value (ConfiPluggable *pluggable,
                                const gchar *path,
                                const gchar *value);
+GNode *confi_pluggable_get_tree (ConfiPluggable *pluggable);
 
 
 G_END_DECLS

diff --git a/src/libconfi.c b/src/libconfi.c
index 6eff72947e8ece5c51f36a5736c20a1e8ea254cb..18233d243cf15bda9d1ee7ad4a191907de7646c1 100644 (file)
--- a/src/libconfi.c
+++ b/src/libconfi.c
@@ -103,7 +103,6 @@ static void confi_get_property (GObject *object,
 
 static ConfiPluggable *confi_get_confi_pluggable_from_cnc_string (const gchar *cnc_string);
 
-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);
 
@@ -135,31 +134,6 @@ confi_class_init (ConfiClass *klass)
 
        object_class->set_property = confi_set_property;
        object_class->get_property = confi_get_property;
-
-       g_object_class_install_property (object_class, PROP_ID_CONFIG,
-                                        g_param_spec_int ("id_config",
-                                                          "Configuraton ID",
-                                                          "The configuration ID",
-                                                          0, G_MAXINT, 0,
-                                                          G_PARAM_READABLE));
-       g_object_class_install_property (object_class, PROP_NAME,
-                                        g_param_spec_string ("name",
-                                                             "Configuraton Name",
-                                                             "The configuration name",
-                                                             "",
-                                                             G_PARAM_READWRITE));
-       g_object_class_install_property (object_class, PROP_DESCRIPTION,
-                                        g_param_spec_string ("description",
-                                                             "Configuraton Description",
-                                                             "The configuration description",
-                                                             "",
-                                                             G_PARAM_READWRITE));
-       g_object_class_install_property (object_class, PROP_ROOT,
-                                        g_param_spec_string ("root",
-                                                             "Configuraton Root",
-                                                             "The configuration root",
-                                                             "/",
-                                                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 }
 
 static void
@@ -286,23 +260,16 @@ GList
 GNode
 *confi_get_tree (Confi *confi)
 {
-       gchar *path = "";
-       GNode *node;
-
        ConfiPrivate *priv = CONFI_GET_PRIVATE (confi);
 
-       ConfiKey *ck = g_new0 (ConfiKey, 1);
-
-       ck->id_config = priv->id_config;
-       ck->id = 0;
-       ck->id_parent = 0;
-       ck->key = g_strdup ("/");
-
-       node = g_node_new (ck);
-
-       get_children (confi, node, 0, path);
-
-       return node;
+       if (priv->pluggable != NULL)
+               {
+                       return confi_pluggable_get_tree (priv->pluggable);
+               }
+       else
+               {
+                       return NULL;
+               }
 }
 
 /**
@@ -838,50 +805,6 @@ gchar
 }
 
 /* PRIVATE */
-static void
-get_children (Confi *confi, GNode *parentNode, gint idParent, gchar *path)
-{
-       gchar *sql;
-       GdaDataModel *dm;
-
-       ConfiPrivate *priv = CONFI_GET_PRIVATE (confi);
-
-       sql = g_strdup_printf ("SELECT * FROM %cvalues%c "
-                                     "WHERE id_configs = %d AND "
-                                     "id_parent = %d",
-                                     priv->chrquot, priv->chrquot,
-                                     priv->id_config,
-                                     idParent);
-
-       dm = gdaex_query (priv->gdaex, sql);
-       g_free (sql);
-       if (dm != NULL)
-               {
-                       guint i;
-                       guint rows;
-
-                       rows = gda_data_model_get_n_rows (dm);
-                       for (i = 0; i < rows; i++)
-                               {
-                                       GNode *newNode;
-                                       ConfiKey *ck = g_new0 (ConfiKey, 1);
-
-                                       ck->id_config = priv->id_config;
-                                       ck->id = gdaex_data_model_get_field_value_integer_at (dm, i, "id");
-                                       ck->id_parent = gdaex_data_model_get_field_value_integer_at (dm, i, "id_parent");
-                                       ck->key = g_strdup (gdaex_data_model_get_field_value_stringify_at (dm, i, "key"));
-                                       ck->value = g_strdup (gdaex_data_model_get_field_value_stringify_at (dm, i, "value"));
-                                       ck->description = g_strdup (gdaex_data_model_get_field_value_stringify_at (dm, i, "description"));
-                                       ck->path = g_strdup (path);
-
-                                       newNode = g_node_append_data (parentNode, ck);
-
-                                       get_children (confi, newNode, ck->id, g_strconcat (path, (strcmp (path, "") == 0 ? "" : "/"), ck->key, NULL));
-                               }
-                       g_object_unref (dm);
-               }
-}
-
 static void
 confi_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
@@ -892,32 +815,6 @@ confi_set_property (GObject *object, guint property_id, const GValue *value, GPa
 
        switch (property_id)
                {
-                       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:
                                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
                                break;
@@ -932,22 +829,6 @@ confi_get_property (GObject *object, guint property_id, GValue *value, GParamSpe
 
        switch (property_id)
                {
-                       case PROP_ID_CONFIG:
-                               g_value_set_int (value, priv->id_config);
-                               break;
-
-                       case PROP_NAME:
-                               g_value_set_string (value, priv->name);
-                               break;
-
-                       case PROP_DESCRIPTION:
-                               g_value_set_string (value, priv->description);
-                               break;
-
-                       case PROP_ROOT:
-                               g_value_set_string (value, priv->root);
-                               break;
-
                        default:
                                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
                                break;

diff --git a/tests/test.c b/tests/test.c
index 59c507b40d5a9a297c8c996d3cc6ad42e70933db..9bd2d046d56efd4eb841ade26c28e321d385cc46 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -77,16 +77,16 @@ 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"));
        confi_path_set_value (confi, "folder/key1/key1_2", val);
 
-       /*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");
 
-       g_printf ("Setting root \"key2\"\n");
+       /*g_printf ("Setting root \"key2\"\n");
        confi_set_root (confi, "key2");
-       g_printf ("Value from key \"key2-1\" %s\n", confi_path_get_value (confi, "key2-1"));
+       g_printf ("Value from key \"key2-1\" %s\n", confi_path_get_value (confi, "key2-1"));*/
 
-       confi_destroy (confi);*/
+       confi_destroy (confi);
 
        return 0;
 }