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

completing the function of hide for autocli-op in the yang files

Browse source
This commit is contained in:
shmuels 2021-04-18 16:58:18 +03:00
parent 8ca5944111
commit c370ac8706
16 changed files with 98 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lib/src/clixon_xml_io.c
View file

@ -94,6 +94,7 @@
* @param[in] level how many spaces to insert before each line
* @param[in] prettyprint insert \n and spaces tomake the xml more readable.
* @param[in] fn Callback to make print function
* @param[in] used_for_show_command is the function used for a cli show command.
* @see clicon_xml2cbuf
* One can use clicon_xml2cbuf to get common code, but using fprintf is
* much faster than using cbuf and then printing that,...
@ -103,7 +104,8 @@ xml2file_recurse(FILE *f,
cxobj *x,
int level,
int prettyprint,
clicon_output_cb *fn)
clicon_output_cb *fn,
int used_for_show_command)
{
int retval = -1;
char *name;
@ -113,9 +115,17 @@ xml2file_recurse(FILE *f,
int haselement;
char *val;
char *encstr = NULL; /* xml encoded string */
char *opext = NULL;
if (x == NULL)
goto ok;
/* Look for autocli-op defined in clixon-lib.yang */
if (yang_extension_value(xml_spec(x), "autocli-op", CLIXON_LIB_NS, &opext) < 0) {
goto ok;
}
if ((used_for_show_command == 1) && (opext != NULL) && ((strcmp(opext, "hide-database") == 0) || (strcmp(opext, "hide-database-auto-completion") == 0))){
goto ok;
}
name = xml_name(x);
namespace = xml_prefix(x);
switch(xml_type(x)){
@ -144,7 +154,7 @@ xml2file_recurse(FILE *f,
while ((xc = xml_child_each(x, xc, -1)) != NULL) {
switch (xml_type(xc)){
case CX_ATTR:
if (xml2file_recurse(f, xc, level+1, prettyprint, fn) <0)
if (xml2file_recurse(f, xc, level+1, prettyprint, fn, used_for_show_command) <0)
goto done;
break;
case CX_BODY:
@ -169,7 +179,7 @@ xml2file_recurse(FILE *f,
xc = NULL;
while ((xc = xml_child_each(x, xc, -1)) != NULL) {
if (xml_type(xc) != CX_ATTR)
if (xml2file_recurse(f, xc, level+1, prettyprint, fn) <0)
if (xml2file_recurse(f, xc, level+1, prettyprint, fn, used_for_show_command) <0)
goto done;
}
if (prettyprint && hasbody==0)
@ -199,6 +209,7 @@ xml2file_recurse(FILE *f,
* @param[in] xn clicon xml tree
* @param[in] level how many spaces to insert before each line
* @param[in] prettyprint insert \n and spaces tomake the xml more readable.
* @param[in] used_for_show_command is the function used for a cli show command.
* @see clicon_xml2cbuf print to a cbuf string
* @see clicon_xml2cbuf_cb print using a callback
*/
@ -206,9 +217,10 @@ int
clicon_xml2file(FILE *f,
cxobj *x,
int level,
int prettyprint)
int prettyprint,
int used_for_show_command)
{
return xml2file_recurse(f, x, level, prettyprint, fprintf);
return xml2file_recurse(f, x, level, prettyprint, fprintf, used_for_show_command);
}
/*! Print an XML tree structure to an output stream and encode chars "<>&"
@ -217,6 +229,7 @@ clicon_xml2file(FILE *f,
* @param[in] xn clicon xml tree
* @param[in] level how many spaces to insert before each line
* @param[in] prettyprint insert \n and spaces tomake the xml more readable.
* @param[in] used_for_show_command is the function used for a cli show command.
* @see clicon_xml2cbuf
*/
int
@ -224,9 +237,10 @@ clicon_xml2file_cb(FILE *f,
cxobj *x,
int level,
int prettyprint,
clicon_output_cb *fn)
clicon_output_cb *fn,
int used_for_show_command)
{
return xml2file_recurse(f, x, level, prettyprint, fn);
return xml2file_recurse(f, x, level, prettyprint, fn, used_for_show_command);
}
/*! Print an XML tree structure to an output stream
@ -235,6 +249,7 @@ clicon_xml2file_cb(FILE *f,
*
* @param[in] f UNIX output stream
* @param[in] xn clicon xml tree
* used_for_show_command
* @see clicon_xml2cbuf
* @see clicon_xml2cbuf_cb print using a callback
*/
@ -242,7 +257,7 @@ int
xml_print(FILE *f,
cxobj *x)
{
return xml2file_recurse(f, x, 0, 1, fprintf);
return xml2file_recurse(f, x, 0, 1, fprintf, 0);
}
/*! Print an XML tree structure to a cligen buffer and encode chars "<>&"