Changeset 286:001ecebe946a

Timestamp:

09/04/09 17:59:43 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

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

Message:

refactoring in progress

Location:

src/org/w3c/unicorn/action

Files:

• Action.java (modified) (1 diff)
• IndexAction.java (modified) (6 diffs)
• ObserveAction.java (modified) (6 diffs)

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

@@ -1 +1 @@
 package org.w3c.unicorn.action;
 
+import java.io.IOException;
+import java.net.URLConnection;
+import java.util.ArrayList;
+
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.w3c.unicorn.Framework;
+import org.w3c.unicorn.util.Language;
+import org.w3c.unicorn.util.Message;
+import org.w3c.unicorn.util.Property;
 
 public abstract class Action extends HttpServlet {
         
         private static final long serialVersionUID = 1L;
+        
+        @Override
+        protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+                        throws ServletException, IOException {
+                
+                if (!Framework.isUcnInitialized) {
+                        resp.sendError(500, "Unicorn is not initialized properly. Check logs.");
+                        return;
+                }
+                
+                ArrayList<Message> messages = new ArrayList<Message>();
+                
+                String langParameter = req.getParameter(Property.get("UNICORN_PARAMETER_PREFIX") + "lang");
+                if (langParameter == null || !Framework.getLanguageProperties().containsKey(langParameter))
+                        langParameter = Language.negociate(req.getLocales());
+                
+                if (!langParameter.equals(req.getLocale().getLanguage()))
+                        messages.add(new Message(Message.Level.INFO, "$message_unavailable_language (" + req.getLocale().getDisplayLanguage(req.getLocale()) + "). $message_translation", null));
+                
+                if (!Language.isComplete(langParameter))
+                        messages.add(new Message(Message.Level.INFO, "$message_incomplete_language. $message_translation", null));
+                
+                
+                
+                
+        }
+
+        protected String getQueryStringWithout(String parameterName, HttpServletRequest req) {
+                String query = req.getQueryString();
+                String queryString;
+                if (query == null) {
+                        queryString = "./?";
+                } else {
+                        queryString = "?";
+                        queryString += query.replaceAll("&?" + parameterName + "=[^&]*", "");
+                        if (!queryString.equals("?"))
+                                queryString += "&";
+                }
+                return queryString;
+        }
+
+        @Override
+        protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+                        throws ServletException, IOException {
+                // TODO Auto-generated method stub
+                super.doPost(req, resp);
+        }
+
+        @Override
+        public void init() throws ServletException {
+                // TODO Auto-generated method stub
+                super.init();
+        }
+        
+        
 
 }

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

@@ +1 @@
+// $Id: IndexAction.java,v 1.11 2009-09-04 17:59:43 tgambet Exp $Id $
+// Author: Thomas Gambet
+// (c) COPYRIGHT MIT, ERCIM and Keio, 2009.
+// Please first read the full copyright statement in file COPYRIGHT.html
 package org.w3c.unicorn.action;
 
@@ -8 +12 @@
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.velocity.VelocityContext;
 import org.w3c.unicorn.Framework;
@@ -17 +23 @@
 public class IndexAction extends Action {
 
-        private static final long serialVersionUID = 1L;
+        private static final long serialVersionUID = 599055553694915687L;
+        
+        private static Log logger = LogFactory.getLog(IndexAction.class);
+        
         private VelocityContext velocityContext;
         
         @Override
         public void init() throws ServletException {
-                super.init();
+                //logger.trace("Init IndexAction");
+                //super.init();
         }
         
@@ -41 +51 @@
                 if (langParameter == null || !Framework.getLanguageProperties().containsKey(langParameter)) {
                         langParameter = Language.negociate(req.getLocales());
-                        if (!langParameter.equals(req.getLocale().getLanguage())) {
-                                messages.add(new Message(Message.Level.INFO, "$message_unavailable_language (" + req.getLocale().getDisplayLanguage(req.getLocale()) + "). $message_translation", null));
-                        } else {
-                                String requested_parameter = req.getParameter(Property.get("UNICORN_PARAMETER_PREFIX") + "lang");
-                                if (requested_parameter != null && !Framework.getLanguageProperties().containsKey(requested_parameter)) 
-                                        messages.add(new Message(Message.Level.INFO, "$message_unavailable_requested_language. $message_translation", null));
-                        }
+                }
+                
+                if (!langParameter.equals(req.getLocale().getLanguage())) {
+                        messages.add(new Message(Message.Level.INFO, "$message_unavailable_language (" + req.getLocale().getDisplayLanguage(req.getLocale()) + "). $message_translation", null));
                 }
                 
@@ -55 +62 @@
                 velocityContext = new VelocityContext(Language.getContext(langParameter));
                 
-                String query = req.getQueryString();
+                velocityContext.put("queryString", getQueryStringWithout(Property.get("UNICORN_PARAMETER_PREFIX") + "lang", req));
+                
+                /*String query = req.getQueryString();
                 String queryString;
                 if (query == null) {
@@ -72 +81 @@
                 if (!queryString.equals("?"))
                         queryString += "&";*/
-                velocityContext.put("queryString", queryString);
+                //velocityContext.put("queryString", queryString);
                 
                 /*messages.add(new Message(Message.Level.WARNING, "un warning", null));

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

@@ -1 @@
-// $Id: ObserveAction.java,v 1.11 2009-09-03 14:04:12 tgambet Exp $
+// $Id: ObserveAction.java,v 1.12 2009-09-04 17:59:43 tgambet Exp $
 // Author: Jean-Guilhem Rouel
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2006.
@@ -33 +33 @@
 import org.w3c.unicorn.UnicornCall;
 import org.w3c.unicorn.contract.EnumInputMethod;
+import org.w3c.unicorn.exceptions.UnsupportedMimeTypeException;
 import org.w3c.unicorn.output.OutputFactory;
 import org.w3c.unicorn.output.OutputFormater;
@@ -46 +47 @@
  * @author Jean-Guilhem ROUEL
  */
-public class ObserveAction extends HttpServlet {
-
-        private static final Log logger = LogFactory.getLog(ObserveAction.class);
+public class ObserveAction extends Action {
 
         private static final long serialVersionUID = -1375355420965607571L;
-
-        private static final DiskFileItemFactory factory = new DiskFileItemFactory();
+        
+        private static Log logger = LogFactory.getLog(ObserveAction.class);
+
+        private static DiskFileItemFactory factory;
 
         /**
          * Creates a new file upload handler.
          */
-        private static final ServletFileUpload upload = new ServletFileUpload(
-                        ObserveAction.factory);
+        private static ServletFileUpload upload;
 
         /*
@@ -66 +66 @@
          */
         @Override
-        public void init(final ServletConfig aServletConfig)
-                        throws ServletException {
-                ObserveAction.logger.trace("init");
-
-                ObserveAction.factory.setRepository(new File(Property
-                                .get("UPLOADED_FILES_REPOSITORY")));
-
+        public void init(final ServletConfig aServletConfig) throws ServletException {
+                logger.trace("Init ObserverAction");
+                super.init();
+                
+                factory = new DiskFileItemFactory();
+                factory.setRepository(new File(Property.get("UPLOADED_FILES_REPOSITORY")));
+                upload = new ServletFileUpload(factory);
+                logger.debug("Created a ServletFileUpload with repository set to: " + Property.get("UPLOADED_FILES_REPOSITORY"));
         }
 
@@ -166 +167 @@
                         this.createOutput(resp, aUnicornCall,
                                         mapOfSpecificParameter, mapOfOutputParameter, mapOfStringObject);
+                } catch (final UnsupportedMimeTypeException aException) {
+                        if (mapOfOutputParameter.get("mimetype").equals("text/html")) {
+                                Message mess = new Message(Message.Level.ERROR, "$message_unsupported_mime_type", null);
+                                req.setAttribute("unicorn_message", mess);
+                                (new IndexAction()).doGet(req, resp);
+                                
+                        }
                 } catch (final Exception aException) {
                         ObserveAction.logger.error("Exception : " + aException.getMessage(),
@@ -291 +299 @@
                         this.createOutput(resp, aUnicornCall,
                                         mapOfSpecificParameter, mapOfOutputParameter, mapOfStringObject);
-                } catch (final IOException aException) {
-                
+                } catch (final UnsupportedMimeTypeException aException) {
+                        if (mapOfOutputParameter.get("mimetype").equals("text/html")) {
+                                Message mess = new Message(Message.Level.ERROR, "$message_unsupported_mime_type", null);
+                                req.setAttribute("unicorn_message", mess);
+                                (new IndexAction()).doGet(req, resp);
+                                
+                        }
                 } catch (final Exception aException) {
                         ObserveAction.logger.error("Exception : " + aException.getMessage(),