Changeset 301:a7efdd8a5cb3

Timestamp:

09/08/09 14:23:33 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

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

Message:

changed signature of method getTask() to be language independent
+ added some verifications on request parameters
+ refactored some more

Location:

src/org/w3c/unicorn/action

Files:

• Action.java (modified) (2 diffs)
• IndexAction.java (modified) (2 diffs)
• ObserveAction.java (modified) (15 diffs)

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

@@ -74 +74 @@
         }
 
-        public String getTask(String taskParameter, String lang, ArrayList<Message> messages) {
+        public String getTask(String taskParameter, ArrayList<Message> messages) {
                 
                 //String taskParameter = req.getParameter(Property.get("UNICORN_PARAMETER_PREFIX") + "task");
@@ -87 +87 @@
                 
                 if (taskParameter == null) {
-                        Message mess = new Message(Message.Level.WARNING, "$message_no_task " + Framework.mapOfTask.get(Framework.mapOfTask.getDefaultTaskId()).getLongName(lang), null);
+                        Message mess = new Message(Message.Level.WARNING, "$message_no_task " + "$default_task.getLongName($lang) ", null);
                         messages.add(mess);
                 } else if (!Framework.mapOfTask.containsKey(taskParameter)) {
                         System.out.println(taskParameter);
-                        Message mess = new Message(Message.Level.WARNING, "$message_unknown_task " + Framework.mapOfTask.get(Framework.mapOfTask.getDefaultTaskId()).getLongName(lang), null);
+                        Message mess = new Message(Message.Level.WARNING, "$message_unknown_task " + "$default_task.getLongName($lang) ", null);
                         messages.add(mess);
                 }

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

@@ -1 @@
-// $Id: IndexAction.java,v 1.13 2009-09-07 17:35:20 tgambet Exp $Id $
+// $Id: IndexAction.java,v 1.14 2009-09-08 14:23:33 tgambet Exp $Id $
 // Author: Thomas Gambet
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2009.
@@ -39 +39 @@
                 String paramPrefix = Property.get("UNICORN_PARAMETER_PREFIX");
                 String lang = getLanguage(req.getParameter(paramPrefix + "lang"), req, messages);
-                String task = getTask(req.getParameter(paramPrefix + "task"), lang, null);
+                String task = getTask(req.getParameter(paramPrefix + "task"), null);
                 String queryString = getQueryStringWithout(paramPrefix + "lang", req);
                 

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

@@ -1 @@
-// $Id: ObserveAction.java,v 1.14 2009-09-07 17:35:21 tgambet Exp $
+// $Id: ObserveAction.java,v 1.15 2009-09-08 14:23:33 tgambet Exp $
 // Author: Jean-Guilhem Rouel
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2006.
@@ -10 +10 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -35 +34 @@
 import org.w3c.unicorn.util.Message;
 import org.w3c.unicorn.util.Property;
+import org.w3c.unicorn.Framework;
 
 /**
- * FirstServlet<br />
- * Created: Jun 26, 2006 2:04:11 PM<br />
+ * ObserveAction
  * 
  * @author Jean-Guilhem ROUEL
@@ -51 +50 @@
         
         private static ServletFileUpload upload;
+        
+        private static ArrayList<String> outputParams;
         
         @Override
@@ -59 +60 @@
                 upload = new ServletFileUpload(factory);
                 logger.debug("Created a ServletFileUpload with repository set to: " + Property.get("UPLOADED_FILES_REPOSITORY"));
+                
+                outputParams = new ArrayList<String>();
+                outputParams.add("output");
+                outputParams.add("format");
+                outputParams.add("charset");
+                outputParams.add("mimetype");
+                outputParams.add("lang");
         }
         
@@ -64 +72 @@
                 
                 Hashtable<String, Object> params = new Hashtable<String, Object>();
-                        
+                
                 if (req.getMethod().equals("POST") && ServletFileUpload.isMultipartContent(new ServletRequestContext(req))) {
-
                         List<?> listOfItem = upload.parseRequest(req);
                         for (Object fileItem : listOfItem) {
@@ -74 +81 @@
                                 } else if (aFileItem.getFieldName().equals(Property.get("UNICORN_PARAMETER_PREFIX") + "file")) {
                                         params.put(aFileItem.getFieldName(), aFileItem);
+                                } else {
+                                        // TODO log "unknown fileItem, ignored"
                                 }
                         }
-                        
-                        return params;
-                }
-                
-                for (Object key : req.getParameterMap().keySet()) {
-                        params.put(key.toString(), req.getParameter(key.toString()));
-                }
+                } else {
+                        Enumeration<?> paramEnum = req.getParameterNames();
+                        while (paramEnum.hasMoreElements()) {
+                                
+                                Object key = paramEnum.nextElement();
+                                logger.debug("TOM: " + key);
+                                params.put(key.toString(), req.getParameter(key.toString()));
+                        }
+                }
+                
+                String s = "Parameters: ";
+                for (String key : params.keySet()) {
+                        s += "\n\t" + key + " - " + params.get(key);
+                }
+                logger.debug(s);
+                
                 return params;
-                
         }
         
@@ -93 +110 @@
                 super.doGet(req, resp);
                 
+                Map<String, Object> reqParams;
+                try {
+                        reqParams = getRequestParameters(req);
+                } catch (FileUploadException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                        return;
+                }
+                
+                FileItem aFileItemUploaded = null;
                 Map<String, Object> mapOfStringObject = new LinkedHashMap<String, Object>();
-                Map<String, String[]> mapOfSpecificParameter = new Hashtable<String, String[]>();
+                Map<String, String> mapOfSpecificParameter = new Hashtable<String, String>();
                 Map<String, String> mapOfOutputParameter = new Hashtable<String, String>();
                 ArrayList<Message> messages = new ArrayList<Message>();
-                
-                //Map<String, String> reqParameters = getRequestParameters(req);
+                UnicornCall aUnicornCall = new UnicornCall();
                 
                 String paramPrefix = Property.get("UNICORN_PARAMETER_PREFIX");
-                String lang = getLanguage(req.getParameter(paramPrefix + "lang"), req, null);
-                String task = getTask(req.getParameter(paramPrefix + "task"), lang, messages);
+                String outParamPrefix = Property.get("UNICORN_PARAMETER_OUTPUT_PREFIX");
                 String queryString = getQueryStringWithout(paramPrefix + "lang", req);
                 
@@ -112 +137 @@
                 mapOfOutputParameter.put("charset", "UTF-8");
                 mapOfOutputParameter.put("mimetype", "text/html");
-                mapOfOutputParameter.put("lang", lang);
-                
-                UnicornCall aUnicornCall = new UnicornCall();
-                String aLocale = convertEnumerationToString(req.getLocales());
-                if (null == aLocale)
-                        aUnicornCall.setLang(lang + "," + Property.get("DEFAULT_LANGUAGE"));
-                else
-                        aUnicornCall.setLang(lang + "," + aLocale);
-                
-                for (Object param : req.getParameterMap().keySet()) {
+                
+                for (String key : reqParams.keySet()) {
+                        if (!key.startsWith(paramPrefix) && !key.startsWith(outParamPrefix)) {
+                                logger.debug("UnicornCall parameter: " + key + " - " + (String) reqParams.get(key));
+                                aUnicornCall.addParameter(key, (String) reqParams.get(key)); 
+                                continue;
+                        }
+                        
+                        if (key.startsWith(outParamPrefix)) {
+                                logger.debug("Specific parameter: " + key + " - " + (String) reqParams.get(key));
+                                String paramName = key.substring(outParamPrefix.length());
+                                mapOfSpecificParameter.put(paramName, (String) reqParams.get(key));
+                                continue;
+                        }
+                        
+                        if (key.startsWith(paramPrefix)) {
+                                String paramName = key.substring(paramPrefix.length());
+                                
+                                if (paramName.equals("lang")) {
+                                        logger.debug("Lang parameter: " + key + " - " + (String) reqParams.get(key));
+                                        String lang = getLanguage((String) reqParams.get(key), req, null);
+                                        mapOfOutputParameter.put(paramName, lang);
+                                        String aLocale = convertEnumerationToString(req.getLocales());          
+                                        if (null == aLocale)
+                                                aUnicornCall.setLang(lang + "," + Property.get("DEFAULT_LANGUAGE"));
+                                        else
+                                                aUnicornCall.setLang(lang + "," + aLocale);
+                                        if (!lang.equals(reqParams.get(key))) {
+                                                logger.debug("Lang parameter unsupported. Resolved to: " + lang);
+                                        }
+                                } else if (paramName.equals("task")) {
+                                        logger.debug("Task parameter: " + key + " - " + (String) reqParams.get(key));
+                                        String task = getTask((String) reqParams.get(key), messages);
+                                        if (!task.equals(reqParams.get(key))) {
+                                                mapOfStringObject.put("default_task", Framework.mapOfTask.get(Framework.mapOfTask.getDefaultTaskId()));
+                                                logger.debug("Task parameter unsupported. Resolved to: " + task);
+                                        }
+                                        aUnicornCall.setTask(task);
+                                } else if (outputParams.contains(paramName)) {
+                                        logger.debug("Output parameter: " + key + " - " + (String) reqParams.get(key));
+                                        mapOfOutputParameter.put(paramName, (String) reqParams.get(key));
+                                        continue;
+                                } else if (paramName.equals("uri")) {
+                                        logger.debug("Uri parameter: " + key + " - " + (String) reqParams.get(key));
+                                        aUnicornCall.setEnumInputMethod(EnumInputMethod.URI);
+                                        String uri = (String) reqParams.get(key);
+                                        if (uri.length() < 7 || !uri.substring(0, 7).equals("http://")) {
+                                                uri = "http://" + uri;
+                                        }
+                                        aUnicornCall.setDocumentName(uri);
+                                        aUnicornCall.setInputParameterValue(uri);
+                                } else if (paramName.equals("text")) {
+                                        logger.debug("Text parameter: " + key + " - " + (String) reqParams.get(key));
+                                        aUnicornCall.setEnumInputMethod(EnumInputMethod.DIRECT);
+                                        aUnicornCall.setInputParameterValue((String) reqParams.get(key));
+                                } else if (paramName.equals("file")) {
+                                        logger.debug("File parameter: " + key + " - " + reqParams.get(key).toString());
+                                        Object object = reqParams.get(key);
+                                        if (object instanceof FileItem) {
+                                                aFileItemUploaded = (FileItem) object;
+                                                aUnicornCall.setDocumentName(aFileItemUploaded.getName());
+                                                aUnicornCall.setInputParameterValue(aFileItemUploaded);
+                                                aUnicornCall.setEnumInputMethod(EnumInputMethod.UPLOAD);
+                                        } else {
+                                                // TODO log "ucn_file not an instance of FileItem ?"
+                                        }
+                                } else {
+                                        logger.debug("Unknown parameter: " + key + " - " + (String) reqParams.get(key));
+                                        // TODO Warn that there is an unknown parameter which is added to unicornCall by default
+                                        aUnicornCall.addParameter(paramName, (String) reqParams.get(key));
+                                }
+                        }
+                }
+                
+                if (!reqParams.containsKey(paramPrefix + "lang")) {
+                        String lang = getLanguage(null, req, null);
+                        reqParams.put(paramPrefix + "lang", getLanguage(null, req, null));
+                        logger.debug("No language parameter found. Language negociation resolved language to: " + lang);
+                        mapOfOutputParameter.put("lang", lang);
+                        String aLocale = convertEnumerationToString(req.getLocales());          
+                        if (null == aLocale)
+                                aUnicornCall.setLang(lang + "," + Property.get("DEFAULT_LANGUAGE"));
+                        else
+                                aUnicornCall.setLang(lang + "," + aLocale);
+                }
+                
+                if (!reqParams.containsKey(paramPrefix + "task")) {
+                        String task = getTask(null, messages);
+                        reqParams.put(paramPrefix + "task", task);
+                        logger.debug("No task parameter found. Task parameter is set to task id: " + task);
+                        mapOfStringObject.put("default_task", Framework.mapOfTask.get(Framework.mapOfTask.getDefaultTaskId()));
+                        aUnicornCall.setTask(task);
+                }
+                
+                if (reqParams.containsKey(paramPrefix + "uri")) {
+                        //TODO vérifier que n'est pas vide
+                } else if (reqParams.containsKey(paramPrefix + "text")) {
+                        //TODO vérifier que n'est pas vide + vérifier présence de ucn_text_mime
+                } else if (reqParams.containsKey(paramPrefix + "file")) {
+                        //TODO vérifier que n'est pas vide
+                } else {
+                        //TODO aucun des 3 paramètres n'est présent -> erreur
+                }
+                
+                
+                
+                /*for (Object param : req.getParameterMap().keySet()) {
                         String sParamName = (String) param;
                         String[] tStringParamValue = req.getParameterValues(sParamName);
                         addParameter(sParamName, tStringParamValue, aUnicornCall, mapOfSpecificParameter, mapOfOutputParameter);
-                }
-                
-                addParameter(paramPrefix+ "task", task, aUnicornCall, mapOfSpecificParameter, mapOfOutputParameter);
+                }*/
+                
+                //addParameter(paramPrefix+ "task", task, aUnicornCall, mapOfSpecificParameter, mapOfOutputParameter);
                 
                 // POST operations
-                FileItem aFileItemUploaded = null;
-                if (req.getMethod().equals("POST") && ServletFileUpload.isMultipartContent(new ServletRequestContext(req))) {
+                //FileItem aFileItemUploaded = null;
+                /*if (req.getMethod().equals("POST") && ServletFileUpload.isMultipartContent(new ServletRequestContext(req))) {
                         messages.clear();
                         try {
@@ -154 +276 @@
                                 createError(req, resp, mess,mapOfSpecificParameter, mapOfOutputParameter);
                         }
-                }
+                }*/
                 
                 try {
@@ -174 +296 @@
                 } finally {
                         if ("true".equals(Property.get("DELETE_UPLOADED_FILES"))
-                                        && aFileItemUploaded != null
-                                        && aFileItemUploaded instanceof FileItem) {
+                                        && aFileItemUploaded != null) {
                                 aFileItemUploaded.delete();
                         }
@@ -198 +319 @@
          * @param mapOfOutputParameter
          */
-        private void addParameter(final String sParamName,
+        /*private void addParameter(final String sParamName,
                         final String sParamValue, final UnicornCall aUnicornCall,
-                        final Map<String, String[]> mapOfSpecificParameter,
+                        final Map<String, String> mapOfSpecificParameter,
                         final Map<String, String> mapOfOutputParameter) {
                 final String[] tStringValues = { sParamValue };
@@ -215 +336 @@
          * @param mapOfOutputParameter
          */
-        private void addParameter(String sParamName,
+        /*private void addParameter(String sParamName,
                         final String[] tStringParamValue, final UnicornCall aUnicornCall,
-                        final Map<String, String[]> mapOfSpecificParameter,
+                        final Map<String, String> mapOfSpecificParameter,
                         final Map<String, String> mapOfOutputParameter) {
 
@@ -280 +401 @@
                                         + "mime", tStringParamValue);
                 }
-        }
+        }*/
 
         private void createError(HttpServletRequest req, HttpServletResponse resp,
-                        Message mess, Map<String, String[]> mapOfSpecificParameter,
+                        Message mess, Map<String, String> mapOfSpecificParameter,
                         Map<String, String> mapOfOutputParameter) throws IOException, ServletException {
                 
@@ -304 +425 @@
         private void createOutput(HttpServletRequest req, HttpServletResponse resp,
                         Map<String, Object> mapOfStringObject, UnicornCall aUnicornCall,
-                        Map<String, String[]> mapOfSpecificParameter, Map<String, String> mapOfOutputParameter) throws IOException {
+                        Map<String, String> mapOfSpecificParameter, Map<String, String> mapOfOutputParameter) throws IOException {
                 
                 resp.setContentType(mapOfOutputParameter.get("mimetype") + "; charset=" + mapOfOutputParameter.get("charset"));