Changeset 234:142018e051a1

Timestamp:

08/31/09 15:00:15 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

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

Message:

unicorn now displays error messages on the index page instead of a dedicated page

Files:

• WebContent/WEB-INF/resources/templates/index.vm (modified) (1 diff)
• WebContent/scripts/w3c_unicorn_index.js (modified) (1 diff)
• WebContent/style/base_ucn.css (modified) (2 diffs)
• src/org/w3c/unicorn/action/IndexAction.java (modified) (2 diffs)
• src/org/w3c/unicorn/action/ObserveAction.java (modified) (6 diffs)
• src/org/w3c/unicorn/util/Message.java (added)

WebContent/WEB-INF/resources/templates/index.vm

@@ -12 +12 @@
 #end
 
+#if ($message)
+        <div id="messages">
+                <div class="error">
+                        <h4>$message.Message</h4>
+                        #if ($message.Content)
+                        <pre>$message.Content</pre>
+                        #end
+                </div>
+        </div>
+#end
         <div id="frontforms">
                 <ul id="tabset_tabs">

WebContent/scripts/w3c_unicorn_index.js

@@ -63 +63 @@
                 W3C.TaskOptions.addEvent('mouseout', function() {
                         W3C.TaskDescrip.set('text', W3C.TaskOptions[W3C.SelectedTask].title);
+                });
+                
+                $$('div.error').addClass('pointer');
+                
+                $$('div.error pre').slide('hide');
+                
+                $$('div.error').each(function(error) {
+                        error.addEvent('click', function(event) {
+                                error.getElement('pre').slide('toggle');
+                        });
                 });
                 

WebContent/style/base_ucn.css

@@ -304 +304 @@
         color:#A3756E;
 }
-
-/* After javascript */
+#messages {
+        padding:0.8em;
+        font-size:0.9em;
+        border:3px solid #FBC2C4;
+        background: #FBE3E4;
+        color:#8A1F11;
+        margin:1.2em 2.3em;
+}
+#messages .error {
+        
+}
+#messages .error h4 {
+        line-height:18px;
+        padding-left:22px;
+        background:url(../images/icone_error.png) no-repeat scroll left top;
+}
+#messages .error pre {
+        padding-top:0.6em;
+}
+#messages .pointer:hover h4 {
+        text-decoration: underline;
+}
+
+/* Post-javascript */
 fieldset.toggles legend {
         background:url(../images/arrow-closed.png) no-repeat scroll 0.2em 0.35em;
@@ -316 +338 @@
         cursor: pointer;
 }
-#observations .pointer {
+.pointer {
         cursor: pointer;
 }

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

@@ -10 +10 @@
 import org.w3c.unicorn.Framework;
 import org.w3c.unicorn.language.Language;
+import org.w3c.unicorn.util.Message;
 import org.w3c.unicorn.util.Property;
 import org.w3c.unicorn.util.Templates;
@@ -47 +48 @@
                 velocityContext.put("current_task", Framework.mapOfTask.get(taskParameter));
                 
+                if (req.getAttribute("unicorn_message") != null)
+                        //System.out.println("TOM: " + ((Message) req.getAttribute("unicorn_message")).getMessage());
+                        velocityContext.put("message", req.getAttribute("unicorn_message"));
+                
                 if (req.getHeader("X-Requested-With") != null && req.getHeader("X-Requested-With").equals("XMLHttpRequest")) {
                         //for JavaScript testing purposes

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

@@ -1 @@
-// $Id: ObserveAction.java,v 1.3 2009-08-31 11:59:09 tgambet Exp $
+// $Id: ObserveAction.java,v 1.4 2009-08-31 15:00:15 tgambet Exp $
 // Author: Jean-Guilhem Rouel
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2006.
@@ -37 +37 @@
 import org.w3c.unicorn.output.OutputFormater;
 import org.w3c.unicorn.output.OutputModule;
+import org.w3c.unicorn.util.Message;
 import org.w3c.unicorn.util.Property;
 
@@ -98 +99 @@
                 logger.debug("Lang Parameter: " + langParameter);
                 
-                //velocityContext = new VelocityContext(Language.getContext(langParameter));
+                
                 
                 // Variables related to the output
@@ -125 +126 @@
                         this.addParameter(sParamName, tStringParamValue, aUnicornCall,
                                         mapOfSpecificParameter, mapOfOutputParameter);
-                } // For
-
-                if (aUnicornCall.getTask() == null) {
+                }
+                
+                if (aUnicornCall.getTask() == null)
+                        aUnicornCall.setTask(Framework.mapOfTask.getDefaultTaskId());
+
+                /*if (aUnicornCall.getTask() == null) {
                         ObserveAction.logger.error("No task selected.");
                         this.createError(resp, new NoTaskException(),
                                         mapOfSpecificParameter, mapOfOutputParameter);
                         return;
-                }
-
+                }*/
+                
+                
                 try {
                         aUnicornCall.doTask();
@@ -142 +147 @@
                         ObserveAction.logger.error("Exception : " + aException.getMessage(),
                                         aException);
-                        this.createError(resp, aException,
-                                        mapOfSpecificParameter, mapOfOutputParameter);
+                        
+                        if (mapOfOutputParameter.get("format").equals("xhtml10")) {
+                                String errorMessage = (String) Framework.getLanguageProperties().get(langParameter).get("stack_trace_text");
+                                String errorContent = "";
+                                errorContent += aException.getMessage() + "\n";
+                                for (StackTraceElement stackTraceElement : aException.getStackTrace()) {
+                                        errorContent += stackTraceElement.toString() + "\n";
+                                }
+                                Message mess = new Message(Message.Level.ERROR, errorMessage, errorContent);
+                                req.setAttribute("unicorn_message", mess);
+                                (new IndexAction()).doGet(req, resp);
+                                
+                        } else {
+                                this.createError(resp, aException, mapOfSpecificParameter, mapOfOutputParameter);
+                        }
+                        
                 }
         }
@@ -235 +254 @@
                         ObserveAction.logger.error("Exception : " + aException.getMessage(),
                                         aException);
-                        this.createError(resp, aException,
-                                        mapOfSpecificParameter, mapOfOutputParameter);
+                        
+                        if (mapOfOutputParameter.get("format").equals("xhtml10")) {
+                                (new IndexAction()).doGet(req, resp);
+                        } else {
+                                this.createError(resp, aException, mapOfSpecificParameter, mapOfOutputParameter);
+                        }
+                        
                 } finally {
                         if ("true".equals(Property.get("DELETE_UPLOADED_FILES"))