Author: andy
Date: Thu Nov 14 09:39:59 2013
New Revision: 1541860
URL: http://svn.apache.org/r1541860
Log:
Use an array for errors
Modified:
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation2/QueryValidator.java
Modified:
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation2/QueryValidator.java
URL:
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation2/QueryValidator.java?rev=1541860&r1=1541859&r2=1541860&view=diff
==============================================================================
---
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation2/QueryValidator.java
(original)
+++
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation2/QueryValidator.java
Thu Nov 14 09:39:59 2013
@@ -49,6 +49,7 @@ public class QueryValidator extends Vali
static final String jAlgebraOpt = "algebra-opt" ;
static final String jAlgebraOptQuads = "algebra-opt-quads" ;
+ static final String jErrors = "errors" ;
static final String jParseError = "parse-error" ;
static final String jParseErrorLine = "parse-error-line" ;
static final String jParseErrorCol = "parse-error-column" ;
@@ -83,9 +84,17 @@ public class QueryValidator extends Vali
try {
query = QueryFactory.create(queryString, "http://example/base/";,
language) ;
} catch (QueryParseException ex) {
+ obj.key(jErrors) ;
+ obj.startArray() ; // Errors array
+ obj.startObject() ;
obj.key(jParseError).value(ex.getMessage()) ;
obj.key(jParseErrorLine).value(ex.getLine()) ;
obj.key(jParseErrorCol).value(ex.getColumn()) ;
+ obj.finishObject() ;
+ obj.finishArray() ;
+
+ obj.finishObject() ; // Outer object
+ return obj.build().getAsObject() ;
}
if ( query != null ) {
