[Openutils-svn] SF.net SVN: openutils:[2753] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media

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

Revision: 2753
          http://openutils.svn.sourceforge.net/openutils/?rev=2753&view=rev
Author:   diego_schivo
Date:     2010-06-30 10:32:48 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
MEDIA-145 possibility to filter on media types (media counting)

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java	2010-06-30 10:27:26 UTC (rev 2752)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java	2010-06-30 10:32:48 UTC (rev 2753)
@@ -93,12 +93,12 @@
     /**
      * {@inheritDoc}
      */
-    public AdvancedResult search(HttpServletRequest request, String basePath)
+    public AdvancedResult search(HttpServletRequest request, String mediaType, String basePath)
     {
-        return search(request, basePath, maxresults, 1);
+        return search(request, mediaType, basePath, maxresults, 1);
     }
 
-    public AdvancedResult search(HttpServletRequest request, String basePath,
+    public AdvancedResult search(HttpServletRequest request, String mediaType, String basePath,
         int itemsPerPage, int pageNumberStartingFromOne)
     {
 
@@ -137,6 +137,12 @@
         // set type
         c.add(Restrictions.eq("@jcr:primaryType", "mgnl:media"));
 
+        // media type
+        if (!StringUtils.isEmpty(mediaType))
+        {
+            c.add(Restrictions.eq("@type", mediaType));
+        }
+
         return c.execute();
     }
 

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 10:27:26 UTC (rev 2752)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2010-06-30 10:32:48 UTC (rev 2753)
@@ -87,11 +87,11 @@
         if ("xml".equals(format))
         {
             // paging disabled for xml requests
-            contentMediaDetails = configuration.search(request, null);
+            contentMediaDetails = configuration.search(request, null, null);
         }
         else
         {
-            contentMediaDetails = configuration.search(request, "/", items, page);
+            contentMediaDetails = configuration.search(request, null, "/", items, page);
         }
 
         setNumberOfMedia(new HashMap<String, Integer>());


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