Updated Branches: refs/heads/master fb7252b04 -> a7caadbb1
quick fix for SPARQL error with aggregations Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/a7caadbb Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/a7caadbb Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/a7caadbb Branch: refs/heads/master Commit: a7caadbb110d42288311777b727ed6b899a13110 Parents: fb7252b Author: Sebastian Schaffert <[email protected]> Authored: Fri Mar 15 12:38:59 2013 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Fri Mar 15 12:38:59 2013 +0100 ---------------------------------------------------------------------- .../sparql/services/sparql/SparqlServiceImpl.java | 22 ++++++--------- 1 files changed, 9 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a7caadbb/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java index 11162d0..c20d7f1 100644 --- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java +++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java @@ -56,7 +56,7 @@ import org.slf4j.Logger; /** * Sparql Service implementation - * + * * @author sschaffe */ @ApplicationScoped @@ -152,11 +152,7 @@ public class SparqlServiceImpl implements SparqlService { BindingSet s = r.next(); Map<String, Value> map = new HashMap<String, Value>(); for (Binding binding : s) { - if (binding.getValue() instanceof KiWiNode) { - map.put(binding.getName(), binding.getValue()); - } else { - log.error("binding value {} is not a KiWiNode!", binding.getValue()); - } + map.put(binding.getName(), binding.getValue()); } result.add(map); } @@ -220,13 +216,13 @@ public class SparqlServiceImpl implements SparqlService { } - @Override - public boolean ask(QueryLanguage queryLanguage, String query) - throws MarmottaException { + @Override + public boolean ask(QueryLanguage queryLanguage, String query) + throws MarmottaException { long start = System.currentTimeMillis(); log.debug("executing SPARQL ask:\n{}", query); - + boolean result = false; try { RepositoryConnection connection = sesameService.getConnection(); @@ -238,8 +234,8 @@ public class SparqlServiceImpl implements SparqlService { } catch (MalformedQueryException e) { throw new MarmottaException("malformed query, update failed",e); } catch (QueryEvaluationException e) { - throw new MarmottaException("error evaluating querry",e); - } finally { + throw new MarmottaException("error evaluating querry",e); + } finally { connection.close(); } } catch(RepositoryException ex) { @@ -248,7 +244,7 @@ public class SparqlServiceImpl implements SparqlService { } log.debug("SPARQL update execution took {}ms",System.currentTimeMillis()-start); return result; - } + }
