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

minor cosmetic log message changes for SDBSetupController

Browse source
This commit is contained in:
bjl23 2011-02-03 17:30:44 +00:00
parent 62b48d0296
commit d851ce2617
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SDBSetupController.java
View file

@ -28,7 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupSDB;
public class SDBSetupController extends FreemarkerHttpServlet { public class SDBSetupController extends FreemarkerHttpServlet {
private static final Log log = LogFactory.getLog( private static final Log log = LogFactory.getLog(
SimpleReasonerRecomputeController.class); SDBSetupController.class);
private static final String SDB_SETUP_FTL = "sdbSetup.ftl"; private static final String SDB_SETUP_FTL = "sdbSetup.ftl";
@ -46,7 +46,7 @@ public class SDBSetupController extends FreemarkerHttpServlet {
Boolean done = (Boolean)getServletContext().getAttribute("done"); Boolean done = (Boolean)getServletContext().getAttribute("done");
String setupsignal = (String) vreq.getParameter("setupsignal"); String setupsignal = (String) vreq.getParameter("setupsignal");
if (done!=null && done) { if (done!=null && done) {
messageStr = "SDB is being setup"; messageStr = "SDB is currently being set up.";
} else{ } else{
String sdbsetup = (String)getServletContext().getAttribute("sdbsetup"); String sdbsetup = (String)getServletContext().getAttribute("sdbsetup");
if(sdbsetup == null || sdbsetup.equals("showButton") || setupsignal == null){ if(sdbsetup == null || sdbsetup.equals("showButton") || setupsignal == null){
@ -56,7 +56,7 @@ public class SDBSetupController extends FreemarkerHttpServlet {
} }
else if(setupsignal!=null && setupsignal.equals("setup")){ else if(setupsignal!=null && setupsignal.equals("setup")){
new Thread(new SDBSetupRunner(jenaDataSourceSetupSDB)).start(); new Thread(new SDBSetupRunner(jenaDataSourceSetupSDB)).start();
messageStr = "SDB setup started"; messageStr = "SDB setup started.";
getServletContext().setAttribute("sdbsetup", "showButton"); getServletContext().setAttribute("sdbsetup", "showButton");
} }
} }
@ -102,8 +102,11 @@ public class SDBSetupController extends FreemarkerHttpServlet {
if(inferenceModel == null){ if(inferenceModel == null){
inferenceModel = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC); inferenceModel = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC);
} }
if(store!=null) if (store!=null) {
log.info("Setting up SDB store.");
jenaDataSourceSetupSDB.setupSDB(getServletContext(), store, memModel, inferenceModel); jenaDataSourceSetupSDB.setupSDB(getServletContext(), store, memModel, inferenceModel);
log.info("SDB setup complete.");
}
done = false; done = false;
getServletContext().setAttribute("done",done); getServletContext().setAttribute("done",done);
} }