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

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

Revision: 2766
          http://openutils.svn.sourceforge.net/openutils/?rev=2766&view=rev
Author:   diego_schivo
Date:     2010-06-30 16:55:11 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
MEDIA-145 maxresults no more needed because of pagination

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/configuration/MediaConfigurationManager.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 16:48:00 UTC (rev 2765)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java	2010-06-30 16:55:11 UTC (rev 2766)
@@ -58,8 +58,6 @@
 
     private String defaultBasePath;
 
-    private int maxresults = 10000;
-
     /**
      * Returns the filters.
      * @return the filters
@@ -83,15 +81,6 @@
         this.defaultBasePath = defaultBasePath;
     }
 
-    /**
-     * Sets the maxresults.
-     * @param maxresults the maxresults to set
-     */
-    public void setMaxresults(int maxresults)
-    {
-        this.maxresults = maxresults;
-    }
-
     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/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2010-06-30 16:48:00 UTC (rev 2765)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2010-06-30 16:55:11 UTC (rev 2766)
@@ -405,47 +405,51 @@
     public AdvancedResult find(String mediaType, String path, String search, boolean childrenOnly, String sorting,
         int itemsPerPage, int pageNumberStartingFromOne)
     {
-        Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(MediaModule.REPO);
+        Criteria c = JCRCriteriaFactory.createCriteria().setWorkspace(MediaModule.REPO);
 
         // base path
         path = StringUtils.removeEnd(StringUtils.removeStart(StringUtils.trimToEmpty(path), "/"), "/");
         if (!StringUtils.isEmpty(path))
         {
-            criteria.setBasePath("//" + path + (childrenOnly ? "/*" : "//*"));
+            c.setBasePath("//" + path + (childrenOnly ? "/*" : "//*"));
         }
 
         // node type
-        criteria.add(Restrictions.eq("@jcr:primaryType", MGNL_MEDIA_TYPE));
+        c.add(Restrictions.eq("@jcr:primaryType", MGNL_MEDIA_TYPE));
 
         // media type
         if (!StringUtils.isEmpty(mediaType))
         {
-            criteria.add(Restrictions.eq("@type", mediaType));
+            c.add(Restrictions.eq("@type", mediaType));
         }
 
         // search text
         if (!StringUtils.isEmpty(search))
         {
-            criteria.add(Restrictions.contains(".", search));
+            c.add(Restrictions.contains(".", search));
         }
 
         // sorting
-        if (MediaFolderViewPage.SORT_BY_CREATIONDATE.equals(sorting))
+        if (MediaFolderViewPage.SORT_BY_SCORE.equals(sorting))
         {
-            criteria.addOrder(Order.asc("@jcr:created"));
+            c.addOrder(Order.desc("@jcr:score"));
         }
+        else if (MediaFolderViewPage.SORT_BY_CREATIONDATE.equals(sorting))
+        {
+            c.addOrder(Order.asc("@jcr:created"));
+        }
         else if (MediaFolderViewPage.SORT_BY_TITLE.equals(sorting))
         {
-            criteria.addOrder(Order.asc("@title"));
+            c.addOrder(Order.asc("@title"));
         }
 
         // paging
         if (itemsPerPage > 0)
         {
-            criteria.setPaging(itemsPerPage, pageNumberStartingFromOne);
+            c.setPaging(itemsPerPage, pageNumberStartingFromOne);
         }
 
-        return criteria.execute();
+        return c.execute();
     }
 
     /**


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