Adjustments.

diff --git a/data/confi.sql b/data/confi.sql
index fa47c75e46e0aa73ba709f88da15682e60acdef2..a774adfcef60a66fbc4b58bf1addbe194268ba05 100644 (file)
--- a/data/confi.sql
+++ b/data/confi.sql
@@ -9,7 +9,7 @@ CREATE TABLE configs (
 CREATE TABLE "values" (
     id_configs integer NOT NULL,
     id integer NOT NULL,
-    id_parent integer,
+    id_parent integer DEFAULT 0,
     "key" varchar(50) DEFAULT '',
     value text DEFAULT '',
     description varchar(255) DEFAULT '',

diff --git a/docs/reference/libconfi-undocumented.txt b/docs/reference/libconfi-undocumented.txt
deleted file mode 100644 (file)
index e8ffb3e..0000000
--- a/docs/reference/libconfi-undocumented.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-38% symbol docs coverage.
-8 symbols documented.
-2 symbols incomplete.
-13 not documented.
-
-
-Confi
-confi_add_key
-confi_add_key_with_value
-confi_get_configs_list
-confi_get_tree
-confi_get_type
-confi_key_set_key
-confi_new
-confi_path_get_value
-confi_path_move
-confi_path_set_value
-confi_remove (Returns)
-confi_remove_path (Returns)
-confi_set_root
-
-
-libconfi:Short_Description

diff --git a/libconfi.pc.in b/libconfi.pc.in
index eefd6987e4abb230bb3d12094e6f29282e4fa048..d6b1440eed9b40451e7d34973527352090b9e5e5 100644 (file)
--- a/libconfi.pc.in
+++ b/libconfi.pc.in
@@ -4,8 +4,8 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: @PACKAGE_NAME@
-Description: Library to manage configuration with libgdaobj
+Description: Library to manage configurations with libgdaex
 Version: @PACKAGE_VERSION@
-Requires: glib-2.0, libgdaobj
+Requires: libgdaex
 Libs: -L${libdir} -lconfi
 Cflags: -I${includedir}

diff --git a/tests/test.c b/tests/test.c
index dabc7bd5d0ac8b8b62fc97d05a90365de4b711bd..1ec003a0b6ecaf264461089f13e85a3fd227dbc8 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -16,7 +16,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <libgdaex/libgdaex.h>
 #include <libconfi.h>
 
 gboolean
@@ -26,7 +25,7 @@ traverse_func (GNode *node,
        ConfiKey *ck = (ConfiKey *)node->data;
        if (ck->id != 0)
                {
-                       g_error ("%s%s%s\n", ck->path, strcmp (ck->path, "") == 0 ? "" : "/", ck->key);
+                       g_printf ("%s%s%s\n", ck->path, strcmp (ck->path, "") == 0 ? "" : "/", ck->key);
                }
 
        return FALSE;
@@ -40,23 +39,29 @@ main (int argc, char **argv)
 
        gda_init ();
 
-       confi = confi_new ("PostgreSQL://HOSTADDR=127.0.0.1;PORT=5432;DATABASE=confi;HOST=localhost;USER=postgres", "Default", NULL, FALSE);
+       if (argc < 2)
+               {
+                       g_error ("Usage: test <connection string>");
+                       return 0;
+               }
+
+       confi = confi_new (argv[1], "Default", NULL, FALSE);
        if (confi == NULL)
                {
-                       g_error ("Errore nell'inizializzazione della configurazione\n");
+                       g_error ("Error on configuration initialization.");
                        return 0;
                }
 
-       g_error ("Value from key \"folder/key1/key1_2\"\n%s\n\n", confi_path_get_value (confi, "folder/key1/key1_2"));
+       g_printf ("Value from key \"folder/key1/key1_2\"\n%s\n\n", confi_path_get_value (confi, "folder/key1/key1_2"));
 
-       g_error ("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_error ("\n");
+       g_printf ("\n");
 
-       g_error ("Setting root \"key2\"\n");
+       g_printf ("Setting root \"key2\"\n");
        confi_set_root (confi, "key2");
-       g_error ("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);
 

diff --git a/tests/test.sql b/tests/test.sql
new file mode 100644 (file)
index 0000000..d6bdd41
--- /dev/null
+++ b/tests/test.sql
@@ -0,0 +1,8 @@
+INSERT INTO configs (id, name, description) VALUES (1, 'Default', '');
+
+INSERT INTO "values" (id_configs, id, id_parent, key, value, description) VALUES (1, 1, 0, 'folder', '', '');
+INSERT INTO "values" (id_configs, id, id_parent, key, value, description) VALUES (1, 2, 1, 'key1', 'value key 1', '');
+INSERT INTO "values" (id_configs, id, id_parent, key, value, description) VALUES (1, 3, 2, 'key1_2', 'value key 1 2', '');
+INSERT INTO "values" (id_configs, id, id_parent, key, value, description) VALUES (1, 4, 1, 'key2', 'value key 2', '');
+INSERT INTO "values" (id_configs, id, id_parent, key, value, description) VALUES (1, 6, 2, 'key1_1', 'value key 1 1', '');
+INSERT INTO "values" (id_configs, id, id_parent, key, value, description) VALUES (1, 5, 4, 'key2-1', 'value key 2 1', '');