--- libelwix/src/json.c 2017/11/30 13:45:38 1.1.2.11 +++ libelwix/src/json.c 2018/03/07 12:26:38 1.3.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: json.c,v 1.1.2.11 2017/11/30 13:45:38 misho Exp $ +* $Id: json.c,v 1.3.4.1 2018/03/07 12:26:38 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2017 +Copyright 2004 - 2018 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -487,12 +487,13 @@ json_token2num(const char *jstr, jtok_t * __restrict t * * @jstr = JSON string * @key = Search key + * @type = Search key for particular token type, if is J_UNDEF this mean any type * @toks = Parsed tokens * @toksnum = Number of parsed tokens * return: =NULL error or !=NULL data token found */ jtok_t * -json_findbykey(const char *jstr, const char *key, jtok_t * __restrict toks, int toksnum) +json_findbykey(const char *jstr, const char *key, jtype_t type, jtok_t * __restrict toks, int toksnum) { jtok_t *tok = NULL; register int i; @@ -507,8 +508,15 @@ json_findbykey(const char *jstr, const char *key, jtok if (toks[i].tok_type == J_STRING && klen == toks[i].tok_end - toks[i].tok_start && !strncmp(jstr + toks[i].tok_start, key, klen)) { - tok = toks + i + 1; - break; + if (type != J_UNDEF) { + if (toks[i + 1].tok_type == type) { + tok = toks + i + 1; + break; + } + } else { + tok = toks + i + 1; + break; + } } } @@ -982,4 +990,54 @@ json_add_array(char * __restrict jstr, int jlen, int w } return len; +} + +/* + * json_dump_yaml() - Dump parsed JSON string to YAML format + * + * @f = Output handler + * @jstr = JSON string + * @toks = JSON tokens + * @toksnum = Number of tokens + * @indent = Start indent spaces + * return: 0 done and 1 added one more item + */ +int +json_dump_yaml(FILE *f, const char *jstr, jtok_t *toks, int toksnum, int indent) +{ + register int i, j, k; + + if (!toksnum) + return 0; + + if (toks->tok_type == J_VALUE) { + fprintf(f, "%.*s", (int) json_toklen(toks), json_tokstr(jstr, toks)); + return 1; + } else if (toks->tok_type == J_STRING) { + fprintf(f, "%.*s", (int) json_toklen(toks), json_tokstr(jstr, toks)); + return 1; + } else if (toks->tok_type == J_OBJECT) { + fprintf(f, "\n"); + for (j = i = 0; i < json_toksize(toks); i++) { + for (k = 0; k < indent; k++) + fprintf(f, " "); + j += json_dump_yaml(f, jstr, toks + j + 1, toksnum - j, indent + 1); + fprintf(f, ": "); + j += json_dump_yaml(f, jstr, toks + j + 1, toksnum - j, indent + 1); + fprintf(f, "\n"); + } + return j + 1; + } else if (toks->tok_type == J_ARRAY) { + fprintf(f, "\n"); + for (j = i = 0; i < json_toksize(toks); i++) { + for (k = 0; k < indent - 1; k++) + fprintf(f, " "); + fprintf(f, " - "); + j += json_dump_yaml(f, jstr, toks + j + 1, toksnum - j, indent + 1); + fprintf(f, "\n"); + } + return j + 1; + } + + return 0; }