[Yanel-commits] rev 23276 - public/yanel/trunk/src/core/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2007-03-15 14:19:38 +0100 (Thu, 15 Mar 2007)
New Revision: 23276

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
exception toolbar

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-03-15 12:59:40 UTC (rev 23275)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-03-15 13:19:38 UTC (rev 23276)
@@ -572,6 +572,8 @@
             if (toolbar != null && toolbar.equals("on")) {
                 String mimeType = view.getMimeType();
                 if (mimeType != null && mimeType.indexOf("html") > 0) {
+                    // TODO: What about other query strings or frames or TinyMCE?
+                    if (request.getParameter("yanel.resource.usecase") == null) {
                     if (toolbarMasterSwitch.equals("on")) {
                         OutputStream os = response.getOutputStream();
                         try {
@@ -589,8 +591,11 @@
                     } else {
                         log.info("Toolbar has been disabled. Please check web.xml!");
                     }
+                    } else {
+                        log.error("DEBUG: Exception to the rule: " + request.getParameter("yanel.resource.usecase"));
+                    }
                 } else {
-                    log.error("DEBUG: No HTML related mime type: " + mimeType);
+                    log.debug("No HTML related mime type: " + mimeType);
                 }
             } else {
                 log.debug("Toolbar is turned off.");