Implemented Confi::path_get_confi_key in db plugin.

diff --git a/plugins/db/plgdb.c b/plugins/db/plgdb.c
index e9d4279191c594ffafbdb63d2b2966a59791136b..4776f04990b4f9f7a1bdd3d9b416b4bc0f2c3b5c 100644 (file)
--- a/plugins/db/plgdb.c
+++ b/plugins/db/plgdb.c
@@ -637,6 +637,48 @@ static ConfiKey
        return ck;
 }
 
+static ConfiKey
+*confi_db_plugin_path_get_confi_key (ConfiPluggable *pluggable, const gchar *path)
+{
+       GdaDataModel *dm;
+       gchar *path_;
+       ConfiKey *ck;
+
+       ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (pluggable);
+
+       path_ = confi_path_normalize (pluggable, path);
+       if (path_ == NULL)
+               {
+                       return NULL;
+               }
+
+       dm = confi_db_plugin_path_get_data_model (pluggable, path_);
+       if (dm == NULL || gda_data_model_get_n_rows (dm) <= 0)
+               {
+                       if (dm != NULL)
+                               {
+                                       g_object_unref (dm);
+                               }
+                       return NULL;
+               }
+
+       ck = g_new0 (ConfiKey, 1);
+       ck->id_config = gdaex_data_model_get_field_value_integer_at (dm, 0, "id_configs");
+       ck->id = gdaex_data_model_get_field_value_integer_at (dm, 0, "id");
+       ck->id_parent = gdaex_data_model_get_field_value_integer_at (dm, 0, "id_parent");
+       ck->key = gdaex_data_model_get_field_value_stringify_at (dm, 0, "key");
+       ck->value = gdaex_data_model_get_field_value_stringify_at (dm, 0, "value");
+       ck->description = gdaex_data_model_get_field_value_stringify_at (dm, 0, "description");
+       ck->path = g_strdup (path_);
+
+       if (dm != NULL)
+               {
+                       g_object_unref (dm);
+               }
+
+       return ck;
+}
+
 static void
 confi_db_plugin_class_init (ConfiDBPluginClass *klass)
 {
@@ -663,6 +705,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->path_get_confi_key = confi_db_plugin_path_get_confi_key;
 }
 
 static void

diff --git a/src/confipluggable.c b/src/confipluggable.c
index 3ca096e6b07ac649b8dc091e211c24d96a139c73..9286d72966bad6c7023372e6c6a803a36084737b 100644 (file)
--- a/src/confipluggable.c
+++ b/src/confipluggable.c
@@ -212,3 +212,23 @@ ConfiKey
 
        return iface->add_key (pluggable, parent, key, value);
 }
+
+/**
+ * confi_pluggable_path_get_confi_key:
+ * @pluggable: a #ConfiPluggable object.
+ * @path: the key's path to get.
+ *
+ * Returns: (transfer full): a #ConfiKey from @path
+ */
+ConfiKey
+*confi_pluggable_path_get_confi_key (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_confi_key != NULL, FALSE);
+
+       return iface->path_get_confi_key (pluggable, path);
+}

diff --git a/src/confipluggable.h b/src/confipluggable.h
index eeb2ef93e613645420db3fdc3368803ce95648b5..04f2f61e414fc07ea0a879b6e125f326ccb85659 100644 (file)
--- a/src/confipluggable.h
+++ b/src/confipluggable.h
@@ -65,6 +65,7 @@ struct _ConfiPluggableInterface {
                                       const gchar *value);
        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);
 };
 
 /*
@@ -87,6 +88,7 @@ ConfiKey *confi_pluggable_add_key (ConfiPluggable *pluggable,
                                    const gchar *parent,
                                    const gchar *key,
                                    const gchar *value);
+ConfiKey *confi_pluggable_path_get_confi_key (ConfiPluggable *pluggable, const gchar *path);
 
 
 G_END_DECLS

diff --git a/src/libconfi.c b/src/libconfi.c
index 9946a90a04f456ff4f2c014fe4ba49c81adacb5a..19812bb1b68edd352bbc0276d7815cb3f493fa15 100644 (file)
--- a/src/libconfi.c
+++ b/src/libconfi.c
@@ -480,40 +480,18 @@ 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);
-       if (path_ == NULL)
-               {
-                       return NULL;
-               }
-
-       //dm = path_get_data_model (confi, path_);
-       if (dm == NULL || gda_data_model_get_n_rows (dm) <= 0)
+       if (priv->pluggable == NULL)
                {
-                       if (dm != NULL)
-                               {
-                                       g_object_unref (dm);
-                               }
-                       return NULL;
+                       g_warning ("Not initialized.");
+                       ck = NULL;
                }
-
-       ck = (ConfiKey *)g_malloc0 (sizeof (ConfiKey));
-       ck->id_config = gdaex_data_model_get_field_value_integer_at (dm, 0, "id_configs");
-       ck->id = gdaex_data_model_get_field_value_integer_at (dm, 0, "id");
-       ck->id_parent = gdaex_data_model_get_field_value_integer_at (dm, 0, "id_parent");
-       ck->key = gdaex_data_model_get_field_value_stringify_at (dm, 0, "key");
-       ck->value = gdaex_data_model_get_field_value_stringify_at (dm, 0, "value");
-       ck->description = gdaex_data_model_get_field_value_stringify_at (dm, 0, "description");
-       ck->path = g_strdup (path_);
-
-       if (dm != NULL)
+       else
                {
-                       g_object_unref (dm);
+                       ck = confi_pluggable_path_get_confi_key (priv->pluggable, path);
                }
 
        return ck;

diff --git a/tests/test.c b/tests/test.c
index 29c7d16069f9521787e0b75e73ca514f19cf9599..022e95da55b0a2d70f241bc6752779221fba0d01 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -85,6 +85,15 @@ main (int argc, char **argv)
        confi_add_key (confi, "folder/key2", "key2-2", NULL);
        confi_path_set_value (confi, "folder/key2/key2-2", "value for key2-2, programmatically setted");
 
+       ConfiKey *ck;
+       ck = confi_path_get_confi_key (confi, "folder/key2/key2-2");
+       g_printf ("ConfiKey for folder/key2/key2-2\n");
+       g_printf ("Path: %s\n", ck->path);
+       g_printf ("Key: %s\n", ck->key);
+       g_printf ("Description: %s\n", ck->description);
+       g_printf ("Value: %s\n", ck->value);
+       g_printf ("\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"));*/