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

VIVO-80 Default WADF on the request must include language filter.

Browse source 
In this case, the display model was not filtered.
This commit is contained in:
j2blake 2013-06-18 11:32:48 -04:00
parent 5de5a322a2
commit 4ee600a0d4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
View file

@ -138,11 +138,8 @@ public class RequestModelsPrep implements Filter {
Dataset dataset = new RDFServiceDataset(rdfService); Dataset dataset = new RDFServiceDataset(rdfService);
vreq.setDataset(dataset); vreq.setDataset(dataset);
OntModelSelector oms = ModelAccess.on(ctx).getUnionOntModelSelector();
WebappDaoFactoryConfig config = createWadfConfig(langs); WebappDaoFactoryConfig config = createWadfConfig(langs);
WebappDaoFactory wadf = new WebappDaoFactorySDB(rdfService, oms, config);
vreq.setUnfilteredWebappDaoFactory(wadf);
WebappDaoFactory assertions = new WebappDaoFactorySDB(rdfService, WebappDaoFactory assertions = new WebappDaoFactorySDB(rdfService,
ModelAccess.on(ctx).getBaseOntModelSelector(), config, ModelAccess.on(ctx).getBaseOntModelSelector(), config,
SDBDatasetMode.ASSERTIONS_ONLY); SDBDatasetMode.ASSERTIONS_ONLY);
@ -152,6 +149,11 @@ public class RequestModelsPrep implements Filter {
ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM,
dataset.getDefaultModel())); dataset.getDefaultModel()));
OntModelSelector oms = ModelAccess.on(ctx).getUnionOntModelSelector();
WebappDaoFactory wadf = new WebappDaoFactorySDB(rdfService, oms, config);
vreq.setUnfilteredWebappDaoFactory(wadf);
wadf = new WebappDaoFactorySDB(rdfService, ModelAccess.on(vreq).getUnionOntModelSelector(), config);
if (isLanguageAwarenessEnabled()) { if (isLanguageAwarenessEnabled()) {
ModelAccess.on(vreq).setDisplayModel( ModelAccess.on(vreq).setDisplayModel(
LanguageFilteringUtils.wrapOntModelInALanguageFilter( LanguageFilteringUtils.wrapOntModelInALanguageFilter(