No need of callback method to load schemas if inline definitons is used.

johog · johog · commit 5acac642c024 · 2015-05-31T22:45:53.000+02:00
diff --git a/src/wjelement/schema.c b/src/wjelement/schema.c
@@ -426,7 +426,7 @@ static XplBool SchemaValidate(WJElement schema, WJElement document,
 		}
 
 		/* swap in any $ref'erenced schema */
-		if(loadcb && (str = WJEString(schema, "[\"$ref\"]", WJE_GET, NULL))) {
+		if(str = WJEString(schema, "[\"$ref\"]", WJE_GET, NULL)) {
 
          // Johan: Add Inline dereferencing. Looking for definitions
          const char* inline_dereferencing = "#/definitions/";
@@ -446,12 +446,13 @@ static XplBool SchemaValidate(WJElement schema, WJElement document,
                      fail = SchemaValidate (sub, document, err, loadcb, freecb, client,
                                             name,
                                             version);
+                     return fail;
                   }
                }
             }
          }
 
-         if (!sub) {
+         if (loadcb) {
             sub = loadcb (str, client, __FILE__, __LINE__);
 
             fail = SchemaValidate (sub, document, err, loadcb, freecb, client,

Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ static XplBool SchemaValidate(WJElement schema, WJElement document,`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`/* swap in any $ref'erenced schema */`
`429`		`- if(loadcb && (str = WJEString(schema, "[\"$ref\"]", WJE_GET, NULL))) {`
	`429`	`+ if(str = WJEString(schema, "[\"$ref\"]", WJE_GET, NULL)) {`
`430`	`430`
`431`	`431`	`// Johan: Add Inline dereferencing. Looking for definitions`
`432`	`432`	`const char* inline_dereferencing = "#/definitions/";`
`@@ -446,12 +446,13 @@ static XplBool SchemaValidate(WJElement schema, WJElement document,`
`446`	`446`	`fail = SchemaValidate (sub, document, err, loadcb, freecb, client,`
`447`	`447`	`name,`
`448`	`448`	`version);`
	`449`	`+ return fail;`
`449`	`450`	`}`
`450`	`451`	`}`
`451`	`452`	`}`
`452`	`453`	`}`
`453`	`454`
`454`		`- if (!sub) {`
	`455`	`+ if (loadcb) {`
`455`	`456`	`sub = loadcb (str, client, __FILE__, __LINE__);`
`456`	`457`
`457`	`458`	`fail = SchemaValidate (sub, document, err, loadcb, freecb, client,`