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

NIHVIVO-1772 code change to make default RDB or SDB switch.

Browse source
This commit is contained in:
ass92 2011-01-17 19:17:49 +00:00
parent 416552483d
commit 197bb5d090
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,6 +79,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaSDBModelMaker;
import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaSpecialModelMaker; import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaSpecialModelMaker;
import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetup; import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetup;
import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupSDB; import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupSDB;
import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestUtils; import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestUtils;
import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestWorkflowProcessor; import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestWorkflowProcessor;
@ -130,7 +131,18 @@ public class JenaIngestController extends BaseEditController {
if ("listModels".equals(actionStr)) { if ("listModels".equals(actionStr)) {
String modelT = (String)getServletContext().getAttribute("modelT"); String modelT = (String)getServletContext().getAttribute("modelT");
String info = (String)getServletContext().getAttribute("info"); String info = (String)getServletContext().getAttribute("info");
if(modelT==null || modelT.equals("rdb")){ if(modelT == null){
boolean initialSwitch = new JenaDataSourceSetupBase().isSDBActive();
if(initialSwitch){
VitroJenaSDBModelMaker vsmm = (VitroJenaSDBModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
vreq.getSession().setAttribute("vitroJenaModelMaker", vsmm);
modelT = "sdb";
}
else{
modelT = "rdb";
}
}
if(modelT.equals("rdb")){
request.setAttribute("modelType", "rdb"); request.setAttribute("modelType", "rdb");
request.setAttribute("infoLine", "RDB models"); request.setAttribute("infoLine", "RDB models");
} }