Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2010-06-30 07:23:27
|
Revision: 2740
http://openutils.svn.sourceforge.net/openutils/?rev=2740&view=rev
Author: diego_schivo
Date: 2010-06-30 07:23:21 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 @Override
Modified Paths:
--------------
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/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 07:22:51 UTC (rev 2739)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 07:23:21 UTC (rev 2740)
@@ -81,6 +81,7 @@
return super.getTemplateName(viewName);
}
+ @Override
public String show()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 08:25:17
|
Revision: 2742
http://openutils.svn.sourceforge.net/openutils/?rev=2742&view=rev
Author: diego_schivo
Date: 2010-06-30 08:25:11 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 refactoring: replaced "while" with "Iterators.transform"
Modified Paths:
--------------
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/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 07:39:12 UTC (rev 2741)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 08:25:11 UTC (rev 2742)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
+import info.magnolia.cms.core.Content;
import info.magnolia.freemarker.FreemarkerUtil;
import java.util.ArrayList;
@@ -37,7 +38,11 @@
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+
/**
* Page that renders the folder view
* @author molaschi
@@ -77,6 +82,7 @@
return super.getTemplateName(viewName);
}
+ @SuppressWarnings("unchecked")
@Override
public String show()
{
@@ -104,24 +110,24 @@
ResultIterator<AdvancedResultItem> items = contentMediaDetails.getItems();
// @todo don't do this, all the search should be laxy
- while (items.hasNext())
- {
- AdvancedResultItem media = items.next();
-
- MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(
- media);
-
- if (mtc != null)
+ medias = Lists.newArrayList(Iterators.transform(items, new Function<Content, MediaBean>() {
+ /**
+ * {@inheritDoc}
+ */
+ public MediaBean apply(Content media)
{
+ MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(
+ media);
getNumberOfMedia().put(mtc.getName(), MapUtils.getInteger(getNumberOfMedia(), mtc.getName(), 0) + 1);
-
if (!"xml".equals(format) && (StringUtils.isBlank(getType()) || getType().equals(mtc.getName())))
{
MediaBean mb = new MediaBeanBuilder(mtc).apply(media);
- getMedias().add(mb);
+ return mb;
}
+ return null;
}
- }
+ }));
+ medias.remove(null);
StringBuilder qs = new StringBuilder();
for (String key : (Set<String>) request.getParameterMap().keySet())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 09:01:00
|
Revision: 2745
http://openutils.svn.sourceforge.net/openutils/?rev=2745&view=rev
Author: diego_schivo
Date: 2010-06-30 09:00:54 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 paging in adv-search
Modified Paths:
--------------
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/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 08:59:38 UTC (rev 2744)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 09:00:54 UTC (rev 2745)
@@ -90,11 +90,12 @@
// @todo defaultBasePath handling only on xml requests?
if ("xml".equals(format))
{
- contentMediaDetails = configuration.search(request, null, "media", "nt:base", items, page);
+ // paging disabled for xml requests
+ contentMediaDetails = configuration.search(request, null, "media", "nt:base");
}
else
{
- contentMediaDetails = configuration.search(request, "/", "media", "nt:base");
+ contentMediaDetails = configuration.search(request, "/", "media", "nt:base", 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.
|
|
From: <die...@us...> - 2010-06-30 10:53:38
|
Revision: 2756
http://openutils.svn.sourceforge.net/openutils/?rev=2756&view=rev
Author: diego_schivo
Date: 2010-06-30 10:53:32 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 adv-search page overriding count/find methods of folder-view page
Modified Paths:
--------------
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/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 10:51:08 UTC (rev 2755)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 10:53:32 UTC (rev 2756)
@@ -79,22 +79,39 @@
return super.getTemplateName(viewName);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
- public String show()
+ protected int countMediaItems(MediaTypeConfiguration mtc)
{
+ if ("xml".equals(format))
+ {
+ // no need to count media per type on xml requests
+ return 0;
+ }
+ return configuration.search(request, mtc.getName(), null).getTotalSize();
+ }
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected AdvancedResult findMediaItems()
+ {
// @todo defaultBasePath handling only on xml requests?
if ("xml".equals(format))
{
// paging disabled for xml requests
- contentMediaDetails = configuration.search(request, null, null);
+ return configuration.search(request, type, null);
}
- else
- {
- contentMediaDetails = configuration.search(request, null, "/", items, page);
- }
+ return configuration.search(request, type, "/", items, page);
+ }
- setNumberOfMedia(new HashMap<String, Integer>());
+ @Override
+ public String show()
+ {
+ super.show();
selectTab = StringUtils.trimToEmpty(selectTab);
if (StringUtils.isNotBlank(selectTab))
@@ -102,29 +119,6 @@
setType(selectTab);
}
- // casts Iterator<AdvancedResultItem> to Iterator<Content>
- Iterator<Content> contentIterator = Iterators.filter(contentMediaDetails.getItems(), Content.class);
- medias = Iterators.filter(Iterators.transform(contentIterator, new Function<Content, MediaBean>()
- {
-
- /**
- * {@inheritDoc}
- */
- public MediaBean apply(Content media)
- {
- MediaTypeConfiguration mtc = MediaConfigurationManager
- .getInstance()
- .getMediaTypeConfigurationFromMedia(media);
- getNumberOfMedia().put(mtc.getName(), MapUtils.getInteger(getNumberOfMedia(), mtc.getName(), 0) + 1);
- if (!"xml".equals(format) && (StringUtils.isBlank(getType()) || getType().equals(mtc.getName())))
- {
- MediaBean mb = new MediaBeanBuilder(mtc).apply(media);
- return mb;
- }
- return null;
- }
- }), Predicates.notNull());
-
StringBuilder qs = new StringBuilder();
for (Object obj : request.getParameterMap().keySet())
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 10:58:32
|
Revision: 2757
http://openutils.svn.sourceforge.net/openutils/?rev=2757&view=rev
Author: diego_schivo
Date: 2010-06-30 10:58:26 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 fix count
Modified Paths:
--------------
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/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 10:53:32 UTC (rev 2756)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 10:58:26 UTC (rev 2757)
@@ -90,7 +90,7 @@
// no need to count media per type on xml requests
return 0;
}
- return configuration.search(request, mtc.getName(), null).getTotalSize();
+ return configuration.search(request, mtc.getName(), "/").getTotalSize();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 12:35:17
|
Revision: 2758
http://openutils.svn.sourceforge.net/openutils/?rev=2758&view=rev
Author: diego_schivo
Date: 2010-06-30 12:35:10 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 refactoring
Modified Paths:
--------------
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/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 10:58:26 UTC (rev 2757)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 12:35:10 UTC (rev 2758)
@@ -19,27 +19,17 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
import info.magnolia.freemarker.FreemarkerUtil;
-import java.util.HashMap;
-import java.util.Iterator;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
-import com.google.common.base.Function;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterators;
-
/**
* Page that renders the folder view
* @author molaschi
@@ -120,31 +110,29 @@
}
StringBuilder qs = new StringBuilder();
- for (Object obj : request.getParameterMap().keySet())
+ for (Object objKey : request.getParameterMap().keySet())
{
- String key = (String) obj;
- if (!"type".equals(key))
+ String key = (String) objKey;
+ if ("command".equals(key) || "type".equals(key))
{
- if (request.getParameterMap().get(key).getClass().isArray())
+ continue;
+ }
+ Object objValue = request.getParameterMap().get(key);
+ if (objValue.getClass().isArray())
+ {
+ for (String value : (String[]) objValue)
{
- for (String value : (String[]) request.getParameterMap().get(key))
+ if (qs.length() > 0)
{
- if ("command".equals(key))
- {
- continue;
- }
- if (qs.length() > 0)
- {
- qs.append("&");
- }
- qs.append(key).append("=").append(value);
+ qs.append("&");
}
+ qs.append(key).append("=").append(value);
}
- else
- {
- qs.append(key).append("=").append(request.getParameter(key));
- }
}
+ else
+ {
+ qs.append(key).append("=").append(objValue);
+ }
}
queryString = qs.toString();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-07 15:05:21
|
Revision: 3306
http://openutils.svn.sourceforge.net/openutils/?rev=3306&view=rev
Author: diego_schivo
Date: 2011-02-07 15:05:15 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
MEDIA-214 saveAsPlaylist method
Modified Paths:
--------------
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/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2011-02-07 14:49:29 UTC (rev 3305)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2011-02-07 15:05:15 UTC (rev 3306)
@@ -20,14 +20,22 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.Path;
+import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.freemarker.FreemarkerUtil;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.ValueFactory;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -37,6 +45,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistView;
import org.apache.commons.lang.StringUtils;
@@ -236,4 +245,38 @@
});
}
+ public String saveAsPlaylist()
+ {
+ try
+ {
+ HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(PlaylistConstants.REPO);
+ ValueFactory valueFactory = hm.getWorkspace().getSession().getValueFactory();
+
+ Content playlistNode = hm.createContent("/samples", "hello", PlaylistConstants.PLAYLIST.getSystemName());
+ Content requestNode = playlistNode.createContent("request", ItemType.CONTENTNODE);
+ for (Enumeration paramNames = request.getParameterNames(); paramNames.hasMoreElements();)
+ {
+ String paramName = (String) paramNames.nextElement();
+ String[] paramValues = request.getParameterValues(paramName);
+
+ Content paramNode = requestNode.createContent(
+ Path.getUniqueLabel(requestNode, "0"),
+ ItemType.CONTENTNODE);
+ paramNode.setNodeData("name", paramName);
+ Value[] jcrValues = new Value[paramValues.length];
+ for (int i = 0; i < paramValues.length; i++)
+ {
+ jcrValues[i] = NodeDataUtil.createValue(paramValues[i], PropertyType.STRING, valueFactory);
+ }
+ paramNode.setNodeData("value", jcrValues);
+ }
+ playlistNode.getParent().save();
+ }
+ catch (RepositoryException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return show();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-02-09 20:55:46
|
Revision: 3337
http://openutils.svn.sourceforge.net/openutils/?rev=3337&view=rev
Author: fgiust
Date: 2011-02-09 20:55:39 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
optimize imports
Modified Paths:
--------------
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/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2011-02-09 20:39:12 UTC (rev 3336)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2011-02-09 20:55:39 UTC (rev 3337)
@@ -20,24 +20,14 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.Path;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.freemarker.FreemarkerUtil;
-import java.util.Enumeration;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.Set;
-import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.ValueFactory;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -47,7 +37,6 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
-import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistView;
import org.apache.commons.lang.StringUtils;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X