--- libelwix/src/json.c	2018/03/07 12:29:28	1.4
+++ libelwix/src/json.c	2018/04/19 00:00:36	1.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: json.c,v 1.4 2018/03/07 12:29:28 misho Exp $
+* $Id: json.c,v 1.5 2018/04/19 00:00:36 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -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,9 +483,31 @@ json_token2num(const char *jstr, jtok_t * __restrict t
 }
 
 /*
- * json_findbykey() - Find data by key
+ * 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)
+{
+	double 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 token 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
@@ -524,6 +546,32 @@ json_findbykey(const char *jstr, const char *key, jtyp
 }
 
 /*
+ * json_findbypos() - Find token by position on JSON string
+ *
+ * @pos = Offset from begin of JSON string
+ * @toks = Parsed tokens
+ * @toksnum = Number of parsed tokens
+ * return: =NULL error or !=NULL token found 
+ */
+jtok_t *
+json_findbypos(u_long pos, jtok_t * __restrict toks, int toksnum)
+{
+	jtok_t *tok = NULL;
+	register int i;
+
+	if (toks)
+		return NULL;
+
+	for (i = 1; i < toksnum; i++)
+		if (pos <= toks[i].tok_end && pos >= toks[i].tok_start) {
+			tok = toks + i;
+			break;
+		}
+
+	return tok;
+}
+
+/*
  * json_token2array() - Convert token to string array
  *
  * @jstr = JSON string
@@ -535,7 +583,7 @@ array_t *
 json_token2array(const char *jstr, jtok_t * __restrict tok)
 {
 	array_t *arr = NULL;
-	register int i;
+	register int i, j;
 	int siz;
 	ait_val_t *v;
 	jtok_t *t;
@@ -556,11 +604,15 @@ json_token2array(const char *jstr, jtok_t * __restrict
 		AIT_SET_STRSIZ(v, json_toklen(tok) + 1);
 		json_tokstrcpy(AIT_GET_STR(v), jstr, tok);
 	} else if (tok->tok_type == J_ARRAY) {
-		for (i = 0; i < tok->tok_size; i++) {
-			t = &tok[i + 1];
+		for (i = 0, j = 1; i < tok->tok_size; i++) {
+			t = &tok[i + j];
 			v = ait_getVars(&arr, i);
 			AIT_SET_STRSIZ(v, json_toklen(t) + 1);
 			json_tokstrcpy(AIT_GET_STR(v), jstr, t);
+
+			/* if there we have array from objects should parse all object tokens */
+			while (i < tok->tok_size - 1 && tok->tok_idx != tok[i + j + 1].tok_parent)
+				j++;
 		}
 	} else if (tok->tok_type == J_OBJECT) {
 		for (i = 0; tok->tok_idx <= tok[i + 1].tok_parent; i++) {
@@ -1034,6 +1086,63 @@ json_dump_yaml(FILE *f, const char *jstr, jtok_t *toks
 				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;
+}
+
+/*
+ * json_dump() - Dump parsed JSON string to structure 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(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, "[idx=%ld type=VALUE start=%ld end=%ld size=%ld parent=%ld] = %.*s", 
+				toks->tok_idx, toks->tok_start, toks->tok_end, toks->tok_size, toks->tok_parent, 
+				(int) json_toklen(toks), json_tokstr(jstr, toks));
+		return 1;
+	} else if (toks->tok_type == J_STRING) {
+		fprintf(f, "[idx=%ld type=STRING start=%ld end=%ld size=%ld parent=%ld] = %.*s", 
+				toks->tok_idx, toks->tok_start, toks->tok_end, toks->tok_size, toks->tok_parent, 
+				(int) json_toklen(toks), json_tokstr(jstr, toks));
+		return 1;
+	} else if (toks->tok_type == J_OBJECT) {
+		fprintf(f, "\n");
+		fprintf(f, "object:: [idx=%ld type=OBJECT start=%ld end=%ld size=%ld parent=%ld]\n", 
+				toks->tok_idx, toks->tok_start, toks->tok_end, toks->tok_size, toks->tok_parent);
+		for (j = i = 0; i < json_toksize(toks); i++) {
+			for (k = 0; k < indent; k++)
+				fprintf(f, "  ");
+			j += json_dump(f, jstr, toks + j + 1, toksnum - j, indent + 1);
+			fprintf(f, ": ");
+			j += json_dump(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");
+		fprintf(f, "array[] [idx=%ld type=ARRAY start=%ld end=%ld size=%ld parent=%ld]", 
+				toks->tok_idx, toks->tok_start, toks->tok_end, toks->tok_size, toks->tok_parent);
+		for (j = i = 0; i < json_toksize(toks); i++) {
+			for (k = 0; k < indent - 1; k++)
+				fprintf(f, "  ");
+			j += json_dump(f, jstr, toks + j + 1, toksnum - j, indent + 1);
 			fprintf(f, "\n");
 		}
 		return j + 1;