g_string_free (gstr_cnc_string, TRUE);
g_strfreev (strs);
+ if (priv->name == NULL)
+ {
+ priv->name = g_strdup ("Default");
+ }
+
priv->gdaex = gdaex_new_from_string (priv->cnc_string);
priv->chrquot = gdaex_get_chr_quoting (priv->gdaex);
return node;
}
+static ConfiKey
+*confi_db_plugin_add_key (ConfiPluggable *pluggable, const gchar *parent, const gchar *key, const gchar *value)
+{
+ ConfiKey *ck;
+ GdaDataModel *dmParent;
+
+ gchar *sql;
+ gint id;
+ GdaDataModel *dm;
+
+ ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (pluggable);
+
+ gint id_parent;
+ gchar *parent_;
+ gchar *key_;
+
+ gchar *path;
+
+ ck = NULL;
+ if (parent == NULL)
+ {
+ id_parent = 0;
+ }
+ else
+ {
+ parent_ = g_strstrip (g_strdup (parent));
+ if (strcmp (parent_, "") == 0)
+ {
+ id_parent = 0;
+ }
+ else
+ {
+ dmParent = confi_db_plugin_path_get_data_model (pluggable, confi_path_normalize (pluggable, parent_));
+ if (dmParent == NULL)
+ {
+ id_parent = -1;
+ }
+ else
+ {
+ id_parent = gdaex_data_model_get_field_value_integer_at (dmParent, 0, "id");
+ }
+ }
+ }
+
+ if (id_parent > -1)
+ {
+ id = 0;
+
+ /* find new id */
+ sql = g_strdup_printf ("SELECT MAX(id) FROM %cvalues%c "
+ "WHERE id_configs = %d ",
+ priv->chrquot, priv->chrquot,
+ priv->id_config);
+ dm = gdaex_query (priv->gdaex, sql);
+ g_free (sql);
+ if (dm != NULL)
+ {
+ id = gdaex_data_model_get_value_integer_at (dm, 0, 0);
+ g_object_unref (dm);
+ }
+ id++;
+
+ key_ = g_strstrip (g_strdup (key));
+
+ sql = g_strdup_printf ("INSERT INTO %cvalues%c "
+ "(id_configs, id, id_parent, %ckey%c, value) "
+ "VALUES (%d, %d, %d, '%s', '%s')",
+ priv->chrquot, priv->chrquot,
+ priv->chrquot, priv->chrquot,
+ priv->id_config,
+ id,
+ id_parent,
+ gdaex_strescape (key_, NULL),
+ "");
+ if (gdaex_execute (priv->gdaex, sql) == -1)
+ {
+ /* TO DO */
+ g_free (sql);
+ return NULL;
+ }
+ g_free (sql);
+
+ ck = g_new0 (ConfiKey, 1);
+ ck->id_config = priv->id_config;
+ ck->id = id;
+ ck->id_parent = id_parent;
+ ck->key = g_strdup (key_);
+ ck->value = g_strdup ("");
+ ck->description = g_strdup ("");
+ if (id_parent == 0)
+ {
+ ck->path = g_strdup ("");
+ }
+ else
+ {
+ ck->path = g_strdup (parent_);
+ }
+
+ g_free (key_);
+ }
+ g_free (parent_);
+
+ if (ck != NULL)
+ {
+ if (ck->id_parent != 0)
+ {
+ path = g_strconcat (ck->path, "/", key, NULL);
+ }
+ else
+ {
+ path = g_strdup (ck->key);
+ }
+
+ if (!confi_db_plugin_path_set_value (pluggable, path, value))
+ {
+ ck = NULL;
+ }
+ else
+ {
+ ck->value = g_strdup (value);
+ }
+ g_free (path);
+ }
+
+ return ck;
+}
+
static void
confi_db_plugin_class_init (ConfiDBPluginClass *klass)
{
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;
+ iface->add_key = confi_db_plugin_add_key;
}
static void
libconfi_la_LDFLAGS = -no-undefined
-include_HEADERS = libconfi.h \
+include_HEADERS = commons.h \
+ libconfi.h \
confipluggable.h
libconfi_includedir = $(includedir)/libconfi
--- /dev/null
+/*
+ * Copyright (C) 2014 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.
+ */
+
+#ifndef __LIBCONFI_COMMONS_H__
+#define __LIBCONFI_COMMONS_H__
+
+#include <glib-object.h>
+
+
+G_BEGIN_DECLS
+
+
+#define CONFI_TYPE_CONFI (confi_confi_get_type ())
+
+GType confi_confi_get_type ();
+
+typedef struct _ConfiConfi ConfiConfi;
+struct _ConfiConfi
+ {
+ gchar *name;
+ gchar *description;
+ };
+
+ConfiConfi *confi_confi_copy (ConfiConfi *confi);
+void confi_confi_free (ConfiConfi *confi);
+
+#define CONFI_TYPE_KEY (confi_key_get_type ())
+
+GType confi_key_get_type ();
+
+typedef struct _ConfiKey ConfiKey;
+struct _ConfiKey
+ {
+ gint id_config;
+ gint id;
+ gint id_parent;
+ gchar *key;
+ gchar *value;
+ gchar *description;
+ gchar *path;
+ };
+
+ConfiKey *confi_key_copy (ConfiKey *key);
+void confi_key_free (ConfiKey *key);
+
+
+G_END_DECLS
+
+#endif /* __LIBCONFI_COMMONS_H__ */
}
/**
- * confi_get_tree:
+ * confi_pluggable_get_tree:
* @pluggable: a #ConfiPluggable object.
*
* Returns: a #GNode with the entire tree of configurations.
return iface->get_tree (pluggable);
}
+
+/**
+ * confi_pluggable_add_key:
+ * @pluggable: a #ConfiPluggable object.
+ * @parent: the path where add the key.
+ * @key: the key's name.
+ * @value: the key's value.
+ *
+ * Returns: a #ConfigKey struct filled with data from the key just added.
+ */
+ConfiKey
+*confi_pluggable_add_key (ConfiPluggable *pluggable, const gchar *parent, const gchar *key, const gchar *value)
+{
+ ConfiPluggableInterface *iface;
+
+ g_return_val_if_fail (CONFI_IS_PLUGGABLE (pluggable), FALSE);
+
+ iface = CONFI_PLUGGABLE_GET_IFACE (pluggable);
+ g_return_val_if_fail (iface->add_key != NULL, FALSE);
+
+ return iface->add_key (pluggable, parent, key, value);
+}
#include <glib-object.h>
+#include "commons.h"
+
G_BEGIN_DECLS
/*
const gchar *path,
const gchar *value);
GNode *(*get_tree) (ConfiPluggable *pluggable);
+ ConfiKey *(*add_key) (ConfiPluggable *pluggable, const gchar *parent, const gchar *key, const gchar *value);
};
/*
*/
GType confi_pluggable_get_type (void) G_GNUC_CONST;
-gboolean confi_pluggable_initialize (ConfiPluggable *pluggable, const gchar *cnc_string);
+gboolean confi_pluggable_initialize (ConfiPluggable *pluggable,
+ const gchar *cnc_string);
GList *confi_pluggable_get_configs_list (ConfiPluggable *pluggable,
const gchar *filter);
-gchar *confi_pluggable_path_get_value (ConfiPluggable *pluggable, const gchar *path);
+gchar *confi_pluggable_path_get_value (ConfiPluggable *pluggable,
+ const gchar *path);
gboolean confi_pluggable_path_set_value (ConfiPluggable *pluggable,
const gchar *path,
const gchar *value);
GNode *confi_pluggable_get_tree (ConfiPluggable *pluggable);
+ConfiKey *confi_pluggable_add_key (ConfiPluggable *pluggable,
+ const gchar *parent,
+ const gchar *key,
+ const gchar *value);
G_END_DECLS
* @confi: a #Confi object.
* @parent: the path where add the key.
* @key: the key's name.
+ * @value: the key's value.
*
* Returns: a #ConfigKey struct filled with data from the key just added.
*/
ConfiKey
-*confi_add_key (Confi *confi, const gchar *parent, const gchar *key)
+*confi_add_key (Confi *confi, const gchar *parent, const gchar *key, const gchar *value)
{
- ConfiKey *ck = NULL;
- GdaDataModel *dmParent;
+ ConfiKey *ck;
ConfiPrivate *priv = CONFI_GET_PRIVATE (confi);
- gint id_parent;
- gchar *parent_;
- gchar *key_;
-
- if (parent == NULL)
+ if (priv->pluggable == NULL)
{
- id_parent = 0;
+ g_warning ("Not initialized.");
+ ck = NULL;
}
else
{
- parent_ = g_strstrip (g_strdup (parent));
- if (strcmp (parent_, "") == 0)
- {
- id_parent = 0;
- }
- else
- {
- //dmParent = path_get_data_model (confi, path_normalize (confi, parent_));
- if (dmParent == NULL)
- {
- id_parent = -1;
- }
- else
- {
- id_parent = gdaex_data_model_get_field_value_integer_at (dmParent, 0, "id");
- }
- }
- }
-
- if (id_parent > -1)
- {
- gchar *sql;
- gint id = 0;
- GdaDataModel *dm;
-
- /* find new id */
- sql = g_strdup_printf ("SELECT MAX(id) FROM %cvalues%c "
- "WHERE id_configs = %d ",
- priv->chrquot, priv->chrquot,
- priv->id_config);
- dm = gdaex_query (priv->gdaex, sql);
- if (dm != NULL)
- {
- id = gdaex_data_model_get_value_integer_at (dm, 0, 0);
- g_object_unref (dm);
- }
- id++;
-
- key_ = g_strstrip (g_strdup (key));
-
- sql = g_strdup_printf ("INSERT INTO %cvalues%c "
- "(id_configs, id, id_parent, %ckey%c, value) "
- "VALUES (%d, %d, %d, '%s', '%s')",
- priv->chrquot, priv->chrquot,
- priv->chrquot, priv->chrquot,
- priv->id_config,
- id,
- id_parent,
- gdaex_strescape (key_, NULL),
- "");
- if (gdaex_execute (priv->gdaex, sql) == -1)
- {
- /* TO DO */
- return NULL;
- }
-
- ck = g_new0 (ConfiKey, 1);
- ck->id_config = priv->id_config;
- ck->id = id;
- ck->id_parent = id_parent;
- ck->key = g_strdup (key_);
- ck->value = g_strdup ("");
- ck->description = g_strdup ("");
- if (id_parent == 0)
- {
- ck->path = g_strdup ("");
- }
- else
- {
- ck->path = g_strdup (parent_);
- }
-
- g_free (key_);
- }
- g_free (parent_);
-
- return ck;
-}
-
-/**
- * confi_add_key_with_value:
- * @confi: a #Confi object.
- * @parent: the path where add the key.
- * @key: the key's name.
- * @value: the key's value.
- *
- * Returns: a #ConfigKey struct filled with data from the key just added.
- */
-ConfiKey
-*confi_add_key_with_value (Confi *confi, const gchar *parent, const gchar *key, const gchar *value)
-{
- gchar *path;
-
- ConfiKey *ck = confi_add_key (confi, parent, key);
-
- if (ck != NULL)
- {
- if (ck->id_parent != 0)
- {
- path = g_strconcat (ck->path, "/", key, NULL);
- }
- else
- {
- path = g_strdup (ck->key);
- }
-
- if (!confi_path_set_value (confi, path, value))
- {
- ck = NULL;
- }
- else
- {
- ck->value = g_strdup (value);
- }
- g_free (path);
+ ck = confi_pluggable_add_key (priv->pluggable, parent, key, value);
}
return ck;
#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
+#include "commons.h"
#include "confipluggable.h"
-#define CONFI_TYPE_CONFI (confi_confi_get_type ())
-
-GType confi_confi_get_type ();
-
-typedef struct _ConfiConfi ConfiConfi;
-struct _ConfiConfi
- {
- gchar *name;
- gchar *description;
- };
-
-ConfiConfi *confi_confi_copy (ConfiConfi *confi);
-void confi_confi_free (ConfiConfi *confi);
-
-#define CONFI_TYPE_KEY (confi_key_get_type ())
-
-GType confi_key_get_type ();
-
-typedef struct _ConfiKey ConfiKey;
-struct _ConfiKey
- {
- gint id_config;
- gint id;
- gint id_parent;
- gchar *key;
- gchar *value;
- gchar *description;
- gchar *path;
- };
-
-ConfiKey *confi_key_copy (ConfiKey *key);
-void confi_key_free (ConfiKey *key);
+G_BEGIN_DECLS
#define TYPE_CONFI (confi_get_type ())
ConfiKey *confi_add_key (Confi *confi,
const gchar *parent,
- const gchar *key);
-ConfiKey *confi_add_key_with_value (Confi *confi,
- const gchar *parent,
- const gchar *key,
- const gchar *value);
+ const gchar *key,
+ const gchar *value);
gboolean confi_key_set_key (Confi *confi,
ConfiKey *ck);
g_node_traverse (tree, G_PRE_ORDER, G_TRAVERSE_ALL, -1, traverse_func, NULL);
g_printf ("\n");
+ confi_add_key (confi, "folder/key2", "key2-2", NULL);
+ confi_path_set_value (confi, "folder/key2/key2-2", "value for key2-2, programmatically setted");
+
/*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"));*/
projects / zakconfi / libzakconfi / commitdiff