Added tests add_config_from_confi and get_tree.
Some adjustments.
*.exe
tests/test
tests/test_get_configs_list
+tests/test_get_tree
tests/test_add_config
+tests/test_add_config_from_confi
tests/test_set_config
*.csv
gtk-doc.m4
}
id_parent = gdaex_data_model_get_field_value_integer_at (dm, 0, "id");
}
+ g_free (token);
i++;
}
+ g_strfreev (tokens);
return dm;
}
sql = g_strdup_printf ("SELECT id"
" FROM %cvalues%c"
" WHERE id_configs = %d"
+ " AND id_parent = %d"
" AND key = '%s'",
priv->chrquot, priv->chrquot,
priv->id_config,
+ id_parent,
gdaex_strescape (key_, NULL));
dm = gdaex_query (priv->gdaex, sql);
g_free (sql);
- if (dm != NULL && gda_data_model_get_n_rows (dm) > 0)
- {
- id = gdaex_data_model_get_value_integer_at (dm, 0, 0);
- g_object_unref (dm);
-
- sql = g_strdup_printf ("UPDATE %cvalues%c"
- " SET %ckey%c = '%s',"
- " value = '%s',"
- " WHERE id_configs = %d"
- " AND id = %d",
- priv->chrquot, priv->chrquot,
- priv->chrquot, priv->chrquot,
- gdaex_strescape (key_, NULL),
- gdaex_strescape (ck->value, NULL),
- priv->id_config,
- id);
- if (gdaex_execute (priv->gdaex, sql) == -1)
- {
- /* TO DO */
- g_free (sql);
- return NULL;
- }
- g_free (sql);
- }
- else
+ if (dm == NULL
+ || gda_data_model_get_n_rows (dm) < 1)
{
id = 0;
* @name:
* @description:
*
- * Returns: a #ZakConfiConfi struct.
+ * Returns: a #ZakConfiConfi struct just rceated.
*/
ZakConfiConfi
*zak_confi_add_config (const gchar *cnc_string,
return cc;
}
+static gboolean
+add_traverse_func (GNode *node,
+ gpointer data)
+{
+ ZakConfiKey *ck = (ZakConfiKey *)node->data;
+
+ if (g_strcmp0 (ck->key, "") != 0
+ && g_strcmp0 (ck->key, "/") != 0)
+ {
+ zak_confi_add_key ((ZakConfi *)data, ck->path, ck->key, ck->value);
+ }
+
+ return FALSE;
+}
+
+/**
+ * zak_confi_add_config_from_confi:
+ * @confi_source:
+ * @cnc_string:
+ * @name_new:
+ * @description_new:
+ *
+ * Returns: a #ZakConfiConfi struct just created.
+ */
+ZakConfiConfi
+*zak_confi_add_config_from_confi (ZakConfi *confi_source,
+ const gchar *cnc_string,
+ const gchar *name_new,
+ const gchar *description_new)
+{
+ ZakConfi *confi;
+ ZakConfiConfi *cc;
+
+ GNode *tree;
+
+ gchar *confi_name;
+
+ cc = zak_confi_add_config (cnc_string, name_new, description_new);
+ if (cc != NULL)
+ {
+ tree = zak_confi_get_tree (confi_source);
+ if (tree != NULL)
+ {
+ confi_name = g_strdup_printf ("%s;CONFI_NAME=%s", cnc_string, cc->name);
+
+ confi = zak_confi_new (confi_name);
+
+ if (confi != NULL)
+ {
+ g_node_traverse (tree, G_PRE_ORDER, G_TRAVERSE_ALL, -1, add_traverse_func, (gpointer)confi);
+ }
+
+ g_free (confi_name);
+ }
+ else
+ {
+ g_warning ("ZakConfi source is empty.");
+ }
+ }
+
+ return cc;
+}
+
/**
* zak_confi_get_tree:
* @confi: a #ZakConfi object.
const gchar *name,
const gchar *description);
+ZakConfiConfi *zak_confi_add_config_from_confi (ZakConfi *confi_source,
+ const gchar *cnc_string,
+ const gchar *name_new,
+ const gchar *description_new);
+
GNode *zak_confi_get_tree (ZakConfi *confi);
gchar *zak_confi_normalize_root (const gchar *root);
AM_CPPFLAGS = $(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(LIBCONFI_CFLAGS) \
- -I$(top_srcdir)/src
+ -I$(top_srcdir)/src \
+ -DPLUGINSDIR=\""$(libdir)/$(PACKAGE)/plugins"\"
LIBS = $(LIBCONFI_LIBS) \
-L../src -lzakconfi \
noinst_PROGRAMS = test \
test_add_config \
+ test_add_config_from_confi \
test_get_configs_list \
+ test_get_tree \
test_set_config
EXTRA_DIST = gir.py
--- /dev/null
+/*
+ * Copyright (C) 2016 Andrea Zagli <azagli@libero.it>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <glib/gprintf.h>
+#include <libpeas/peas.h>
+
+#include "libzakconfi.h"
+
+int
+main (int argc, char **argv)
+{
+ PeasEngine *engine;
+
+ ZakConfi *confi;
+
+ if (argc < 5)
+ {
+ g_error ("Usage: test_add_config <connection string source> <connection string destination> <config name> <config description>");
+ return 0;
+ }
+
+ engine = peas_engine_get_default ();
+ peas_engine_add_search_path (engine, PLUGINSDIR, NULL);
+
+ confi = zak_confi_new (argv[1]);
+
+ if (zak_confi_add_config_from_confi (confi, argv[2], argv[3], argv[4]) == NULL)
+ {
+ g_warning ("Config %s not created.", argv[2]);
+ }
+
+ return 0;
+}
--- /dev/null
+/*
+ * Copyright (C) 2016 Andrea Zagli <azagli@libero.it>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <glib/gprintf.h>
+#include <libpeas/peas.h>
+
+#include "libzakconfi.h"
+
+gboolean
+traverse_func (GNode *node,
+ gpointer data)
+{
+ ZakConfiKey *ck = (ZakConfiKey *)node->data;
+ g_printf ("%s%s%s => %s\n", ck->path, g_strcmp0 (ck->path, "") == 0 ? "" : "/", ck->key, ck->value);
+
+ return FALSE;
+}
+
+int
+main (int argc, char **argv)
+{
+ PeasEngine *engine;
+ ZakConfi *confi;
+ PeasPluginInfo *ppinfo;
+ GNode *tree;
+
+ if (argc < 2)
+ {
+ g_error ("Usage: test <connection string>");
+ return 0;
+ }
+
+ engine = peas_engine_get_default ();
+ peas_engine_add_search_path (engine, PLUGINSDIR, NULL);
+
+ confi = zak_confi_new (argv[1]);
+ if (confi == NULL)
+ {
+ g_error ("Error on configuration initialization.");
+ return 0;
+ }
+
+ ppinfo = zak_confi_get_plugin_info (confi);
+ g_printf ("Plugin info\n");
+ g_printf ("Name: %s\n", peas_plugin_info_get_name (ppinfo));
+ g_printf ("Module dir: %s\n", peas_plugin_info_get_module_dir (ppinfo));
+ g_printf ("Module name: %s\n", peas_plugin_info_get_module_name (ppinfo));
+ g_printf ("\n");
+
+ g_printf ("Traversing the entire tree\n");
+ tree = zak_confi_get_tree (confi);
+ g_node_traverse (tree, G_PRE_ORDER, G_TRAVERSE_ALL, -1, traverse_func, NULL);
+ g_printf ("\n");
+
+ zak_confi_destroy (confi);
+
+ return 0;
+}
projects / zakconfi / libzakconfi / commitdiff