diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java index f21bfebd7..4eab56e4a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java @@ -822,13 +822,11 @@ public class JenaIngestController extends BaseEditController { private void doAttachModel(String modelName, ModelMaker modelMaker) { if (attachedModels.containsKey(modelName)) { - return; + doDetachModel(modelName, modelMaker); } - Model m = modelMaker.getModel(modelName); - ModelAccess.on(getServletContext()).getOntModel(ModelID.BASE_ABOX).addSubModel(m); + Model m = ModelFactory.createDefaultModel(); + m.add(modelMaker.getModel(modelName)); ModelAccess.on(getServletContext()).getOntModel(ModelID.BASE_TBOX).addSubModel(m); - ModelAccess.on(getServletContext()).getOntModel(ModelID.UNION_ABOX).addSubModel(m); - ModelAccess.on(getServletContext()).getOntModel(ModelID.UNION_TBOX).addSubModel(m); attachedModels.put(modelName, m); log.info("Attached " + modelName + " (" + m.hashCode() + ") to webapp"); } @@ -838,10 +836,7 @@ public class JenaIngestController extends BaseEditController { if (m == null) { return; } - ModelAccess.on(getServletContext()).getOntModel(ModelID.BASE_ABOX).removeSubModel(m); ModelAccess.on(getServletContext()).getOntModel(ModelID.BASE_TBOX).removeSubModel(m); - ModelAccess.on(getServletContext()).getOntModel(ModelID.UNION_ABOX).removeSubModel(m); - ModelAccess.on(getServletContext()).getOntModel(ModelID.UNION_TBOX).removeSubModel(m); attachedModels.remove(modelName); log.info("Detached " + modelName + " (" + m.hashCode() + ") from webapp"); } diff --git a/webapp/web/jenaIngest/listModels.jsp b/webapp/web/jenaIngest/listModels.jsp index 081168fb8..2b0f48343 100644 --- a/webapp/web/jenaIngest/listModels.jsp +++ b/webapp/web/jenaIngest/listModels.jsp @@ -96,7 +96,7 @@ function init(){ - +