xlawrence 2005/05/30 16:28:53 CEST
Modified files:
src/view/jsp/include blog_filters.inc blog_listing_filters.inc
Log:
Corrected filters for searching and displaying posts by blog
Revision Changes Path
1.3 +12 -27
corporate_portal_templates/src/view/jsp/include/blog_filters.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_filters.inc.diff?r1=1.2&r2=1.3&f=h
1.3 +8 -28
corporate_portal_templates/src/view/jsp/include/blog_listing_filters.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_listing_filters.inc.diff?r1=1.2&r2=1.3&f=h
Index: blog_filters.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_filters.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blog_filters.inc 29 Apr 2005 12:48:46 -0000 1.2
+++ blog_filters.inc 30 May 2005 14:28:53 -0000 1.3
@@ -8,31 +8,22 @@
// on non-edit mode, hide pages with empty title
if (! jData.gui().isEditMode()) {
- ContainerFilterBean emptyEntryFilter = new
ContainerFilterBean("title",jParams.getEntryLoadRequest());
+ ContainerFilterBean emptyEntryFilter = new ContainerFilterBean("title",
jParams.getEntryLoadRequest());
emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"");
containerFilterVector.add(emptyEntryFilter);
}
-if (blogSearchString != null) {
- // get the list of child pages to construct the query
- StringBuffer searchBlogQuery = new StringBuffer(blogSearchString);
- searchBlogQuery.append(" AND pageid:" + jData.page().getID());
- searchBlogQuery.append(" AND (container_definition_name:entries OR
container_definition_name:comments)");
- logger.debug("Query is " + searchBlogQuery.toString());
- ContainerSearcher containerSearcher = new
ContainerSearcher(jParams.getSiteID(),
- null,searchBlogQuery.toString(),jParams.getEntryLoadRequest());
- request.setAttribute("entries_search_handler",containerSearcher);
+if (blogSearchString != null && blogSearchString.length() > 0) {
+
+ ContainerSearcher containerSearcher = new ContainerSearcher(
+ jData.params().getSiteID(), "entries", blogSearchString,
+ jData.params().getEntryLoadRequest());
+ request.setAttribute("entries_search_handler", containerSearcher);
+ blogSearchString = "";
+
} else {
- // serch only in current page and in containerList "entries"
blogSearchString = "";
- StringBuffer searchBlogQuery = new StringBuffer();
- searchBlogQuery.append(" pageid:" + jData.page().getID());
- searchBlogQuery.append(" AND container_definition_name:entries");
- ContainerSearcher containerSearcher = new
ContainerSearcher(jParams.getSiteID(),
- null,searchBlogQuery.toString(),jParams.getEntryLoadRequest());
- request.setAttribute("entries_search_handler",containerSearcher);
-
if (requestedCategory != null) {
HashSet cats = new HashSet();
Category cat = Category.getCategory(requestedCategory);
@@ -47,13 +38,12 @@
containerFilterVector.add(categoryFilter);
logger.debug("Add filter with category " + requestedCategory);
} else {
- logger.debug("Could not fing category " + requestedCategory);
+ logger.debug("Could not find category " + requestedCategory);
}
} else {
// add filter on field date
-
// Adding equality comparison with selected values
Calendar cal = Calendar.getInstance();
cal.setTimeZone(TimeZone.getTimeZone("UTC"));
@@ -97,16 +87,11 @@
containerFilterVector.add(dateFilter);
}
}
-if ( containerFilterVector.size()>0 ) {
- ContainerFilters containerFilters = new
ContainerFilters(containerFilterVector,jParams.getSiteID(),null);
- //ContainerFilters containerFilters = new ContainerFilters("entries",
jParams, containerFilterVector);
- request.setAttribute("entries_filter_handler",containerFilters);
-}
// sort by date desc
-
ContainerSorterByContainerDefinition entries_sort_handler =
- new ContainerSorterByContainerDefinition(jParams.getSiteID(), "date",
null, jParams.getEntryLoadRequest(), true);
+ new ContainerSorterByContainerDefinition(jParams.getSiteID(), "date",
null,
+ jParams.getEntryLoadRequest(), true);
entries_sort_handler.setDescOrdering();
request.setAttribute("entries_sort_handler",entries_sort_handler);
%>
\ No newline at end of file
Index: blog_listing_filters.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_listing_filters.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blog_listing_filters.inc 29 Apr 2005 12:48:46 -0000 1.2
+++ blog_listing_filters.inc 30 May 2005 14:28:53 -0000 1.3
@@ -1,5 +1,5 @@
<%
-// last entries
+// filters
Vector containerFilterVector = new Vector();
// on non-edit mode, hide pages with empty title
@@ -33,28 +33,13 @@
logger.debug("Could not fing category " + requestedCategory);
}
} else {
- if (blogSearchString != null) {
- // get the list of child pages to construct the query
- StringBuffer searchBlogQuery = new StringBuffer(blogSearchString);
- ContentPage startPage = ContentPage.getPage(jData.page().getID());
- int pageInfosFlag = ContentPage.ACTIVE_PAGE_INFOS |
ContentPage.STAGING_PAGE_INFOS;
- FlatSiteMapViewHelper flatSiteMap = new
FlatSiteMapViewHelper(jParams.getUser(), startPage, pageInfosFlag,
- jParams.getLocale().toString(),
FlatSiteMapViewHelper.DEFAULT_LEVEL);
-
- searchBlogQuery.append(" AND (");
- for (int j = 0; j < flatSiteMap.size(); j++) {
- int pageId = flatSiteMap.getPageID(j);
- if (j > 0){
- searchBlogQuery.append(" OR ");
- }
- searchBlogQuery.append("pageid:" + pageId );
- }
- searchBlogQuery.append(")");
- searchBlogQuery.append(" AND (container_definition_name:entries OR
container_definition_name:comments)");
-
- logger.debug("Query is " + searchBlogQuery.toString());
- ContainerSearcher containerSearcher = new
ContainerSearcher(jParams.getSiteID(),null,searchBlogQuery.toString(),jParams.getEntryLoadRequest());
- request.setAttribute("entries_search_handler",containerSearcher);
+ if (blogSearchString != null && blogSearchString.length() > 0) {
+
+ ContainerSearcher containerSearcher = new ContainerSearcher(
+ jData.params().getSiteID(), "entries", blogSearchString,
+ jData.params().getEntryLoadRequest());
+ request.setAttribute("entries_search_handler", containerSearcher);
+ blogSearchString = "";
} else {
blogSearchString = "";
@@ -104,11 +89,6 @@
}
}
}
-if ( containerFilterVector.size()>0 ) {
- ContainerFilters containerFilters =
- new
ContainerFilters(containerFilterVector,jParams.getSiteID(),"entries");
- request.setAttribute("entries_filter_handler",containerFilters);
-}
// sort by date desc
ContainerSorterByContainerDefinition entries_sort_handler =
new ContainerSorterByContainerDefinition(-1, "date",
"entries",jParams.getEntryLoadRequest(), true);
