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

* [JSON leaf-list output single element leaf-list does not use array](https://github.com/clicon/clixon/issues/289)

Browse source
This commit is contained in:
Olof hagsand 2021-11-29 13:43:10 +01:00
parent 339b744835
commit f4b35cb270
5 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/src/clixon_json.c
View file

@ -231,11 +231,7 @@ array_eval(cxobj *xprev,
else if (eqnext)
arraytype = FIRST_ARRAY;
else if ((ys = xml_spec(x)) != NULL) {
if (yang_keyword_get(ys) == Y_LIST
#if 0 /* XXX instead see special case in xml2json_encode_leafs */
|| yang_keyword_get(ys) == Y_LEAF_LIST
#endif
)
if (yang_keyword_get(ys) == Y_LIST || yang_keyword_get(ys) == Y_LEAF_LIST)
arraytype = SINGLE_ARRAY;
else
arraytype = NO_ARRAY;
@ -601,12 +597,6 @@ xml2json_encode_leafs(cxobj *xb,
case CGV_UINT64:
case CGV_DEC64:
case CGV_BOOL:
#if 1 /* Special case */
if (yang_keyword_get(yp) == Y_LEAF_LIST
&& xml_child_nr_type(xml_parent(xp), CX_ELMNT) == 1)
cprintf(cb, "[%s]", body);
else
#endif
cprintf(cb, "%s", body);
quote = 0;
break;
@ -614,7 +604,12 @@ xml2json_encode_leafs(cxobj *xb,
/* special case YANG empty type */
if (body == NULL && strcmp(restype, "empty")==0){
quote = 0;
cprintf(cb, "[null]");
if (keyword == Y_LEAF)
cprintf(cb, "[null]");
else if (keyword == Y_LEAF_LIST && strcmp(restype, "empty") == 0)
cprintf(cb, "[null]");
else
cprintf(cb, "null");
}
break;
default: