litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
brianjlowe 2012-07-10 14:16:54 +00:00
parent 17c64e2e6a
commit a3817292a5
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
View file

@ -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()\"");

4
webapp/web/jenaIngest/listModels.jsp
View file

@ -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>