Added functions Json:to_hashtable*.

diff --git a/configure.ac b/configure.ac
index 64172d8662978102cfe3a75281116632408ac1d6..1d20e93697dc93aa0faeed0bb35fce6ab72b8626 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,8 @@ PKG_CHECK_MODULES(ZAKUTILSJX, [glib-2.0 >= 2.36
                                gobject-2.0 >= 2.36
                                gio-2.0 >= 2.36
                                json-glib-1.0
-                               libxml-2.0])
+                               libxml-2.0
+                               libzakutils])
 
 AC_SUBST(ZAKUTILSJX_CFLAGS)
 AC_SUBST(ZAKUTILSJX_LIBS)

diff --git a/src/json.c b/src/json.c
index c681b78dc91b073c7b46e627a32af85b627fc003..4678d0c7f4fbdf7444555a00ff3322afc71f7e75 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -20,6 +20,8 @@
        #include <config.h>
 #endif
 
+#include <libzakutils/libzakutils.h>
+
 #include "json.h"
 
 JsonNode
@@ -163,3 +165,64 @@ zak_utils_json_to_xml (JsonReader *reader, xmlNode *xnode)
                        g_strfreev (members);
                }
 }
+
+static GHashTable
+*_zak_utils_json_to_hashtable (JsonNode *jnode, gboolean gvalue)
+{
+       GHashTable *ret;
+
+       JsonObject *obj;
+       GList *membs;
+
+       const gchar *value;
+       GValue *gval;
+
+       if (jnode != NULL
+           && JSON_NODE_HOLDS_OBJECT (jnode))
+               {
+                       ret = g_hash_table_new (g_str_hash, g_str_equal);
+
+                       obj = json_node_get_object (jnode);
+                       membs = json_object_get_members (obj);
+
+                       while (membs)
+                               {
+                                       if (gvalue)
+                                               {
+                                                       gval = zak_utils_gvalue_new_string (json_object_get_string_member (obj, (gchar *)membs->data));
+                                                       g_hash_table_insert (ret,
+                                                                            g_strdup ((gchar *)membs->data),
+                                                                            gval);
+                                               }
+                                       else
+                                               {
+                                                       value = json_object_get_string_member (obj, (gchar *)membs->data);
+                                                       g_hash_table_insert (ret,
+                                                                            g_strdup ((gchar *)membs->data),
+                                                                            g_strdup (value));
+                                               }
+
+                                       membs = g_list_next (membs);
+                               }
+
+                       g_list_free (membs);
+               }
+       else
+               {
+                       ret = NULL;
+               }
+
+       return ret;
+}
+
+GHashTable
+*zak_utils_json_to_hashtable (JsonNode *jnode)
+{
+       return _zak_utils_json_to_hashtable (jnode, FALSE);
+}
+
+GHashTable
+*zak_utils_json_to_hashtable_gvalue (JsonNode *jnode)
+{
+       return _zak_utils_json_to_hashtable (jnode, TRUE);
+}

diff --git a/src/json.h b/src/json.h
index 2c5cefa0ca1ec676fd4f382c1d28272632148e77..5eb69866a80ab620a789365c42afbf0ccfa97b6c 100644 (file)
--- a/src/json.h
+++ b/src/json.h
@@ -46,6 +46,9 @@ void zak_utils_json_set_boolean (JsonBuilder *builder, const gchar *name, gboole
 
 void zak_utils_json_to_xml (JsonReader *reader, xmlNode *xnode);
 
+GHashTable *zak_utils_json_to_hashtable (JsonNode *jnode);
+GHashTable *zak_utils_json_to_hashtable_gvalue (JsonNode *jnode);
+
 
 G_END_DECLS