pvollenweider 2005/05/24 10:36:30 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp/include blog_filters.inc blog_listing_filters.inc
Log:
C. Mailleux fix -> oracle fix
Revision Changes Path
1.1.2.8 +23 -6
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.7&r2=1.1.2.8&f=h
1.1.2.2 +15 -3
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.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.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- blog_filters.inc 26 Apr 2005 08:55:35 -0000 1.1.2.7
+++ blog_filters.inc 24 May 2005 08:36:30 -0000 1.1.2.8
@@ -1,19 +1,25 @@
<%
// 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());
- emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"");
- containerFilterVector.add(emptyEntryFilter);
+
+ ContainerFilterBean emptyEntryFilter = new
ContainerFilterBean("title",jParams.getEntryLoadRequest());
+
emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"<empty>");
+ containerFilterVector.add(emptyEntryFilter);
+
}
+
if (blogSearchString != null) {
// get the list of child pages to construct the query
StringBuffer searchBlogQuery = new StringBuffer(blogSearchString);
@@ -33,6 +39,7 @@
null,searchBlogQuery.toString(),jParams.getEntryLoadRequest());
request.setAttribute("entries_search_handler",containerSearcher);
+
if (requestedCategory != null) {
HashSet cats = new HashSet();
Category cat = Category.getCategory(requestedCategory);
@@ -50,19 +57,24 @@
logger.debug("Could not fing category " + requestedCategory);
}
+
} else {
+
// add filter on field date
+
// Adding equality comparison with selected values
Calendar cal = Calendar.getInstance();
cal.setTimeZone(TimeZone.getTimeZone("UTC"));
cal.setTime(new Date(t));
+
cal.set( Calendar.HOUR_OF_DAY, 0 );
cal.set( Calendar.MINUTE, 0);
cal.set( Calendar.SECOND, -1);
+
if ("week".equals(range)){
cal.set( Calendar.DAY_OF_WEEK, Calendar.MONDAY);
}
@@ -85,28 +97,33 @@
}
Date upperVal = cal.getTime();
+
logger.debug("Filter from " + sdf.format( (new
Date(lowerVal.getTime())) ) + " to " +
sdf.format( (new Date(upperVal.getTime())) ));
+
ContainerFilterBean dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_SMALLER,
String.valueOf(upperVal.getTime()) );
containerFilterVector.add(dateFilter);
+
dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_BIGGER,
String.valueOf(lowerVal.getTime()) );
containerFilterVector.add(dateFilter);
}
}
if ( containerFilterVector.size()>0 ) {
- ContainerFilters containerFilters = new
ContainerFilters(containerFilterVector,jParams.getSiteID(),null);
+ ContainerFilters containerFilters = new
ContainerFilters(containerFilterVector,jParams.getSiteID(),null);
//ContainerFilters containerFilters = new ContainerFilters("entries",
jParams, containerFilterVector);
- request.setAttribute("entries_filter_handler",containerFilters);
+ request.setAttribute("entries_filter_handler",containerFilters);
}
+
// sort by date desc
+
ContainerSorterByContainerDefinition entries_sort_handler =
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.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- blog_listing_filters.inc 28 Apr 2005 08:29:32 -0000 1.1.2.1
+++ blog_listing_filters.inc 24 May 2005 08:36:30 -0000 1.1.2.2
@@ -2,20 +2,24 @@
// last entries
Vector containerFilterVector = new Vector();
+
// on non-edit mode, hide pages with empty title
if (! jData.gui().isEditMode()) {
- ContainerFilterBean emptyEntryFilter = new
ContainerFilterBean("title",jParams.getEntryLoadRequest());
- emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"");
- containerFilterVector.add(emptyEntryFilter);
+ ContainerFilterBean emptyEntryFilter = new
ContainerFilterBean("title",jParams.getEntryLoadRequest());
+
emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"<empty>");
+ containerFilterVector.add(emptyEntryFilter);
}
+
// get all blogs
ContainerFilterByContainerDefinition entriesDefFilter =
new ContainerFilterByContainerDefinition("entries",
jParams.getEntryLoadRequest());
containerFilterVector.add(entriesDefFilter);
+
String blogSearchString = request.getParameter("blogSearchString");
+
if (requestedCategory != null) {
HashSet cats = new HashSet();
Category cat = Category.getCategory(requestedCategory);
@@ -41,6 +45,7 @@
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);
@@ -52,10 +57,12 @@
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);
+
} else {
blogSearchString = "";
if (request.getParameter("t") != null) {
@@ -65,10 +72,12 @@
cal.setTimeZone(TimeZone.getTimeZone("UTC"));
cal.setTime(new Date(t));
+
cal.set( Calendar.HOUR_OF_DAY, 0 );
cal.set( Calendar.MINUTE, 0);
cal.set( Calendar.SECOND, -1);
+
if ("week".equals(range)){
cal.set( Calendar.DAY_OF_WEEK, Calendar.MONDAY);
}
@@ -91,13 +100,16 @@
}
Date upperVal = cal.getTime();
+
logger.debug("Filter from " + sdf.format( (new
Date(lowerVal.getTime())) ) + " to " +
sdf.format( (new Date(upperVal.getTime())) ));
+
ContainerFilterBean dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_SMALLER,
String.valueOf(upperVal.getTime()) );
containerFilterVector.add(dateFilter);
+
dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_BIGGER,
String.valueOf(lowerVal.getTime()) );
containerFilterVector.add(dateFilter);
