From 4202f30ea780ee845c894dbaebba891f2058b524 Mon Sep 17 00:00:00 2001
From: brianjlowe <bjl23@cornell.edu>
Date: Fri, 27 Sep 2013 17:05:41 -0400
Subject: [PATCH] VIVO-237 changed "attach to TBox" function to "attach
 snapshot to ontology" using in-memory copies so older ingest examples should
 still work while avoiding a performance hit.

---
 .../webapp/controller/jena/JenaIngestController.java  | 11 +++--------
 webapp/web/jenaIngest/listModels.jsp                  |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

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(){
                 <input type="hidden" name="action" value="attachModel"/>
                 <input type="hidden" name="modelName" value="${modelName}"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
-                <input type="submit" name="submit" value="attach to TBox (ontology)"/>
+                <input type="submit" name="submit" value="attach snapshot to ontology"/>
             </form>
             </td>
             <td>
@@ -104,7 +104,7 @@ function init(){
                 <input type="hidden" name="action" value="detachModel"/>
                 <input type="hidden" name="modelName" value="${modelName}"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
-                <input type="submit" name="submit" value="detach from TBox (ontology)"/>
+                <input type="submit" name="submit" value="detach snapshot from ontology"/>
             </form>
             </td>
             <td>