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

NIHVIVO-1791 sparql filter fix

Browse source
This commit is contained in:
bjl23 2011-01-18 17:03:36 +00:00
parent 812e4346c7
commit 0ca2f1efd0
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
View file

@ -140,22 +140,28 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
for (int i = 0; i < graphVars.length; i++) { for (int i = 0; i < graphVars.length; i++) {
switch (datasetMode) { switch (datasetMode) {
case ASSERTIONS_ONLY : case ASSERTIONS_ONLY :
filterBlock.append("FILTER (").append(graphVars[i]) filterBlock.append("FILTER (")
.append("(!bound(").append(graphVars[i])
.append(")) || (")
.append(graphVars[i])
.append(" != <") .append(" != <")
.append(JenaDataSourceSetupBase.JENA_INF_MODEL) .append(JenaDataSourceSetupBase.JENA_INF_MODEL)
.append("> && ").append(graphVars[i]) .append("> && ").append(graphVars[i])
.append(" != <") .append(" != <")
.append(JenaDataSourceSetupBase.JENA_TBOX_INF_MODEL) .append(JenaDataSourceSetupBase.JENA_TBOX_INF_MODEL)
.append(">) \n"); .append(">) ) \n");
break; break;
case INFERENCES_ONLY : case INFERENCES_ONLY :
filterBlock.append("FILTER (").append(graphVars[i]) filterBlock.append("FILTER (")
.append("(!bound(").append(graphVars[i])
.append(")) || (")
.append(graphVars[i])
.append(" = <") .append(" = <")
.append(JenaDataSourceSetupBase.JENA_INF_MODEL) .append(JenaDataSourceSetupBase.JENA_INF_MODEL)
.append("> || ").append(graphVars[i]) .append("> || ").append(graphVars[i])
.append(" = <") .append(" = <")
.append(JenaDataSourceSetupBase.JENA_TBOX_INF_MODEL) .append(JenaDataSourceSetupBase.JENA_TBOX_INF_MODEL)
.append(">) \n"); .append(">) )\n");
break; break;
default: default:
break; break;