From: Andrea Zagli Date: Thu, 23 Jul 2020 07:13:13 +0000 (+0200) Subject: Started function Json::to_xml. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=685ee7e0f7cc3d629935720d75babdac3420f8a1;p=libzakutilsjsonxml Started function Json::to_xml. --- diff --git a/.gitignore b/.gitignore index 8ac6233..2a8ef05 100644 --- a/.gitignore +++ b/.gitignore @@ -50,7 +50,7 @@ intltool-* Rules-quot *.exe *.csv -examples/format_money +examples/to_xml build/ test-driver tests/generic diff --git a/examples/Makefile.am b/examples/Makefile.am index 5dcf5a0..e617039 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ - $(ZAKUTILS_CFLAGS) \ + $(ZAKUTILSJX_CFLAGS) \ -I$(top_srcdir)/src LIBS = $(ZAKUTILSJX_LIBS) \ @@ -8,4 +8,5 @@ LIBS = $(ZAKUTILSJX_LIBS) \ LDADD = $(top_builddir)/src/libzakutilsjsonxml.la -noinst_PROGRAMS = +noinst_PROGRAMS = \ + to_xml diff --git a/examples/sample.json b/examples/sample.json new file mode 100644 index 0000000..fd4348f --- /dev/null +++ b/examples/sample.json @@ -0,0 +1,5 @@ +{ + "obj1": "value1", + "obj2": "value2", + "obj3": "value3" +} diff --git a/examples/to_xml.c b/examples/to_xml.c new file mode 100644 index 0000000..aba1c85 --- /dev/null +++ b/examples/to_xml.c @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2020 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "json.h" +#include "xml.h" + +int +main (int argc, char *argv[]) +{ + GError *error; + JsonParser *parser; + JsonReader *reader; + + xmlDoc *xdoc; + xmlNode *xroot; + + xmlChar *buf; + + if (argc > 1) + { + parser = json_parser_new (); + + error = NULL; + if (!json_parser_load_from_file (parser, argv[1], &error) + || error != NULL) + { + g_warning ("Unable to parse json file «%s»: %s", + error != NULL && error->message != NULL ? error->message : "no details"); + } + else + { + reader = json_reader_new (json_parser_get_root (parser)); + g_warning ("is array %d is object %d", + json_reader_is_array (reader), + json_reader_is_object (reader)); + g_warning ("elements %d members %d", + json_reader_count_elements (reader), + json_reader_count_members (reader)); + g_object_unref (reader); + + reader = json_reader_new (json_parser_get_root (parser)); + + xdoc = xmlNewDoc ("1.0"); + xroot = xmlNewNode (NULL, "objects"); + xmlDocSetRootElement (xdoc, xroot); + + zak_utils_json_to_xml (reader, xroot); + + xmlDocDumpMemory (xdoc, &buf, NULL); + + g_printf ("%s", buf); + + xmlFreeDoc (xdoc); + } + } + + return 0; +} diff --git a/libzakutilsjsonxml.pc.in b/libzakutilsjsonxml.pc.in index 3ad8863..cc67e85 100644 --- a/libzakutilsjsonxml.pc.in +++ b/libzakutilsjsonxml.pc.in @@ -2,11 +2,10 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -modulesdir=@libdir@/@PACKAGE@/modules Name: @PACKAGE_NAME@ Description: Utility functions for json and xml. Version: @PACKAGE_VERSION@ Requires: glib-2.0 >= 2.36 gobject-2.0 >= 2.36 gio-2.0 >= 2.36 json-glib-2.0 libxml-2.0 -Libs: -L${libdir} -lm -lzakutilsjsonxml +Libs: -L${libdir} -lzakutilsjsonxml Cflags: -I${includedir} diff --git a/src/Makefile.am b/src/Makefile.am index d0fc6b8..6c09a3e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,12 +7,14 @@ AM_CPPFLAGS = $(ZAKUTILSJX_CFLAGS) \ lib_LTLIBRARIES = libzakutilsjsonxml.la libzakutilsjsonxml_la_SOURCES = \ - json.c + json.c \ + xml.c libzakutilsjsonxml_la_LDFLAGS = -no-undefined libzakutilsjsonxml_include_HEADERS = \ libzakutilsjsonxml.h \ - json.h + json.h \ + xml.h libzakutilsjsonxml_includedir = $(includedir)/libzakutilsjsonxml diff --git a/src/json.c b/src/json.c index 3c0e380..8d0b4fd 100644 --- a/src/json.c +++ b/src/json.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Zagli + * Copyright (C) 2020 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -97,3 +97,22 @@ zak_utils_json_set_boolean (JsonBuilder *builder, const gchar *name, gboolean va json_builder_set_member_name (builder, name); json_builder_add_boolean_value (builder, value); } + +void +zak_utils_json_to_xml (JsonReader *reader, xmlNode *xnode) +{ + guint l; + guint i; + gchar **members; + + if (json_reader_is_object (reader)) + { + l = json_reader_count_members (reader); + members = json_reader_list_members (reader); + for (i = 0; i < l; i++) + { + xmlNewTextChild (xnode, NULL, (const xmlChar *)members[i], (const xmlChar *)zak_utils_json_get_string (reader, members[i])); + } + g_strfreev (members); + } +} diff --git a/src/json.h b/src/json.h index 4aa1a1b..bb33f3b 100644 --- a/src/json.h +++ b/src/json.h @@ -25,6 +25,8 @@ #include #include +#include "xml.h" + G_BEGIN_DECLS @@ -39,6 +41,8 @@ void zak_utils_json_set_double (JsonBuilder *builder, const gchar *name, gdouble void zak_utils_json_set_string (JsonBuilder *builder, const gchar *name, const gchar *value); void zak_utils_json_set_boolean (JsonBuilder *builder, const gchar *name, gboolean value); +void zak_utils_json_to_xml (JsonReader *reader, xmlNode *xnode); + G_END_DECLS diff --git a/src/libzakutilsjsonxml.h b/src/libzakutilsjsonxml.h index 83094b1..503c02b 100644 --- a/src/libzakutilsjsonxml.h +++ b/src/libzakutilsjsonxml.h @@ -21,6 +21,7 @@ #include +#include #endif /* __LIBZAKUTILSJSONXML_H__ */ diff --git a/src/xml.c b/src/xml.c new file mode 100644 index 0000000..9af3cc7 --- /dev/null +++ b/src/xml.c @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2020 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include "xml.h" diff --git a/src/xml.h b/src/xml.h new file mode 100644 index 0000000..2b51e07 --- /dev/null +++ b/src/xml.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2020 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __ZAK_UTILS_XML_H__ +#define __ZAK_UTILS_XML_H__ + + +#include +#include +#include +#include + + +G_BEGIN_DECLS + + + + +G_END_DECLS + + +#endif /* __ZAK_UTILS_XML_H__ */