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

NIHVIVO-1685

Browse source
This commit is contained in:
jeb228 2011-01-14 17:13:40 +00:00
parent f3f759ff2a
commit 69e8180ae8
1 changed files with 5 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

47
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java
View file

@ -11,10 +11,7 @@ import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
import edu.cornell.mannlib.vitro.webapp.search.IndexingException; import edu.cornell.mannlib.vitro.webapp.search.IndexingException;
@ -31,58 +28,24 @@ import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;
* An example of the IndexBuilder and LuceneIndexer getting setup is in LuceneSetup. * An example of the IndexBuilder and LuceneIndexer getting setup is in LuceneSetup.
* *
* @author bdc34 * @author bdc34
*
*/ */
public class IndexController extends FreemarkerHttpServlet { public class IndexController extends FreemarkerHttpServlet {
private static final Log log = LogFactory.getLog(IndexController.class); private static final Log log = LogFactory.getLog(IndexController.class);
// public void doPost(HttpServletRequest request, HttpServletResponse response)
// throws ServletException,IOException {
// doGet(request, response);
// }
//
// public void doGet( HttpServletRequest request, HttpServletResponse response )
// throws IOException, ServletException {
// if (!LoginStatusBean.getBean(vreq).isLoggedInAtLeast(LoginStatusBean.DBA)) {
// String redirectURL=request.getContextPath() + Controllers.SITE_ADMIN + "?login=block";
// response.sendRedirect(redirectURL);
// return;
// }
//
// long start = System.currentTimeMillis();
// try {
// IndexBuilder builder = (IndexBuilder)getServletContext().getAttribute(IndexBuilder.class.getName());
// if( request.getParameter("update") != null ){
// builder.doUpdateIndex();
// }else{
// builder.doIndexRebuild();
// }
//
// } catch (IndexingException e) {
// log.error("IndexController -- Error building index: " + e);
// }
// long delta = System.currentTimeMillis() - start;
// String msg = "Search index complete. Elapsed time " + delta + " msec.";
// }
@Override @Override
protected String getTitle(String siteName, VitroRequest vreq) { protected String getTitle(String siteName, VitroRequest vreq) {
return "Full Search Index Rebuild"; return "Full Search Index Rebuild";
} }
// @Override @Override
// protected int requiresLoginLevel() { protected int requiredLoginLevel() {
// // User must be logged in to view this page. // User must be logged in to view this page.
// return LoginStatusBean.DBA; return LoginStatusBean.DBA;
// } }
@Override @Override
protected ResponseValues processRequest(VitroRequest vreq) { protected ResponseValues processRequest(VitroRequest vreq) {
// Due to requiresLoginLevel(), we don't get here unless logged in as DBA
if (!LoginStatusBean.getBean(vreq).isLoggedInAtLeast(LoginStatusBean.DBA)) {
return new RedirectResponseValues(UrlBuilder.getUrl(Route.LOGIN));
}
Map<String, Object> body = new HashMap<String, Object>(); Map<String, Object> body = new HashMap<String, Object>();
try { try {