diff --git a/webapp/config/web.xml b/webapp/config/web.xml index 1f48ca603..1a5d3cd0d 100644 --- a/webapp/config/web.xml +++ b/webapp/config/web.xml @@ -1105,12 +1105,7 @@ individual edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualController - - - updateEntityFlags - edu.cornell.mannlib.vitro.webapp.UpdateEntityFlagServlet - - + authenticate edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UpdateEntityFlagServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UpdateEntityFlagServlet.java deleted file mode 100644 index fde0dee7d..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UpdateEntityFlagServlet.java +++ /dev/null @@ -1,130 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.controller.edit; - -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder; - -public class UpdateEntityFlagServlet extends VitroHttpServlet { - private static final int DEFAULT_PORTAL_ID=1; - private static final Log log = LogFactory.getLog(UpdateEntityFlagServlet.class.getName()); - - public void doPost(HttpServletRequest req, HttpServletResponse response) { - - VitroRequest request = new VitroRequest(req); - - Connection con=null; - try { - // JCR 20040905 passing on portal home parameter - String portalIdStr=(portalIdStr=request.getParameter("home"))==null?String.valueOf(DEFAULT_PORTAL_ID):portalIdStr; - //request.setAttribute("home",portalIdStr); - - - int entityId=0; - // YES, you do want to look at the QuerySpecId parameter, not an entityId parameter in the next line - String entityIdStr=(entityIdStr=request.getParameter("querySpecId"))==null?String.valueOf(entityId):entityIdStr; - try { - entityId=Integer.parseInt(entityIdStr); - } catch (Exception ex) { - log.error("error -- could not parse " + entityIdStr + " as an integer value"); - request.setAttribute("processError","Exception when parsing entity id: "+entityIdStr+" as integer value: " + ex.getMessage()); - getServletConfig().getServletContext().getRequestDispatcher("/fetch?queryspec=entityv&linkwhere=entities.id="+entityId).forward( request, response ); - return; - } - - //try { - // TODO: this way of getting a connection is soon going away. - //con=getVitroConnection().getConnection(); - con = null; - if (con==null) { - request.setAttribute("processError","SQLException on establishing database pool connection: connection is null"); - getServletConfig().getServletContext().getRequestDispatcher("/fetch?queryspec=entityv&linkwhere=entities.id="+entityId).forward( request, response ); - return; - } -// } catch (SQLException ex) { -// request.setAttribute("processError","SQLException on establishing database connection: "+ex.getMessage()); -// getServletConfig().getServletContext().getRequestDispatcher("/fetch?queryspec=entityv&linkwhere=entities.id="+entityId).forward( request, response ); -// return; -// } - - Statement stmt=con.createStatement(); - - String[] flag1ParameterValues = request.getParameterValues("flag1s"); - String updateEntityStr="UPDATE entities SET flag1Set='"; - String flag1SetMembers=""; - if ( flag1ParameterValues != null ) { - for ( int i=0; i