--- libelwix/src/json.c 2017/12/03 21:50:23 1.3 +++ libelwix/src/json.c 2018/04/16 14:02:35 1.4.6.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: json.c,v 1.3 2017/12/03 21:50:23 misho Exp $ +* $Id: json.c,v 1.4.6.1 2018/04/16 14:02:35 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 @@ -437,7 +437,7 @@ json_token2val(const char *jstr, jtok_t * __restrict t * * @jstr = JSON string * @tok = Token for convert - * @return =NULL error or !=NULL allocated str, after use should be e_free() + * @return =NULL error or !=NULL allocated str, after use should be json_freestr()|e_free() */ char * json_token2str(const char *jstr, jtok_t * __restrict tok) @@ -483,16 +483,39 @@ json_token2num(const char *jstr, jtok_t * __restrict t } /* + * json_token2dbl() - Return token to double + * + * @jstr = JSON string + * @tok = Token for convert + * @return number + */ +double +json_token2dbl(const char *jstr, jtok_t * __restrict tok) +{ + long ret = 0; + char *str; + + str = json_token2str(jstr, tok); + if (!str) + return 0; + + ret = strtod(str, NULL); + e_free(str); + return ret; +} + +/* * json_findbykey() - Find data by key * * @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 +530,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; + } } }