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

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

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

Log Message:
-----------
MEDIA-145 adv-search page overriding count/find methods of folder-view page

Modified Paths:
--------------
    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/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2010-06-30 10:51:08 UTC (rev 2755)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2010-06-30 10:53:32 UTC (rev 2756)
@@ -79,22 +79,39 @@
         return super.getTemplateName(viewName);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
-    public String show()
+    protected int countMediaItems(MediaTypeConfiguration mtc)
     {
+        if ("xml".equals(format))
+        {
+            // no need to count media per type on xml requests
+            return 0;
+        }
+        return configuration.search(request, mtc.getName(), null).getTotalSize();
+    }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected AdvancedResult findMediaItems()
+    {
         // @todo defaultBasePath handling only on xml requests?
         if ("xml".equals(format))
         {
             // paging disabled for xml requests
-            contentMediaDetails = configuration.search(request, null, null);
+            return configuration.search(request, type, null);
         }
-        else
-        {
-            contentMediaDetails = configuration.search(request, null, "/", items, page);
-        }
+        return configuration.search(request, type, "/", items, page);
+    }
 
-        setNumberOfMedia(new HashMap<String, Integer>());
+    @Override
+    public String show()
+    {
+        super.show();
 
         selectTab = StringUtils.trimToEmpty(selectTab);
         if (StringUtils.isNotBlank(selectTab))
@@ -102,29 +119,6 @@
             setType(selectTab);
         }
 
-        // casts Iterator<AdvancedResultItem> to Iterator<Content>
-        Iterator<Content> contentIterator = Iterators.filter(contentMediaDetails.getItems(), Content.class);
-        medias = Iterators.filter(Iterators.transform(contentIterator, new Function<Content, MediaBean>()
-        {
-
-            /**
-             * {@inheritDoc}
-             */
-            public MediaBean apply(Content media)
-            {
-                MediaTypeConfiguration mtc = MediaConfigurationManager
-                    .getInstance()
-                    .getMediaTypeConfigurationFromMedia(media);
-                getNumberOfMedia().put(mtc.getName(), MapUtils.getInteger(getNumberOfMedia(), mtc.getName(), 0) + 1);
-                if (!"xml".equals(format) && (StringUtils.isBlank(getType()) || getType().equals(mtc.getName())))
-                {
-                    MediaBean mb = new MediaBeanBuilder(mtc).apply(media);
-                    return mb;
-                }
-                return null;
-            }
-        }), Predicates.notNull());
-
         StringBuilder qs = new StringBuilder();
         for (Object obj : request.getParameterMap().keySet())
         {


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