From 0ca2f1efd0c474e796e859e32514b9602b0ff838 Mon Sep 17 00:00:00 2001 From: bjl23 Date: Tue, 18 Jan 2011 17:03:36 +0000 Subject: [PATCH] NIHVIVO-1791 sparql filter fix --- .../vitro/webapp/dao/jena/WebappDaoFactorySDB.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java index 5b98873f9..ad00f4f4e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java @@ -140,22 +140,28 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena { for (int i = 0; i < graphVars.length; i++) { switch (datasetMode) { case ASSERTIONS_ONLY : - filterBlock.append("FILTER (").append(graphVars[i]) + filterBlock.append("FILTER (") + .append("(!bound(").append(graphVars[i]) + .append(")) || (") + .append(graphVars[i]) .append(" != <") .append(JenaDataSourceSetupBase.JENA_INF_MODEL) .append("> && ").append(graphVars[i]) .append(" != <") .append(JenaDataSourceSetupBase.JENA_TBOX_INF_MODEL) - .append(">) \n"); + .append(">) ) \n"); break; case INFERENCES_ONLY : - filterBlock.append("FILTER (").append(graphVars[i]) + filterBlock.append("FILTER (") + .append("(!bound(").append(graphVars[i]) + .append(")) || (") + .append(graphVars[i]) .append(" = <") .append(JenaDataSourceSetupBase.JENA_INF_MODEL) .append("> || ").append(graphVars[i]) .append(" = <") .append(JenaDataSourceSetupBase.JENA_TBOX_INF_MODEL) - .append(">) \n"); + .append(">) )\n"); break; default: break;