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

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

Revision: 2764
          http://openutils.svn.sourceforge.net/openutils/?rev=2764&view=rev
Author:   diego_schivo
Date:     2010-06-30 15:34:23 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
MEDIA-145 moved field "contentMediaDetails" to superclass

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
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.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 15:21:47 UTC (rev 2763)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java	2010-06-30 15:34:23 UTC (rev 2764)
@@ -91,14 +91,6 @@
         this.maxresults = maxresults;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public AdvancedResult search(HttpServletRequest request, String mediaType, String basePath)
-    {
-        return search(request, mediaType, basePath, MediaFolderViewPage.SORT_BY_SCORE, maxresults, 1);
-    }
-
     public AdvancedResult search(HttpServletRequest request, String mediaType, String basePath, String sorting,
         int itemsPerPage, int pageNumberStartingFromOne)
     {

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 15:21:47 UTC (rev 2763)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2010-06-30 15:34:23 UTC (rev 2764)
@@ -42,8 +42,6 @@
 
     private String format;
 
-    private AdvancedResult contentMediaDetails;
-
     private String selectTab;
 
     /**
@@ -78,7 +76,7 @@
             // no need to count media per type on xml requests
             return 0;
         }
-        return configuration.search(request, mtc.getName(), "/").getTotalSize();
+        return configuration.search(request, mtc.getName(), "/", SORT_BY_SCORE, 0, 1).getTotalSize();
     }
 
     /**
@@ -90,8 +88,7 @@
         // @todo defaultBasePath handling only on xml requests?
         if ("xml".equals(format))
         {
-            // paging disabled for xml requests
-            return configuration.search(request, type, null);
+            return configuration.search(request, null, null, SORT_BY_SCORE, items, page);
         }
         return configuration.search(request, type, "/", sorting, items, page);
     }
@@ -139,24 +136,6 @@
     }
 
     /**
-     * Returns the contentMediaDetails.
-     * @return the contentMediaDetails
-     */
-    public AdvancedResult getContentMediaDetails()
-    {
-        return contentMediaDetails;
-    }
-
-    /**
-     * Sets the contentMediaDetails.
-     * @param contentMediaDetails the contentMediaDetails to set
-     */
-    public void setContentMediaDetails(AdvancedResult contentMediaDetails)
-    {
-        this.contentMediaDetails = contentMediaDetails;
-    }
-
-    /**
      * Returns the selectTab.
      * @return the selectTab
      */

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 15:21:47 UTC (rev 2763)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-30 15:34:23 UTC (rev 2764)
@@ -140,6 +140,8 @@
 
     protected int items = 10;
 
+    protected AdvancedResult contentMediaDetails;
+
     /**
      * @param name
      * @param request
@@ -270,14 +272,14 @@
 
         medias = Iterators.emptyIterator();
         pages = Collections.emptyList();
-        AdvancedResult result = findMediaItems();
-        if (result != null)
+        contentMediaDetails = findMediaItems();
+        if (contentMediaDetails != null)
         {
             MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
             // casts Iterator<AdvancedResultItem> to Iterator<Content>
-            Iterator<Content> contentIterator = Iterators.filter(result.getItems(), Content.class);
+            Iterator<Content> contentIterator = Iterators.filter(contentMediaDetails.getItems(), Content.class);
             medias = Iterators.transform(contentIterator, new MediaBeanBuilder(mtc));
-            pages = MgnlPagingElFunctions.pageList(result.getNumberOfPages(), 5, "page");
+            pages = MgnlPagingElFunctions.pageList(contentMediaDetails.getNumberOfPages(), 5, "page");
         }
 
         return super.show();
@@ -832,6 +834,15 @@
         this.items = items;
     }
 
+    /**
+     * Returns the contentMediaDetails.
+     * @return the contentMediaDetails
+     */
+    public AdvancedResult getContentMediaDetails()
+    {
+        return contentMediaDetails;
+    }
+
     public boolean isSingleInstance()
     {
         return MediaEl.module().isSingleinstance();


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