From 01618f071dd2c29c25e90fd43483df4b164ad041 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Sun, 29 Jan 2012 17:37:13 +0000
Subject: [PATCH] NIHVIVO-3542 Remove old IndividualController.

---
 productMods/WEB-INF/web.xml                     |  2 +-
 .../controller/ExportQrCodeController.java      | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 0b69fd03..08027a34 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -1080,7 +1080,7 @@
   
   <servlet>
     <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>
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java
index 826598c0..91037717 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java
@@ -9,12 +9,13 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 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.IndividualController;
 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.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 freemarker.ext.beans.BeansWrapper;
 import freemarker.template.DefaultObjectWrapper;
@@ -28,7 +29,7 @@ public class ExportQrCodeController extends FreemarkerHttpServlet {
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
         try {
-            Individual individual = IndividualController.getIndividualFromRequest(vreq);
+        	Individual individual = getIndividualFromRequest(vreq);
             
             DefaultObjectWrapper wrapper = new DefaultObjectWrapper();
             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) {
-        return "Export QR Code for " + IndividualController.getIndividualFromRequest(vreq).getRdfsLabel();
+        return "Export QR Code for " + getIndividualFromRequest(vreq).getRdfsLabel();
     }
 
 }