[Yanel-commits] rev 41572 - public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2009-02-13 11:23:01 +0100 (Fri, 13 Feb 2009)
New Revision: 41572

Modified:
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
Log:
query string also added

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2009-02-13 10:06:47 UTC (rev 41571)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2009-02-13 10:23:01 UTC (rev 41572)
@@ -405,7 +405,10 @@
         String backToRealm = PathUtil.backToRealm(getPath());
         transformer.setParameter("yanel.back2realm", backToRealm);
         transformer.setParameter("yarep.back2realm", backToRealm); // for backwards compatibility
-        String userAgent = getEnvironment().getRequest().getHeader("User-Agent");
+
+        // Set OS and client
+        javax.servlet.http.HttpServletRequest request = getEnvironment().getRequest();
+        String userAgent = request.getHeader("User-Agent");
         if (userAgent == null) {
              log.warn("Header contains no User-Agent!");
              userAgent = "null";
@@ -415,6 +418,13 @@
         if (os != null) transformer.setParameter("os", os);
         String client = getClient(userAgent);
         if (client != null) transformer.setParameter("client", client);
+
+        // Set query string
+        String queryString = request.getQueryString();
+        if (queryString != null) {
+            transformer.setParameter("yanel.request.query-string", queryString);
+        }
+
         // localization
         transformer.setParameter("language", getRequestedLanguage());
 
@@ -485,6 +495,7 @@
      */
     protected String getToolbarStatus() {
         // TODO: Use YanelServlet.TOOLBAR_KEY instead "toolbar"!
+        //javax.servlet.http.HttpSession session = getEnvironment().getRequest().getSession(true);
         javax.servlet.http.HttpSession session = getRequest().getSession(true);
         if (session != null) {
             return (String) session.getAttribute("toolbar");