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

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

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

Log Message:
-----------
MEDIA-145 repository is always media

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:21:56 UTC (rev 2750)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java	2010-06-30 10:24:33 UTC (rev 2751)
@@ -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.lifecycle.MediaModule;
 
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -92,12 +93,12 @@
     /**
      * {@inheritDoc}
      */
-    public AdvancedResult search(HttpServletRequest request, String basePath, String repository)
+    public AdvancedResult search(HttpServletRequest request, String basePath)
     {
-        return search(request, basePath, repository, maxresults, 1);
+        return search(request, basePath, maxresults, 1);
     }
 
-    public AdvancedResult search(HttpServletRequest request, String basePath, String repository,
+    public AdvancedResult search(HttpServletRequest request, String basePath,
         int itemsPerPage, int pageNumberStartingFromOne)
     {
 
@@ -119,7 +120,7 @@
         Criteria c = JCRCriteriaFactory.createCriteria();
 
         c.setBasePath(sb.toString());
-        c.setWorkspace(repository);
+        c.setWorkspace(MediaModule.REPO);
 
         c.setPaging(itemsPerPage, pageNumberStartingFromOne);
         c.addOrder(Order.desc("@jcr:score"));

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:21:56 UTC (rev 2750)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2010-06-30 10:24:33 UTC (rev 2751)
@@ -87,11 +87,11 @@
         if ("xml".equals(format))
         {
             // paging disabled for xml requests
-            contentMediaDetails = configuration.search(request, null, "media");
+            contentMediaDetails = configuration.search(request, null);
         }
         else
         {
-            contentMediaDetails = configuration.search(request, "/", "media", items, page);
+            contentMediaDetails = configuration.search(request, "/", 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.