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

NIHVIVO-1489 code change to use same vitroJenaModelMaker across all ingest utilities.

Browse source
This commit is contained in:
ass92 2010-12-09 18:39:12 +00:00
parent 3b3111be82
commit 654258e892
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,12 +127,28 @@ public class JenaIngestController extends BaseEditController {
actionStr = (actionStr != null) ? actionStr : ""; actionStr = (actionStr != null) ? actionStr : "";
String modelType = vreq.getParameter("modelType"); String modelType = vreq.getParameter("modelType");
if ("listModels".equals(actionStr)) { if ("listModels".equals(actionStr)) {
getServletContext().setAttribute("vitroJenaModelMaker",maker);
String modelT = (String)getServletContext().getAttribute("modelT");
String info = (String)getServletContext().getAttribute("info");
if(modelT==null || modelT.equals("rdb")){
request.setAttribute("modelType", "rdb");
request.setAttribute("infoLine", "RDB models");
}
else{
request.setAttribute("modelType", "sdb");
request.setAttribute("infoLine", "SDB models");
}
request.setAttribute("title","Available Models");
request.setAttribute("bodyJsp",LIST_MODELS_JSP);
}else if("rdbModels".equals(actionStr)){
String jdbcUrl = ConfigurationProperties.getProperty("VitroConnection.DataSource.url") String jdbcUrl = ConfigurationProperties.getProperty("VitroConnection.DataSource.url")
+ "?useUnicode=yes&characterEncoding=utf8"; + "?useUnicode=yes&characterEncoding=utf8";
String username = ConfigurationProperties.getProperty("VitroConnection.DataSource.username"); String username = ConfigurationProperties.getProperty("VitroConnection.DataSource.username");
String password = ConfigurationProperties.getProperty("VitroConnection.DataSource.password"); String password = ConfigurationProperties.getProperty("VitroConnection.DataSource.password");
VitroJenaModelMaker vjmm = new VitroJenaModelMaker(jdbcUrl, username, password, "MySQL"); VitroJenaModelMaker vjmm = new VitroJenaModelMaker(jdbcUrl, username, password, "MySQL");
vreq.getSession().setAttribute("vitroJenaModelMaker",vjmm); vreq.getSession().setAttribute("vitroJenaModelMaker",vjmm);
getServletContext().setAttribute("modelT", "rdb");
getServletContext().setAttribute("info", "RDB models");
request.setAttribute("modelType", "rdb"); request.setAttribute("modelType", "rdb");
request.setAttribute("infoLine", "RDB models"); request.setAttribute("infoLine", "RDB models");
request.setAttribute("title","Available Models"); request.setAttribute("title","Available Models");
@ -147,6 +163,8 @@ public class JenaIngestController extends BaseEditController {
Store store = SDBFactory.connectStore(conn, storeDesc); Store store = SDBFactory.connectStore(conn, storeDesc);
VitroJenaSDBModelMaker vsmm = new VitroJenaSDBModelMaker(store); VitroJenaSDBModelMaker vsmm = new VitroJenaSDBModelMaker(store);
vreq.getSession().setAttribute("vitroJenaModelMaker",vsmm); vreq.getSession().setAttribute("vitroJenaModelMaker",vsmm);
getServletContext().setAttribute("modelT", "sdb");
getServletContext().setAttribute("info", "SDB models");
request.setAttribute("modelType", "sdb"); request.setAttribute("modelType", "sdb");
request.setAttribute("infoLine", "SDB models"); request.setAttribute("infoLine", "SDB models");
request.setAttribute("title","Available Models"); request.setAttribute("title","Available Models");