[Openutils-svn] SF.net SVN: openutils:[2760] trunk/openutils-mgnlmedia/src/main

[<die...@us...>]

Revision: 2760
          http://openutils.svn.sourceforge.net/openutils/?rev=2760&view=rev
Author:   diego_schivo
Date:     2010-06-30 13:54:56 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
MEDIA-145 refactoring

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2010-06-30 13:15:14 UTC (rev 2759)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2010-06-30 13:54:56 UTC (rev 2760)
@@ -40,8 +40,6 @@
 
     private static final String VIEW_RESULTS_XML = "-xml";
 
-    private String queryString;
-
     private String format;
 
     private AdvancedResult contentMediaDetails;
@@ -109,34 +107,6 @@
             setType(selectTab);
         }
 
-        StringBuilder qs = new StringBuilder();
-        for (Object objKey : request.getParameterMap().keySet())
-        {
-            String key = (String) objKey;
-            if ("command".equals(key) || "type".equals(key))
-            {
-                continue;
-            }
-            Object objValue = request.getParameterMap().get(key);
-            if (objValue.getClass().isArray())
-            {
-                for (String value : (String[]) objValue)
-                {
-                    if (qs.length() > 0)
-                    {
-                        qs.append("&");
-                    }
-                    qs.append(key).append("=").append(value);
-                }
-            }
-            else
-            {
-                qs.append(key).append("=").append(objValue);
-            }
-        }
-        queryString = qs.toString();
-
-        setSearch(queryString);
         if (!StringUtils.isNotBlank(selectTab))
         {
             selectTab = getType();
@@ -151,24 +121,6 @@
     }
 
     /**
-     * Returns the queryString.
-     * @return the queryString
-     */
-    public String getQueryString()
-    {
-        return queryString;
-    }
-
-    /**
-     * Sets the queryString.
-     * @param queryString the queryString to set
-     */
-    public void setQueryString(String queryString)
-    {
-        this.queryString = queryString;
-    }
-
-    /**
      * Returns the format.
      * @return the format
      */

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-30 13:15:14 UTC (rev 2759)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-30 13:54:56 UTC (rev 2760)
@@ -38,7 +38,6 @@
 import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
 
 import java.io.IOException;
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -48,7 +47,6 @@
 import java.util.Map;
 
 import javax.jcr.RepositoryException;
-import javax.print.attribute.standard.RequestingUserName;
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
@@ -842,29 +840,33 @@
     }
 
     /**
+     * Obtains the query string to use for reloading the current page.<br>
+     * Unwanted parameters are removed.
+     * @return
+     */
+    public String currentQueryString()
+    {
+        String s = request.getQueryString();
+        s = StringUtils.isEmpty(s) ? StringUtils.EMPTY : "&" + s;
+        int p1;
+        while ((p1 = StringUtils.indexOfAny(s, new String[]{
+            "&type=", "&command="
+        })) != -1)
+        {
+            int p2 = s.indexOf('&', p1 + 1);
+            s = s.substring(0, p1) + (p2 != -1 ? s.substring(p2) : StringUtils.EMPTY);
+        }
+        return s.substring(1);
+    }
+
+    /**
      * Builds the href for the media type link in the navigation bar.
      * @param type
      * @return
      */
     public String mediatabLink(MediaTypeConfiguration type)
     {
-        String link = "?" + StringUtils.defaultString(request.getQueryString());
-        int p1 = StringUtils.indexOfAny(link, new String[]{
-            "?type=", "&type="
-        });
-        if (p1 == -1)
-        {
-            link += ("?".equals(link) ? StringUtils.EMPTY : "&") + "type=" + type.getName();
-        }
-        else
-        {
-            int p2 = StringUtils.indexOf(link, '&', p1 + 1);
-            if (p2 == -1)
-            {
-                p2 = link.length();
-            }
-            link = StringUtils.substring(link, 0, p1 + 1) + "type=" + type.getName() + StringUtils.substring(link, p2);
-        }
-        return link;
+        String s = currentQueryString();
+        return '?' + s + (s.length() > 0 ? '&' : StringUtils.EMPTY) + "type=" + type.getName();
     }
 }

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html	2010-06-30 13:15:14 UTC (rev 2759)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html	2010-06-30 13:54:56 UTC (rev 2760)
@@ -6,7 +6,7 @@
   [#assign dateUtils = this.getStatic("net.sourceforge.openutils.elfunctions.DateElUtils")]
   [#assign cal = this.getStatic("java.util.Calendar")]
   [#assign mediaEl = this.getStatic("net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl")]
-  <location><![CDATA[${mgnlEl.baseUrl()}/media/search?${this.queryString}]]></location>
+  <location><![CDATA[${mgnlEl.baseUrl()}/media/search?${this.currentQueryString()}]]></location>
   <date>${dateUtils.toXsdDate(cal.getInstance())}</date>
   <meta rel="page">${this.contentMediaDetails.page}</meta>
   <meta rel="itemsperpage">${this.contentMediaDetails.itemsPerPage}</meta>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.