Menu
▾
▴
openutils-svn
Revision: 2775
http://openutils.svn.sourceforge.net/openutils/?rev=2775&view=rev
Author: diego_schivo
Date: 2010-07-01 07:27:35 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
MEDIA-145 fix type count on search
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.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-07-01 07:12:35 UTC (rev 2774)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-07-01 07:27:35 UTC (rev 2775)
@@ -115,6 +115,11 @@
List<Criterion> criterionList = new ArrayList<Criterion>();
for (String key : filters.keySet())
{
+ if ("type".equals(key) && !StringUtils.isEmpty(mediaType))
+ {
+ // restriction on type already set
+ continue;
+ }
criterionList = filters.get(key).getCriterionList(key, request);
for (Criterion criterion : criterionList)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3234
http://openutils.svn.sourceforge.net/openutils/?rev=3234&view=rev
Author: diego_schivo
Date: 2011-01-13 11:01:09 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
unnecessary initialization
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.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 2011-01-13 10:52:25 UTC (rev 3233)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-13 11:01:09 UTC (rev 3234)
@@ -124,7 +124,6 @@
}
// filters
- List<Criterion> criterionList = new ArrayList<Criterion>();
for (String key : filters.keySet())
{
if ("type".equals(key) && !StringUtils.isEmpty(mediaType))
@@ -132,7 +131,7 @@
// restriction on type already set
continue;
}
- criterionList = filters.get(key).getCriterionList(key, request);
+ List<Criterion> criterionList = filters.get(key).getCriterionList(key, request);
for (Criterion criterion : criterionList)
{
c.add(criterion);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3338
http://openutils.svn.sourceforge.net/openutils/?rev=3338&view=rev
Author: fgiust
Date: 2011-02-09 21:10:35 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
remove check on the type filter (needs to be applied, a search with type=image shouldn't lead to a result with all the tabs filled)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.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 2011-02-09 20:55:39 UTC (rev 3337)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-02-09 21:10:35 UTC (rev 3338)
@@ -19,9 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration;
-import java.util.ArrayList;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -121,11 +119,7 @@
// filters
for (String key : filters.keySet())
{
- if ("type".equals(key) && !StringUtils.isEmpty(mediaType))
- {
- // restriction on type already set
- continue;
- }
+
SearchFilter filter = filters.get(key);
path = StringUtils.defaultIfEmpty(filter.getBasePath(key, request), path);
for (Criterion criterion : filter.getCriterionList(key, request))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3359
http://openutils.svn.sourceforge.net/openutils/?rev=3359&view=rev
Author: fgiust
Date: 2011-02-20 22:14:17 +0000 (Sun, 20 Feb 2011)
Log Message:
-----------
add back check on the type filter (needed for populating the number of results in tabs)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.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 2011-02-17 13:23:50 UTC (rev 3358)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-02-20 22:14:17 UTC (rev 3359)
@@ -119,7 +119,11 @@
// filters
for (String key : filters.keySet())
{
-
+ if ("type".equals(key) && !StringUtils.isEmpty(mediaType))
+ {
+ // restriction on type already set
+ continue;
+ }
SearchFilter filter = filters.get(key);
path = StringUtils.defaultIfEmpty(filter.getBasePath(key, request), path);
for (Criterion criterion : filter.getCriterionList(key, request))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3386
http://openutils.svn.sourceforge.net/openutils/?rev=3386&view=rev
Author: fgiust
Date: 2011-03-13 13:31:46 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
added debug log
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.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 2011-03-13 11:12:33 UTC (rev 3385)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-03-13 13:31:46 UTC (rev 3386)
@@ -138,10 +138,7 @@
}
// base path
- String searchPath = StringUtils.removeEnd(path, "/")
- + "/"
- + (descendants ? "/" : StringUtils.EMPTY)
- + "*";
+ String searchPath = StringUtils.removeEnd(path, "/") + "/" + (descendants ? "/" : StringUtils.EMPTY) + "*";
c.setBasePath("/jcr:root/" + StringUtils.removeStart(searchPath, "/"));
// sorting
@@ -172,7 +169,13 @@
c.setPaging(itemsPerPage, pageNumberStartingFromOne);
}
- return c.execute();
+ AdvancedResult result = c.execute();
+ if (log.isDebugEnabled())
+ {
+ log.debug("Executing {} -> {} results", c.toXpathExpression(), result.getTotalSize());
+ }
+
+ return result;
}
}
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