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

NIHVIVO-3542 Remove old IndividualController.

Browse source
This commit is contained in:
j2blake 2012-01-29 17:37:13 +00:00
parent 0bc09b07a6
commit 01618f071d
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/WEB-INF/web.xml
View file

@ -1080,7 +1080,7 @@
<servlet> <servlet>
<servlet-name>individual</servlet-name> <servlet-name>individual</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualController</servlet-class>
</servlet> </servlet>
<servlet> <servlet>

17
src/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java
View file

@ -9,12 +9,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
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.IndividualController;
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.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.controller.individual.IndividualRequestAnalysisContextImpl;
import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestAnalyzer;
import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestInfo;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel;
import freemarker.ext.beans.BeansWrapper; import freemarker.ext.beans.BeansWrapper;
import freemarker.template.DefaultObjectWrapper; import freemarker.template.DefaultObjectWrapper;
@ -28,7 +29,7 @@ public class ExportQrCodeController extends FreemarkerHttpServlet {
@Override @Override
protected ResponseValues processRequest(VitroRequest vreq) { protected ResponseValues processRequest(VitroRequest vreq) {
try { try {
Individual individual = IndividualController.getIndividualFromRequest(vreq); Individual individual = getIndividualFromRequest(vreq);
DefaultObjectWrapper wrapper = new DefaultObjectWrapper(); DefaultObjectWrapper wrapper = new DefaultObjectWrapper();
wrapper.setExposureLevel(BeansWrapper.EXPOSE_SAFE); wrapper.setExposureLevel(BeansWrapper.EXPOSE_SAFE);
@ -43,9 +44,15 @@ public class ExportQrCodeController extends FreemarkerHttpServlet {
} }
} }
@Override private Individual getIndividualFromRequest(VitroRequest vreq) {
IndividualRequestInfo requestInfo = new IndividualRequestAnalyzer(vreq,
new IndividualRequestAnalysisContextImpl(vreq)).analyze();
return requestInfo.getIndividual();
}
@Override
protected String getTitle(String siteName, VitroRequest vreq) { protected String getTitle(String siteName, VitroRequest vreq) {
return "Export QR Code for " + IndividualController.getIndividualFromRequest(vreq).getRdfsLabel(); return "Export QR Code for " + getIndividualFromRequest(vreq).getRdfsLabel();
} }
} }