pvollenweider    2005/04/06 17:14:56 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/view/jsp         blog.jsp 
  Log:
  Get all categories
  
  Revision  Changes    Path
  1.1.2.5   +91 -3     corporate_portal_templates/src/view/jsp/blog.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/blog.jsp.diff?r1=1.1.2.4&r2=1.1.2.5&f=h
  
  
  
  Index: blog.jsp
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates/src/view/jsp/Attic/blog.jsp,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- blog.jsp  6 Apr 2005 14:29:57 -0000       1.1.2.4
  +++ blog.jsp  6 Apr 2005 15:14:56 -0000       1.1.2.5
  @@ -123,8 +123,40 @@
       buf.append( " <a href=\"" + bypassUrl + "?t=" + now + 
"&amp;range=week\">This week</a>\n" );
       return( buf.toString() );
   } // printMonthView
  +
  +public Vector buildCategoryTree (Vector categories, Category currentCategory)
  +throws JahiaException {
  +    if ( currentCategory != null ){
  +        ArrayList childCategories = currentCategory.getChildCategories();
  +        Iterator childIter = childCategories.iterator();
  +        while (childIter.hasNext()) {
  +            Category curChildCategory = (Category) childIter.next();
  +            categories.add(curChildCategory);
  +            categories.add(buildCategoryTree(categories, curChildCategory));
  +        }
  +    }
  +    return categories;
  +}
   %>
   <%
  +// get all categories
  +Category rootCategory = Category.getRootCategory();
  +Vector categoriesVector = buildCategoryTree (new Vector(), rootCategory);
  +Enumeration categoriesEnum= categoriesVector.elements();
  +/*
  +while (categoriesEnum.hasMoreElements()) {
  +    Category categ = (Category) categoriesEnum.nextElement();
  +    String categoryKey = categ.getKey();
  +    logger.debug("categoryKey -> " + categoryKey);
  +}
  +*/
  +
  +
  +
  +SimpleDateFormat sdf = new SimpleDateFormat( "dd/MM/yy kk:mm" );
  +sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
  +
  +
   int currentPageId = jData.page().getID();
   
   boolean isNewPage = false;
  @@ -161,12 +193,68 @@
           blogId = blogIdInteger.intValue();
       }
   }
  -
  -// filters
   String range = request.getParameter("range");
   if (range == null) {
       range = "month";
   }
  +
  +// filters
  +Vector containerFilterVector = new Vector();
  +
  +// 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);
  +}
  +if ("month".equals(range)){
  +    cal.set( Calendar.DAY_OF_MONTH, 1);
  +}
  +if ("year".equals(range)){
  +    cal.set( Calendar.DAY_OF_YEAR, 1);
  +}
  +Date lowerVal = cal.getTime();
  +cal.add( Calendar.HOUR_OF_DAY, 24 );
  +if ("week".equals(range)){
  +    cal.add( Calendar.HOUR_OF_DAY, 24*6 );
  +}
  +if ("month".equals(range)){
  +    cal.add( Calendar.MONTH, 1 );
  +}
  +if ("year".equals(range)){
  +    cal.add( Calendar.YEAR, 1 );
  +}
  +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(),"entries");
  +     request.setAttribute("entries_filter_handler",containerFilters);
  +}
  +
  +// sort by date desc
  +ContainerSorterByContainerDefinition entries_sort_handler =
  +    new ContainerSorterByContainerDefinition(-1, "date", 
"entries",jParams.getEntryLoadRequest(), true);
  +entries_sort_handler.setAscOrdering();
  +request.setAttribute("entries_sort_handler",entries_sort_handler);
  +
  +
   %>
   <content:declareContainerList name="entries" title="List of entries">
   <content:declareContainer>
  @@ -237,7 +325,7 @@
                       excerpt = excerpt.substring( 0, 255 - 3 ) + "...";
                   }
                   %>
  -                <h2><%=title%></h2>
  +                <h2><a 
href="<%=bypassUrl%>?blogId=<%=entry.getID()%>"><%=title%></a></h2>
                   <%=excerpt%>
                   <p class="posted">Posted by <%=author%> at <%=date%>
                   <%
  

Reply via email to