From a3817292a547d42e5ab822aa07a40f6d19f8c13a Mon Sep 17 00:00:00 2001
From: brianjlowe <brianjlowe@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 10 Jul 2012 14:16:54 +0000
Subject: [PATCH] merge r. 9959 from maint-rel-1.5 : NIHVIVO-3893 change
 interface text from 'SDB models' to 'main store models' in ingest tools when
 using models from main quad store

---
 .../webapp/controller/jena/JenaIngestController.java   | 10 +++++++++-
 webapp/web/jenaIngest/listModels.jsp                   |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

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 4397adff9..64c342564 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
@@ -738,6 +738,8 @@ public class JenaIngestController extends BaseEditController {
         if (modelType == null) {
             if (maker instanceof RDFServiceModelMaker) {
                 modelType = "sdb";
+            } else if (maker instanceof VitroJenaSDBModelMaker) {
+                modelType = "sdb";
             } else {
                 modelType = "rdb";
             }
@@ -1264,9 +1266,15 @@ public class JenaIngestController extends BaseEditController {
         if(modelType.equals("rdb")){
             vreq.setAttribute("modelType", "rdb");
             vreq.setAttribute("infoLine", "RDB models");
-        } else{
+        } else if (maker instanceof VitroJenaSDBModelMaker || 
+                          (maker instanceof VitroJenaSpecialModelMaker && 
+                                  ((VitroJenaSpecialModelMaker) maker).getInnerModelMaker() 
+                                          instanceof VitroJenaSDBModelMaker)) {
             vreq.setAttribute("modelType", "sdb");
             vreq.setAttribute("infoLine", "SDB models");
+        } else {
+            vreq.setAttribute("modelType", "sdb");
+            vreq.setAttribute("infoLine", "main store models");            
         }
         vreq.setAttribute("modelNames", maker.listModels().toList());
         vreq.setAttribute("bodyAttr", "onLoad=\"init()\"");
diff --git a/webapp/web/jenaIngest/listModels.jsp b/webapp/web/jenaIngest/listModels.jsp
index ab2ded164..081168fb8 100644
--- a/webapp/web/jenaIngest/listModels.jsp
+++ b/webapp/web/jenaIngest/listModels.jsp
@@ -29,7 +29,11 @@ function init(){
     <td>
      <form name="sdbform" action="ingest" method="get">
         <input type="hidden" name="action" value="sdbModels"/>
+<% if ("SDB models".equals(request.getAttribute("infoLine"))) { %>
         <input type="submit" name="submit" value="SDB Models"/>
+<% } else { %>
+        <input type="submit" name="submit" value="Main Store Models"/>
+<% } %>
     </form>
     </td>
     <td>