pvollenweider 2005/05/31 12:20:27 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp/include blog_filters.inc blog_listing_filters.inc
blog_searchbox.inc
Log:
Fix category filter
Revision Changes Path
1.1.2.10 +5 -0
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.1.2.9&r2=1.1.2.10&f=h
1.1.2.4 +30 -10
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.1.2.3&r2=1.1.2.4&f=h
1.1.2.2 +6 -0
corporate_portal_templates/src/view/jsp/include/blog_searchbox.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_searchbox.inc.diff?r1=1.1.2.1&r2=1.1.2.2&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.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- blog_filters.inc 31 May 2005 09:53:16 -0000 1.1.2.9
+++ blog_filters.inc 31 May 2005 10:20:27 -0000 1.1.2.10
@@ -92,6 +92,11 @@
containerFilterVector.add(dateFilter);
}
}
+if ( containerFilterVector.size()>0 ) {
+ ContainerFilters containerFilters ;
+ containerFilters = new
ContainerFilters(containerFilterVector,jData.params().getSiteID(),"entries");
+ request.setAttribute("entries_filter_handler",containerFilters);
+}
// sort by date desc
ContainerSorterByContainerDefinition entries_sort_handler =
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.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- blog_listing_filters.inc 31 May 2005 09:53:16 -0000 1.1.2.3
+++ blog_listing_filters.inc 31 May 2005 10:20:27 -0000 1.1.2.4
@@ -2,6 +2,8 @@
// filters
Vector containerFilterVector = new Vector();
+String blogSearchString = request.getParameter("blogSearchString");
+
// on non-edit mode, hide pages with empty title
if (! jData.gui().isEditMode()) {
ContainerFilterBean emptyEntryFilter = new
ContainerFilterBean("title",jParams.getEntryLoadRequest());
@@ -9,13 +11,23 @@
containerFilterVector.add(emptyEntryFilter);
}
-// get all blogs
-ContainerFilterByContainerDefinition entriesDefFilter =
- new ContainerFilterByContainerDefinition("entries",
jParams.getEntryLoadRequest());
-containerFilterVector.add(entriesDefFilter);
-
-String blogSearchString = request.getParameter("blogSearchString");
-
+if (blogSearchString != null && blogSearchString.length() > 0) {
+ logger.debug("blogSearchString is " + blogSearchString);
+ ContainerSearcher containerSearcher = new ContainerSearcher(
+ jData.params().getSiteID(), "entries", blogSearchString,
+ jData.params().getEntryLoadRequest());
+ request.setAttribute("entries_search_handler",containerSearcher);
+} else {
+ // serch only in current page and in containerList "entries"
+ blogSearchString = "";
+ StringBuffer searchBlogQuery = new StringBuffer();
+ //searchBlogQuery.append(" pageid:" + jData.page().getID());
+ searchBlogQuery.append("container_definition_name:entries");
+ ContainerSearcher containerSearcher = new ContainerSearcher(
+ jData.params().getSiteID(), "entries", searchBlogQuery.toString(),
+ jData.params().getEntryLoadRequest());
+ request.setAttribute("entries_search_handler",containerSearcher);
+}
if (requestedCategory != null) {
HashSet cats = new HashSet();
Category cat = Category.getCategory(requestedCategory);
@@ -30,13 +42,13 @@
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 {
if (blogSearchString != null && blogSearchString.length() > 0) {
ContainerSearcher containerSearcher = new ContainerSearcher(
- jData.params().getSiteID(), "entries", blogSearchString,
+ jData.params().getSiteID(), "entries", blogSearchString,
jData.params().getEntryLoadRequest());
request.setAttribute("entries_search_handler",containerSearcher);
blogSearchString = "";
@@ -89,9 +101,17 @@
}
}
}
+if ( containerFilterVector.size()>0 ) {
+ ContainerFilters containerFilters ;
+ containerFilters = new
ContainerFilters(containerFilterVector,jData.params().getSiteID(),"entries");
+ request.setAttribute("entries_filter_handler",containerFilters);
+}
// sort by date desc
ContainerSorterByContainerDefinition entries_sort_handler =
- new ContainerSorterByContainerDefinition(-1, "date",
"entries",jParams.getEntryLoadRequest(), true);
+ new ContainerSorterByContainerDefinition(jParams.getSiteID(), "date",
null,
+ jParams.getEntryLoadRequest(), true);
+ //new ContainerSorterByContainerDefinition(jParams.getSiteID(), "date",
"entries",
+ // jParams.getEntryLoadRequest(), true);
entries_sort_handler.setDescOrdering();
request.setAttribute("entries_sort_handler",entries_sort_handler);
%>
\ No newline at end of file
Index: blog_searchbox.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_searchbox.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- blog_searchbox.inc 28 Apr 2005 08:29:32 -0000 1.1.2.1
+++ blog_searchbox.inc 31 May 2005 10:20:27 -0000 1.1.2.2
@@ -1,3 +1,9 @@
+<%
+if (blogSearchString == null) {
+ blogSearchString = "";
+}
+%>
+
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td width="100%" class="boxtitlecolor1">
