From 130b6410818a7757626ce85241b8d2ad40f96d5c Mon Sep 17 00:00:00 2001 From: bjl23 Date: Mon, 22 Nov 2010 20:44:10 +0000 Subject: [PATCH] SDB-related bugfixes --- .../webapp/servlet/setup/JenaDataSourceSetupSDB.java | 8 ++++---- .../vitro/webapp/servlet/setup/SimpleReasonerSetup.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java index 53701c6a2..5c74b8c5e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java @@ -125,16 +125,16 @@ public class JenaDataSourceSetupSDB extends JenaDataSourceSetupBase implements j JenaModelUtils modelUtils = new JenaModelUtils(); Model aboxAssertions = SDBFactory.connectNamedModel(store, JenaDataSourceSetupBase.JENA_DB_MODEL); - aboxAssertions.add(modelUtils.extractABox(baseOms.getABoxModel())); + aboxAssertions.add(modelUtils.extractABox(memModel)); Model aboxInferences = SDBFactory.connectNamedModel(store, JenaDataSourceSetupBase.JENA_INF_MODEL); - aboxInferences.add(modelUtils.extractABox(inferenceOms.getABoxModel())); + aboxInferences.add(modelUtils.extractABox(inferenceModel)); Model tboxAssertions = SDBFactory.connectNamedModel(store, JenaDataSourceSetupBase.JENA_TBOX_ASSERTIONS_MODEL); - tboxAssertions.add(modelUtils.extractTBox(baseOms.getABoxModel())); + tboxAssertions.add(modelUtils.extractTBox(memModel)); Model tboxInferences = SDBFactory.connectNamedModel(store, JenaDataSourceSetupBase.JENA_TBOX_INF_MODEL); - tboxInferences.add(modelUtils.extractTBox(inferenceOms.getABoxModel())); + tboxInferences.add(modelUtils.extractTBox(inferenceModel)); // The code below, which sets up the OntModelSelectors, controls whether each // model is maintained in memory, in the DB, or both, while the application diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java index dd0c3d7bb..5e9eb29b8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java @@ -19,7 +19,7 @@ import com.hp.hpl.jena.sdb.store.DatabaseType; import com.hp.hpl.jena.sdb.store.LayoutType; import com.hp.hpl.jena.vocabulary.OWL; -import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelectorImpl; +import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDBGraphGenerator; import edu.cornell.mannlib.vitro.webapp.dao.jena.RegeneratingGraph; import edu.cornell.mannlib.vitro.webapp.dao.jena.SDBGraphGenerator; @@ -43,9 +43,9 @@ public class SimpleReasonerSetup implements ServletContextListener { try { // set up Pellet reasoning for the TBox - OntModelSelectorImpl assertionsOms = (OntModelSelectorImpl) sce.getServletContext().getAttribute("baseOntModelSelector"); - OntModelSelectorImpl inferencesOms = (OntModelSelectorImpl) sce.getServletContext().getAttribute("inferenceOntModelSelector"); - OntModelSelectorImpl unionOms = (OntModelSelectorImpl) sce.getServletContext().getAttribute("unionOntModelSelector"); + OntModelSelector assertionsOms = (OntModelSelector) sce.getServletContext().getAttribute("baseOntModelSelector"); + OntModelSelector inferencesOms = (OntModelSelector) sce.getServletContext().getAttribute("inferenceOntModelSelector"); + OntModelSelector unionOms = (OntModelSelector) sce.getServletContext().getAttribute("unionOntModelSelector"); WebappDaoFactoryJena wadf = (WebappDaoFactoryJena) sce.getServletContext().getAttribute("webappDaoFactory");