experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

JSON: Fix JSON formatting in the presence of namespaces.

Browse source 
- Fix array_eval() to allow sequential nodes that do not have
  namepace nodes set as well as those that do.

- Fix comma placement in an array list where it was being dropped
  between penultimate and last array elements.

Signed-off-by: Jon Loeliger <jdl@netgate.com>
This commit is contained in:
Jon Loeliger 2019-01-14 13:32:16 -06:00
parent 795240368e
commit 15cb2385d4
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/src/clixon_json.c
View file

@ -190,14 +190,16 @@ array_eval(cxobj *xprev,
xml_type(xnext)==CX_ELMNT &&
strcmp(xml_name(x),xml_name(xnext))==0){
ns2 = xml_find_type_value(xnext, NULL, "xmlns", CX_ATTR);
if (nsx && ns2 && strcmp(nsx,ns2)==0)
if ((!nsx && !ns2)
|| (nsx && ns2 && strcmp(nsx,ns2)==0))
eqnext++;
}
if (xprev &&
xml_type(xprev)==CX_ELMNT &&
strcmp(xml_name(x),xml_name(xprev))==0){
ns2 = xml_find_type_value(xprev, NULL, "xmlns", CX_ATTR);
if (nsx && ns2 && strcmp(nsx,ns2)==0)
if ((!nsx && !ns2)
|| (nsx && ns2 && strcmp(nsx,ns2)==0))
eqprev++;
}
if (eqprev && eqnext)
@ -432,6 +434,8 @@ xml2json1_cbuf(cbuf *cb,
break;
}
int na = xml_child_nr_notype(x, CX_ATTR);
int commas = na - 1;
for (i=0; i<xml_child_nr(x); i++){
xc = xml_child_i(x, i);
if (xml_type(xc) == CX_ATTR)
@ -444,8 +448,10 @@ xml2json1_cbuf(cbuf *cb,
xc_arraytype,
level+1, pretty, 0, bodystr0) < 0)
goto done;
if (i<xml_child_nr_notype(x, CX_ATTR)-1)
if (commas > 0) {
cprintf(cb, ",%s", pretty?"\n":"");
--commas;
}
}
switch (arraytype){
case BODY_ARRAY: