xlawrence 2005/05/31 14:04:49 CEST
Modified files:
src/view/jsp/include blog_filters.inc blog_listing_filters.inc
Log:
Added search filters in the request object to enable category searching
Revision Changes Path
1.5 +6 -1
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.4&r2=1.5&f=h
1.5 +10 -2
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.4&r2=1.5&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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- blog_filters.inc 31 May 2005 09:04:36 -0000 1.4
+++ blog_filters.inc 31 May 2005 12:04:49 -0000 1.5
@@ -15,7 +15,7 @@
}
if (blogSearchString != null && blogSearchString.length() > 0) {
-
+ logger.debug("blogSearchString is " + blogSearchString);
ContainerSearcher containerSearcher = new ContainerSearcher(
jData.params().getSiteID(), "entries", blogSearchString,
jData.params().getEntryLoadRequest());
@@ -87,6 +87,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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- blog_listing_filters.inc 31 May 2005 09:04:36 -0000 1.4
+++ blog_listing_filters.inc 31 May 2005 12:04:49 -0000 1.5
@@ -30,7 +30,7 @@
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) {
@@ -89,9 +89,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
