commit c6704c852b07d97473a777afed3310aee5a58e15
author Radek Krejci <rkrejci@cesnet.cz> Tue Oct 06 11:12:45 2015 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Tue Oct 06 11:12:45 2015 +0200
tree 42e52d4997b969113cc5fd141cad5c82b14416d4
parent fbb7a6dbac1fde1da4044bc3a90c7dc36a9649a7

xml FEATURE provide public API to a simple XML parser

Allow caller to build XML trees on its own and traverse the XML tree.
Function to manipulate with the tree are not provided.

Data tree parser was extended to accept XML tree besides the XML as
string. Also XML dumper was extended to accept option to print only
a specific part of the element (opening/closing tag, attributes).

This way a NETCONF app will be able to handle RPCs, Notifications,
hello messages which are not described in a YANG schema.

src/xml.c

diff --git a/src/xml.c b/src/xml.c
index cdebddf..65bb3b4 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -30,7 +30,7 @@
 #include "common.h"
 #include "dict.h"
 #include "tree_schema.h"
-#include "xml.h"
+#include "xml_private.h"
 
 #ifndef NDEBUG
 unsigned int lineno, lws_lineno;
@@ -377,7 +377,7 @@
     free(elem);
 }
 
-void
+API void
 lyxml_free_elem(struct ly_ctx *ctx, struct lyxml_elem *elem)
 {
     if (!elem) {
@@ -1112,7 +1112,7 @@
 }
 
 /* logs directly */
-struct lyxml_elem *
+API struct lyxml_elem *
 lyxml_read(struct ly_ctx *ctx, const char *data, int UNUSED(options))
 {
     const char *c = data;
@@ -1176,7 +1176,7 @@
     return root;
 }
 
-struct lyxml_elem *
+API struct lyxml_elem *
 lyxml_read_fd(struct ly_ctx *ctx, int fd, int UNUSED(options))
 {
     if (fd == -1 || !ctx) {
@@ -1188,7 +1188,7 @@
     return NULL;
 }
 
-struct lyxml_elem *
+API struct lyxml_elem *
 lyxml_read_file(struct ly_ctx *ctx, const char *filename, int UNUSED(options))
 {
     if (!filename || !ctx) {
@@ -1227,7 +1227,7 @@
 }
 
 static int
-dump_elem(FILE * f, struct lyxml_elem *e, int level)
+dump_elem(FILE * f, struct lyxml_elem *e, int level, int options)
 {
     int size = 0;
     struct lyxml_attr *a;
@@ -1254,11 +1254,16 @@
         indent = 0;
     }
 
-    /* opening tag */
-    if (e->ns && e->ns->prefix) {
-        size += fprintf(f, "%*s<%s:%s", indent, "", e->ns->prefix, e->name);
-    } else {
-        size += fprintf(f, "%*s<%s", indent, "", e->name);
+    if (!options || (options & LYXML_DUMP_OPEN)) {
+        /* opening tag */
+        if (e->ns && e->ns->prefix) {
+            size += fprintf(f, "%*s<%s:%s", indent, "", e->ns->prefix, e->name);
+        } else {
+            size += fprintf(f, "%*s<%s", indent, "", e->name);
+        }
+    } else if (options & LYXML_DUMP_CLOSE) {
+        indent = 0;
+        goto close;
     }
 
     /* attributes */
@@ -1276,6 +1281,17 @@
         }
     }
 
+    /* apply options */
+    if (options == (LYXML_DUMP_OPEN | LYXML_DUMP_CLOSE)) {
+        size += fprintf(f, "/>%s", delim);
+        return size;
+    } else if (options & LYXML_DUMP_OPEN) {
+        fputc('>', f);
+        return ++size;
+    } else if (options & LYXML_DUMP_ATTRS) {
+        return size;
+    }
+
     if (!e->child && !e->content) {
         size += fprintf(f, "/>%s", delim);
         return size;
@@ -1297,9 +1313,10 @@
 
     /* go recursively */
     LY_TREE_FOR(e->child, child) {
-        size += dump_elem(f, child, level + 1);
+        size += dump_elem(f, child, level + 1, 0);
     }
 
+close:
     /* closing tag */
     if (e->ns && e->ns->prefix) {
         size += fprintf(f, "%*s</%s:%s>%s", indent, "", e->ns->prefix, e->name, delim_outer);
@@ -1310,12 +1327,12 @@
     return size;
 }
 
-int
-lyxml_dump(FILE * stream, struct lyxml_elem *elem, int UNUSED(options))
+API int
+lyxml_dump(FILE * stream, struct lyxml_elem *elem, int options)
 {
     if (!elem) {
         return 0;
     }
 
-    return dump_elem(stream, elem, 0);
+    return dump_elem(stream, elem, 0, options);
 }