Repository: marmotta Updated Branches: refs/heads/develop ca6ca527b -> cce27f426
investigating MARMOTTA-548 Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/cce27f42 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/cce27f42 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/cce27f42 Branch: refs/heads/develop Commit: cce27f426a2e3e61e1fc45611effcfc734f533fd Parents: ca6ca52 Author: Sebastian Schaffert <[email protected]> Authored: Wed Oct 8 13:39:24 2014 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Wed Oct 8 13:39:24 2014 +0200 ---------------------------------------------------------------------- .../kiwi/sparql/test/KiWiSparqlJoinTest.java | 38 ++++++++++++++++++++ .../kiwi/sparql/test/KiWiSparqlUpdateTest.java | 2 +- .../sparql/webservices/SparqlWebService.java | 5 +++ 3 files changed, 44 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/cce27f42/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlJoinTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlJoinTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlJoinTest.java index b3b2e2e..2d7d7b4 100644 --- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlJoinTest.java +++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlJoinTest.java @@ -351,6 +351,44 @@ public class KiWiSparqlJoinTest { testUpdate("update01.sparql", FOAF.name); } + @Ignore("test for MARMOTTA-548/SES-2109") + @Test + public void testIRI() throws Exception { + String queryString = "SELECT * WHERE <http://it.dbpedia.org/resource/Acigné> ?p ?o } LIMIT 1"; + + RepositoryConnection con1 = repository.getConnection(); + RepositoryConnection con2 = reference.getConnection(); + try { + con2.begin(); + + TupleQuery query2 = con2.prepareTupleQuery(QueryLanguage.SPARQL, queryString); + TupleQueryResult result2 = query2.evaluate(); + + con2.commit(); + + Assume.assumeTrue(result2.hasNext()); + + con1.begin(); + + TupleQuery query1 = con1.prepareTupleQuery(QueryLanguage.SPARQL, queryString); + TupleQueryResult result1 = query1.evaluate(); + + con1.commit(); + + Assert.assertTrue(result1.hasNext()); + + + compareResults(result1, result2); + + } catch(RepositoryException ex) { + con1.rollback(); + } finally { + con1.close(); + con2.close(); + } + } + + // fulltext search filter @Test http://git-wip-us.apache.org/repos/asf/marmotta/blob/cce27f42/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlUpdateTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlUpdateTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlUpdateTest.java index 6f49933..8ca351d 100644 --- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlUpdateTest.java +++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlUpdateTest.java @@ -68,7 +68,7 @@ public class KiWiSparqlUpdateTest extends SPARQLUpdateTest { * See https://openrdf.atlassian.net/browse/SES-2090 */ @Test - @Ignore("ignored until fixed upstream") + @Ignore("ignored until fixed upstream - MARMOTTA-528") public void contextualInsertDeleteData() throws RepositoryException, MalformedQueryException, UpdateExecutionException { StringBuilder insert = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/marmotta/blob/cce27f42/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java index e10168c..cd2d3c2 100644 --- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java +++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java @@ -207,7 +207,12 @@ public class SparqlWebService { public Response selectPost(@QueryParam("output") String resultType, @Context HttpServletRequest request) { try { if(resultType != null && outputMapper.containsKey(resultType)) resultType = outputMapper.get(resultType); + if(request.getCharacterEncoding() == null) { + request.setCharacterEncoding("utf-8"); + } String query = CharStreams.toString(request.getReader()); + //String query = IOUtils.toString(request.getInputStream(),"utf-8"); + log.debug("Query: {}",query); return select(query, resultType, request); } catch (IOException e) { log.error("body not found", e);
