From 2a07955c10cbbfb4df78298f75cf0bd235727eef Mon Sep 17 00:00:00 2001
From: hjkhjk54 <hjkhjk54@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 28 Nov 2011 17:10:43 +0000
Subject: [PATCH] updated edit request dispatch to allow the use of the java
 generators instead of the jsps (after ontology/migration updates)

---
 webapp/web/edit/editRequestDispatch.jsp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/webapp/web/edit/editRequestDispatch.jsp b/webapp/web/edit/editRequestDispatch.jsp
index 5b57c76dd..534c63939 100644
--- a/webapp/web/edit/editRequestDispatch.jsp
+++ b/webapp/web/edit/editRequestDispatch.jsp
@@ -26,7 +26,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 <vitro:confirmAuthorization />
 
 <%
-    Map<String,String> jspFormToGenerator = JspToGeneratorMapping.jspsToGenerators; 
 
 	//Check if special model, in which case forward
 	if(request.getParameter("switchToDisplayModel") != null) {
@@ -245,17 +244,25 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
         form = formParam;
     }
     
-    String generator = jspFormToGenerator.get(form);
     String oldEdit = request.getParameter("oldEdit");
-   
-    if( oldEdit == null && generator != null ){
+    if( oldEdit == null){
         String queryString = request.getQueryString();
         response.sendRedirect(
                 request.getContextPath() +
                 "/editRequestDispatch?" +
-                queryString + "&editForm=" + generator);
+                queryString);
         return;
-    }            
+    } else {
+    	//For testing the jsp when test parameter has value,
+    	//Do a reverse mapping from generator to jsp where it exists
+    	for (Map.Entry<String, String> entry: JspToGeneratorMapping.jspsToGenerators.entrySet()) {
+    		if(form.equals(entry.getValue())) {
+    			//Get the jsp corresponding to the Java generator
+    			form = entry.getKey();
+    			break;
+    		}
+    	}
+    }
     
     request.setAttribute("form", form);
 %>