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

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

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

Log Message:
-----------
MEDIA-145 refactoring

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 15:34:23 UTC (rev 2764)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java	2010-06-30 16:48:00 UTC (rev 2765)
@@ -33,6 +33,7 @@
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
 import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilter;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage;
 
@@ -94,29 +95,42 @@
     public AdvancedResult search(HttpServletRequest request, String mediaType, String basePath, String sorting,
         int itemsPerPage, int pageNumberStartingFromOne)
     {
+        Criteria c = JCRCriteriaFactory.createCriteria().setWorkspace(MediaModule.REPO).add(
+            Restrictions.eq("@jcr:primaryType", MediaConfigurationManager.MEDIA.getSystemName()));
 
-        StringBuilder sb = new StringBuilder();
+        // base path
         if (basePath == null)
         {
             // use default
-            sb.append("/").append(defaultBasePath).append("//*");
+            basePath = '/' + defaultBasePath + "//*";
         }
-        if (StringUtils.isBlank(basePath) || basePath.equals("/"))
+        else if (StringUtils.isEmpty(basePath) || basePath.equals("/"))
         {
-            sb.append("//*");
+            basePath = "//*";
         }
         else
         {
-            sb.append("/").append(basePath).append("//*");
+            basePath = '/' + basePath + "//*";
         }
+        c.setBasePath(basePath);
 
-        Criteria c = JCRCriteriaFactory.createCriteria();
+        // media type
+        if (!StringUtils.isEmpty(mediaType))
+        {
+            c.add(Restrictions.eq("@type", mediaType));
+        }
 
-        c.setBasePath(sb.toString());
-        c.setWorkspace(MediaModule.REPO);
+        // filters
+        List<Criterion> criterionList = new ArrayList<Criterion>();
+        for (String key : filters.keySet())
+        {
+            criterionList = filters.get(key).getCriterionList(key, request);
+            for (Criterion criterion : criterionList)
+            {
+                c.add(criterion);
+            }
+        }
 
-        c.setPaging(itemsPerPage, pageNumberStartingFromOne);
-
         // sorting
         if (MediaFolderViewPage.SORT_BY_SCORE.equals(sorting))
         {
@@ -131,24 +145,9 @@
             c.addOrder(Order.asc("@title"));
         }
 
-        List<Criterion> criterionList = new ArrayList<Criterion>();
-        for (String key : filters.keySet())
-        {
-            criterionList = filters.get(key).getCriterionList(key, request);
-            for (Criterion criterion : criterionList)
-            {
-                c.add(criterion);
-            }
-        }
-        // set type
-        c.add(Restrictions.eq("@jcr:primaryType", "mgnl:media"));
+        // paging
+        c.setPaging(itemsPerPage, pageNumberStartingFromOne);
 
-        // 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/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2010-06-30 15:34:23 UTC (rev 2764)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2010-06-30 16:48:00 UTC (rev 2765)
@@ -442,8 +442,7 @@
         // paging
         if (itemsPerPage > 0)
         {
-            criteria.setFirstResult((pageNumberStartingFromOne - 1) * itemsPerPage);
-            criteria.setMaxResults(itemsPerPage);
+            criteria.setPaging(itemsPerPage, pageNumberStartingFromOne);
         }
 
         return criteria.execute();


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