NIHVIVO-1791 sparql filter fix

This commit is contained in:
bjl23 2011-01-18 17:03:36 +00:00
parent 812e4346c7
commit 0ca2f1efd0

View file

@ -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;