Changeset 528:1faedac1f0b4

Timestamp:

09/24/09 15:34:35 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@529

Message:

createError method removed, redirection on Index is done in ouputModules

Files:

• src/org/w3c/unicorn/action/ObserveAction.java (modified) (10 diffs)

src/org/w3c/unicorn/action/ObserveAction.java

@@ -1 @@
-// $Id: ObserveAction.java,v 1.41 2009-09-23 14:08:46 tgambet Exp $
+// $Id: ObserveAction.java,v 1.42 2009-09-24 15:34:35 tgambet Exp $
 // Author: Jean-Guilhem Rouel
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2006.
@@ -14 +14 @@
 import java.util.Map;
 
-import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -109 +108 @@
                 mapOfStringObject.put("unicorncall", aUnicornCall);
                 
+                resp.setContentType(mapOfOutputParameter.get("mimetype") + "; charset=UTF-8");
+                
                 // Retrieve the parameters from the request
                 Map<String, Object> reqParams;
@@ -116 +117 @@
                         OutputModule aOutputModule = OutputFactory.createOutputModule(mapOfOutputParameter, mapOfSpecificParameter);
                         messages.add(new Message(e));
-                        createError(req, resp, null, mapOfStringObject, aOutputModule);
+                        aOutputModule.produceError(mapOfStringObject, resp.getWriter());
                         return;
                 }
@@ -155 +156 @@
                                         logger.trace("Task parameter: " + key + " - " + (String) reqParams.get(key));
                                         String task = getTask((String) reqParams.get(key), messages);
+                                        mapOfStringObject.put("current_task", Framework.mapOfTask.get(task));
                                         if (!task.equals(reqParams.get(key))) {
                                                 mapOfStringObject.put("default_task", Framework.mapOfTask.get(Framework.mapOfTask.getDefaultTaskId()));
@@ -206 +208 @@
                         logger.debug("No task parameter found. Task parameter is set to task id: " + task);
                         mapOfStringObject.put("default_task", Framework.mapOfTask.get(Framework.mapOfTask.getDefaultTaskId()));
+                        mapOfStringObject.put("current_task", Framework.mapOfTask.get(task));
                         aUnicornCall.setTask(task);
                 }
@@ -213 +216 @@
                 if (!reqParams.containsKey(paramPrefix + "uri") && !reqParams.containsKey(paramPrefix + "text") && !reqParams.containsKey(paramPrefix + "file")) {
                         messages.add(new Message(Message.Level.ERROR, "$message_nothing_to_validate", null));
-                        createError(req, resp, reqParams, mapOfStringObject, aOutputModule);
+                        aOutputModule.produceError( mapOfStringObject, resp.getWriter());
                         return;
                 }
                 
-                resp.setContentType(mapOfOutputParameter.get("mimetype") + "; charset=" + mapOfOutputParameter.get("charset"));
+                //req.setAttribute("unicorn_parameters", reqParams);
+                
+                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]);
+                                mapOfStringObject.put(ref, array);
+                        }
+                        else {
+                                mapOfStringObject.put(ref, reqParams.get(key));
+                        }
+                }
                 
                 String s = "Resolved parameters:";
@@ -236 +260 @@
                 // Launch the observation
                 try {
-                        aOutputModule.produceFirstOutput( mapOfStringObject, resp.getWriter());
+                        aOutputModule.produceFirstOutput(mapOfStringObject, resp.getWriter());
                         aUnicornCall.doTask();
                         messages.addAll(aUnicornCall.getMessages());
                         if (aUnicornCall.getResponses().size() == 0) {
                                 messages.add(new Message(Message.Level.ERROR, "$message_no_observation_done", null));
-                                createError(req, resp, reqParams, mapOfStringObject, aOutputModule);
+                                aOutputModule.produceError(mapOfStringObject, resp.getWriter());
                         } else {
                                 aOutputModule.produceOutput(mapOfStringObject, resp.getWriter());
@@ -250 +274 @@
                         else
                                 messages.add(new Message(Message.Level.ERROR, ucnException.getMessage(), null));
-                        createError(req, resp, reqParams, mapOfStringObject, aOutputModule);
+                        aOutputModule.produceError(mapOfStringObject, resp.getWriter());
                 } catch (final Exception aException) {
                         logger.error("Exception : " + aException.getMessage(), aException);
                         messages.add(new Message(aException));
-                        createError(req, resp, reqParams, mapOfStringObject, aOutputModule);
+                        aOutputModule.produceError(mapOfStringObject, resp.getWriter());
                 } finally {
                         if ("true".equals(Property.get("DELETE_UPLOADED_FILES")) && aFileItemUploaded != null)
@@ -330 +354 @@
                 return params;
         }
-        
-        private void createError(HttpServletRequest req, HttpServletResponse resp,
-                        Map<String, Object> reqParams, Map<String, Object> mapOfStringObject, OutputModule aOutputModule) throws IOException, ServletException {
-                
-                // If text/html is the mime-type the error will be displayed directly on index
-                if (aOutputModule.getOutputParameter("mimetype").equals("text/html")) {// mapOfOutputParameter.get("mimetype").equals("text/html")) {
-                        redirect(req, resp, reqParams, (ArrayList<?>) mapOfStringObject.get("messages"));
-                        return;
-                }
-                
-                aOutputModule.produceError( mapOfStringObject, resp.getWriter());
-        }
-        
-        private void redirect(HttpServletRequest req, HttpServletResponse resp, Map<String, Object> reqParams, ArrayList<?> messages) throws IOException, ServletException {
-                req.setAttribute("unicorn_messages", messages);
-                if (reqParams != null)
-                        req.setAttribute("unicorn_parameters", reqParams);
-                RequestDispatcher dispatcher = req.getRequestDispatcher("index.html");
-                dispatcher.forward(req, resp);
-                logger.info("request redirected to index");
-        }
 
         /**