2006/unicorn/src/org/w3c/unicorn/action IndexAction.java,1.14,1.15

• From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
• Date: Thu, 10 Sep 2009 15:50:12 +0000
• To: www-validator-cvs@w3.org
• Message-Id: <E1MlluW-0001Q3-S5@lionel-hutz.w3.org>

Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/action
In directory hutz:/tmp/cvs-serv5441/src/org/w3c/unicorn/action

Modified Files:
	IndexAction.java 
Log Message:
added the possibility to pass the request parameters as an attribute "unicorn_parameters". This is useful only if the request is forwarded from another servlet and is a multipart request.

Index: IndexAction.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/action/IndexAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- IndexAction.java	8 Sep 2009 14:23:33 -0000	1.14
+++ IndexAction.java	10 Sep 2009 15:50:10 -0000	1.15
@@ -6,6 +6,8 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Map;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -37,9 +39,20 @@
 		
 		ArrayList<Message> messages = new ArrayList<Message>();
 		String paramPrefix = Property.get("UNICORN_PARAMETER_PREFIX");
-		String lang = getLanguage(req.getParameter(paramPrefix + "lang"), req, messages);
-		String task = getTask(req.getParameter(paramPrefix + "task"), null);
-		String queryString = getQueryStringWithout(paramPrefix + "lang", req);
+		
+		String lang;
+		String task;
+		String queryString;
+		if (req.getAttribute("unicorn_parameters") instanceof Map<?, ?>) {
+			Map<?, ?> reqParams = (Map<?, ?>) req.getAttribute("unicorn_parameters");
+			lang = getLanguage((String) reqParams.get(paramPrefix + "lang"), req, messages);
+			task = getTask((String) reqParams.get(paramPrefix + "task"), null);
+			queryString = "./";
+		} else {
+			lang = getLanguage((String) req.getParameter(paramPrefix + "lang"), req, messages);
+			task = getTask((String) req.getParameter(paramPrefix + "task"), null);
+			queryString = getQueryStringWithout(paramPrefix + "lang", req);
+		}
 		
 		if (req.getAttribute("unicorn_message") != null)
 			messages.add((Message) req.getAttribute("unicorn_message"));
@@ -49,12 +62,52 @@
 		velocityContext.put("messages", messages);
 		velocityContext.put("current_task", Framework.mapOfTask.get(task));
 		
-		/*messages.add(new Message(Message.Level.WARNING, "un warning", null));
-		messages.add(new Message(Message.Level.ERROR, "une error", null));
-		messages.add(new Message(Message.Level.INFO, "une info", null));
-		messages.add(new Message(Message.Level.WARNING, "un warning avec long message", "le long message\nle long message\nle long message\nle long message\nle long message\nle long message\n"));
-		messages.add(new Message(Message.Level.ERROR, "une error avec long message",  "le long message\nle long message\nle long message\nle long message\nle long message\nle long message\n"));
-		messages.add(new Message(Message.Level.INFO, "une info avec long message",  "le long message\nle long message\nle long message\nle long message\nle long message\nle long message\nle long message\n"));*/
+		Enumeration<?> paramEnum = req.getParameterNames();
+		while (paramEnum.hasMoreElements()) {
+			String key = (String) paramEnum.nextElement();
+			String ref;
+			if (key.startsWith(Property.get("UNICORN_PARAMETER_OUTPUT_PREFIX")))
+				continue;
+			if (key.startsWith(paramPrefix))
+				ref = "param_" + key.substring(paramPrefix.length());
+			else
+				ref = "param_" + key;
+			if (req.getParameterValues(key).length > 1) {
+				String[] s = req.getParameterValues(key);
+				ArrayList<String> array = new ArrayList<String>();
+				for (int i = 0; i < s.length; i++)
+					array.add(s[i]);
+				velocityContext.put(ref, array);
+			}
+			else {
+				velocityContext.put(ref, req.getParameter(key));
+			}
+		}
+		
+		if (req.getAttribute("unicorn_parameters") instanceof Map<?, ?>) {
+			Map<?, ?> reqParams = (Map<?, ?>) req.getAttribute("unicorn_parameters");
+			
+			for (Object objKey : reqParams.keySet()) {
+				String key = (String) objKey;
+				String ref;
+				if (key.startsWith(Property.get("UNICORN_PARAMETER_OUTPUT_PREFIX")))
+					continue;
+				if (key.startsWith(paramPrefix))
+					ref = "param_" + key.substring(paramPrefix.length());
+				else
+					ref = "param_" + key;
+				if (reqParams.get(key) instanceof String[]) {
+					String[] s = (String[]) reqParams.get(key);
+					ArrayList<String> array = new ArrayList<String>();
+					for (int i = 0; i < s.length; i++)
+						array.add(s[i]);
+					velocityContext.put(ref, array);
+				}
+				else {
+					velocityContext.put(ref, reqParams.get(key));
+				}
+			}
+		}
 		
 		if (req.getHeader("X-Requested-With") != null && req.getHeader("X-Requested-With").equals("XMLHttpRequest")) {
 			Templates.write("parameters.vm", velocityContext, resp.getWriter());

Received on Thursday, 10 September 2009 15:50:22 UTC