From 4ee600a0d4096b01e68dca0dcd3731b35989d01f Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 18 Jun 2013 11:32:48 -0400 Subject: [PATCH] VIVO-80 Default WADF on the request must include language filter. In this case, the display model was not filtered. --- .../vitro/webapp/filters/RequestModelsPrep.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java index e4973052f..63da60c74 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java @@ -138,11 +138,8 @@ public class RequestModelsPrep implements Filter { Dataset dataset = new RDFServiceDataset(rdfService); vreq.setDataset(dataset); - OntModelSelector oms = ModelAccess.on(ctx).getUnionOntModelSelector(); WebappDaoFactoryConfig config = createWadfConfig(langs); - WebappDaoFactory wadf = new WebappDaoFactorySDB(rdfService, oms, config); - vreq.setUnfilteredWebappDaoFactory(wadf); - + WebappDaoFactory assertions = new WebappDaoFactorySDB(rdfService, ModelAccess.on(ctx).getBaseOntModelSelector(), config, SDBDatasetMode.ASSERTIONS_ONLY); @@ -152,6 +149,11 @@ public class RequestModelsPrep implements Filter { ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, 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()) { ModelAccess.on(vreq).setDisplayModel( LanguageFilteringUtils.wrapOntModelInALanguageFilter(