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

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

Revision: 3343
          http://openutils.svn.sourceforge.net/openutils/?rev=3343&view=rev
Author:   diego_schivo
Date:     2011-02-16 19:11:45 +0000 (Wed, 16 Feb 2011)

Log Message:
-----------
MEDIA-218 search parameters

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

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java	2011-02-16 18:26:23 UTC (rev 3342)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java	2011-02-16 19:11:45 UTC (rev 3343)
@@ -24,13 +24,17 @@
 import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.cms.i18n.Messages;
 import info.magnolia.cms.util.AlertUtil;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.zip.ZipFile;
 
 import javax.jcr.RepositoryException;
@@ -42,6 +46,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.zip.DefaultZipImporter;
 import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporter;
 import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporterException;
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -83,6 +88,8 @@
 
     private String playlistUUID;
 
+    private String playlistSearch;
+
     /**
      * @param name command name
      * @param request
@@ -115,6 +122,28 @@
                 log.warn("Error retrieving media {}", actMedia);
             }
         }
+        if (!StringUtils.isEmpty(playlistUUID))
+        {
+            Content playlistContent = ContentUtil.getContentByUUID(PlaylistConstants.REPO, playlistUUID);
+            try
+            {
+                if (playlistContent.hasContent("search"))
+                {
+                    List<String> params = new ArrayList<String>();
+                    for (Content content : playlistContent.getContent("search").getChildren())
+                    {
+                        String paramName = NodeDataUtil.getString(content, "name");
+                        String paramValue = NodeDataUtil.getString(content, "value");
+                        params.add(paramName + "=" + paramValue);
+                    }
+                    playlistSearch = StringUtils.join(params, '&');
+                }
+            }
+            catch (RepositoryException e)
+            {
+                // should never happen
+            }
+        }
     }
 
     /**
@@ -345,6 +374,24 @@
     }
 
     /**
+     * Returns the playlistSearch.
+     * @return the playlistSearch
+     */
+    public String getPlaylistSearch()
+    {
+        return playlistSearch;
+    }
+
+    /**
+     * Sets the playlistSearch.
+     * @param playlistSearch the playlistSearch to set
+     */
+    public void setPlaylistSearch(String playlistSearch)
+    {
+        this.playlistSearch = playlistSearch;
+    }
+
+    /**
      * {@inheritDoc}
      */
     @Override

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2011-02-16 18:26:23 UTC (rev 3342)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2011-02-16 19:11:45 UTC (rev 3343)
@@ -137,7 +137,7 @@
   setTimeout(function() {
     setTreeCollapsed(false);
     frames['mediaTreeView'].location.href = getTreeUrl();
-    frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistUUID=${this.playlistUUID!''}&query=hello&type=video&type=document";
+    frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistUUID=${this.playlistUUID!''}&${this.playlistSearch!''}";
     if (openPath != null && openPath != "null" && openPath.length > 0)
     {
       reloadFolder(openPath);


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