Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2778] trunk/openutils-mgnlmedia/src/main
|
From: <die...@us...> - 2010-07-01 10:32:37
|
Revision: 2778
http://openutils.svn.sourceforge.net/openutils/?rev=2778&view=rev
Author: diego_schivo
Date: 2010-07-01 10:32:30 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
MEDIA-145 paging: configurable itemsPerPage
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/lifecycle/MediaModule.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
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
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-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-07-01 10:32:30 UTC (rev 2778)
@@ -58,6 +58,8 @@
private String defaultBasePath;
+ private int xmlItemsPerPage;
+
/**
* Returns the filters.
* @return the filters
@@ -81,6 +83,24 @@
this.defaultBasePath = defaultBasePath;
}
+ /**
+ * Returns the xmlItemsPerPage.
+ * @return the xmlItemsPerPage
+ */
+ public int getXmlItemsPerPage()
+ {
+ return xmlItemsPerPage;
+ }
+
+ /**
+ * Sets the xmlItemsPerPage.
+ * @param xmlItemsPerPage the xmlItemsPerPage to set
+ */
+ public void setXmlItemsPerPage(int xmlItemsPerPage)
+ {
+ this.xmlItemsPerPage = xmlItemsPerPage;
+ }
+
public AdvancedResult search(HttpServletRequest request, String mediaType, String path, boolean descendants,
String sorting, int itemsPerPage, int pageNumberStartingFromOne)
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-07-01 10:32:30 UTC (rev 2778)
@@ -59,6 +59,8 @@
private String version;
private SearchMediaQueryConfiguration search;
+
+ private int folderViewItemsPerPage;
/**
* Constructor
@@ -162,6 +164,24 @@
this.search = search;
}
+ /**
+ * Returns the folderViewItemsPerPage.
+ * @return the folderViewItemsPerPage
+ */
+ public int getFolderViewItemsPerPage()
+ {
+ return folderViewItemsPerPage;
+ }
+
+ /**
+ * Sets the folderViewItemsPerPage.
+ * @param folderViewItemsPerPage the folderViewItemsPerPage to set
+ */
+ public void setFolderViewItemsPerPage(int folderViewItemsPerPage)
+ {
+ this.folderViewItemsPerPage = folderViewItemsPerPage;
+ }
+
public static SearchMediaQueryConfiguration getSearchConfiguration()
{
return ((MediaModule) ModuleRegistry.Factory.getInstance().getModuleInstance(NAME)).getSearch();
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-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-07-01 10:32:30 UTC (rev 2778)
@@ -26,6 +26,7 @@
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
import org.apache.commons.lang.StringUtils;
@@ -88,9 +89,19 @@
// @todo defaultBasePath handling only on xml requests?
if ("xml".equals(format))
{
- return configuration.search(request, null, null, true, SORT_BY_SCORE, items, page);
+ return configuration.search(request, null, null, true, SORT_BY_SCORE, MediaEl
+ .module()
+ .getSearch()
+ .getXmlItemsPerPage(), page);
}
- return configuration.search(request, type, "/", true, sorting, items, page);
+ return configuration.search(
+ request,
+ type,
+ "/",
+ true,
+ sorting,
+ MediaEl.module().getFolderViewItemsPerPage(),
+ page);
}
@Override
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-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-07-01 10:32:30 UTC (rev 2778)
@@ -139,8 +139,6 @@
protected int page = 1;
- protected int items = 10;
-
protected AdvancedResult contentMediaDetails;
protected SearchMediaQueryConfiguration configuration;
@@ -240,7 +238,14 @@
}
writable = folder.isGranted(Permission.WRITE);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
- return configuration.search(request, type, path, false, sorting, items, page);
+ return configuration.search(
+ request,
+ type,
+ path,
+ false,
+ sorting,
+ MediaEl.module().getFolderViewItemsPerPage(),
+ page);
}
/**
@@ -802,24 +807,6 @@
}
/**
- * Returns the items.
- * @return the items
- */
- public int getItems()
- {
- return items;
- }
-
- /**
- * Sets the items.
- * @param items the items to set
- */
- public void setItems(int items)
- {
- this.items = items;
- }
-
- /**
* Returns the contentMediaDetails.
* @return the contentMediaDetails
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-07-01 10:32:30 UTC (rev 2778)
@@ -98,6 +98,12 @@
"player",
"jwplayer4"));
+ tasks.add(new CreateMissingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/config",
+ "folderViewItemsPerPage",
+ 10));
+
// MEDIA-70 new enabled property for media type
tasks.add(new CreateMissingPropertyTask(
ContentRepository.CONFIG,
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2010-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2010-07-01 10:32:30 UTC (rev 2778)
@@ -18,6 +18,9 @@
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
+ <sv:property sv:name="xmlItemsPerPage" sv:type="Long">
+ <sv:value>100</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -32,7 +35,7 @@
<sv:value>2010-02-15T17:07:25.390+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-04-20T16:07:41.931+02:00</sv:value>
+ <sv:value>2010-07-01T12:24:15.712+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="filters">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
