litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No Jira issue. Print a better message when a SPARQL Query won't parse.

Browse source
This commit is contained in:
Jim Blake 2015-04-01 18:07:07 -04:00
parent 749a8ff8ad
commit 6aa29378e5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java
View file

@ -268,7 +268,7 @@ public abstract class RDFServiceImpl implements RDFService {
return result; return result;
} }
protected Query createQuery(String queryString) { protected Query createQuery(String queryString) throws RDFServiceException {
List<Syntax> syntaxes = Arrays.asList( List<Syntax> syntaxes = Arrays.asList(
Syntax.defaultQuerySyntax, Syntax.syntaxSPARQL_11, Syntax.defaultQuerySyntax, Syntax.syntaxSPARQL_11,
Syntax.syntaxSPARQL_10, Syntax.syntaxSPARQL, Syntax.syntaxARQ); Syntax.syntaxSPARQL_10, Syntax.syntaxSPARQL, Syntax.syntaxARQ);
@ -280,7 +280,8 @@ public abstract class RDFServiceImpl implements RDFService {
q = QueryFactory.create(queryString, syntax); q = QueryFactory.create(queryString, syntax);
} catch (QueryParseException e) { } catch (QueryParseException e) {
if (!syntaxIt.hasNext()) { if (!syntaxIt.hasNext()) {
throw(e); throw new RDFServiceException("Failed to parse query \""
+ queryString + "\"", e);
} }
} }
} }

5
webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
View file

@ -44,7 +44,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.SparqlGraph;
import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet;
import edu.cornell.mannlib.vitro.webapp.rdfservice.ModelChange; import edu.cornell.mannlib.vitro.webapp.rdfservice.ModelChange;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService.ModelSerializationFormat;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceImpl; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceImpl;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
@ -400,7 +399,7 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
} }
private InputStream getRDFResultStream(String query, boolean construct, private InputStream getRDFResultStream(String query, boolean construct,
ModelSerializationFormat resultFormat) { ModelSerializationFormat resultFormat) throws RDFServiceException {
DatasetWrapper dw = getDatasetWrapper(); DatasetWrapper dw = getDatasetWrapper();
try { try {
Dataset d = dw.getDataset(); Dataset d = dw.getDataset();
@ -529,7 +528,7 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
serialize(outputStream, query); serialize(outputStream, query);
} }
private void serialize(OutputStream outputStream, String query) { private void serialize(OutputStream outputStream, String query) throws RDFServiceException {
DatasetWrapper dw = getDatasetWrapper(); DatasetWrapper dw = getDatasetWrapper();
try { try {
Dataset d = dw.getDataset(); Dataset d = dw.getDataset();