cvs commit: corporate_portal_templates/src/view/jsp blog_listing_rss_2_0.jsp blog_rss_2_0.jsp corporate_portal_templates/src/view/jsp/include blog_declarations.inc

[Philippe Vollenweider]

pvollenweider    2005/06/08 16:00:18 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/view/jsp         blog_listing_rss_2_0.jsp blog_rss_2_0.jsp 
    src/view/jsp/include blog_declarations.inc 
  Log:
  Fix for Oracle
  
  Revision  Changes    Path
  1.1.2.6   +9 -9      
corporate_portal_templates/src/view/jsp/blog_listing_rss_2_0.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/blog_listing_rss_2_0.jsp.diff?r1=1.1.2.5&r2=1.1.2.6&f=h
  1.1.2.19  +2 -2      corporate_portal_templates/src/view/jsp/blog_rss_2_0.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/blog_rss_2_0.jsp.diff?r1=1.1.2.18&r2=1.1.2.19&f=h
  1.1.2.14  +1 -1      
corporate_portal_templates/src/view/jsp/include/blog_declarations.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_declarations.inc.diff?r1=1.1.2.13&r2=1.1.2.14&f=h
  
  
  
  Index: blog_listing_rss_2_0.jsp
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates/src/view/jsp/blog_listing_rss_2_0.jsp,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- blog_listing_rss_2_0.jsp  28 Apr 2005 09:43:52 -0000      1.1.2.5
  +++ blog_listing_rss_2_0.jsp  8 Jun 2005 14:00:17 -0000       1.1.2.6
  @@ -13,21 +13,21 @@
       public String toXml(String html) {
           return JahiaTools.text2XMLEntityRef(html, 1);
       }
  -    
  +
       /**
        * Changes the page of the ParamBean
        */
       public void changePage(ParamBean jParams, int pageID) {
           try {
  -            ContentPage blogContentPage = ContentPage.getPage(pageID);       
  +            ContentPage blogContentPage = ContentPage.getPage(pageID);
               if (blogContentPage != null) {
                   jParams.changePage(blogContentPage);
               }
           } catch (JahiaException e) {
  -            e.printStackTrace();    
  +            e.printStackTrace();
           }
       }
  -    
  +
       /**
        * Constructs the full URL of the current page
        */
  @@ -44,9 +44,9 @@
               jParams.setCacheStatus(jParams.CACHE_BYPASS);
               buffer.append(jParams.getContentPage().getURL(jParams));
               jParams.setCacheStatus(cacheStatus);
  -            
  +
           } catch (JahiaException e) {
  -            e.printStackTrace();    
  +            e.printStackTrace();
           }
           return buffer.toString();
       }
  @@ -81,7 +81,7 @@
   if (! jData.gui().isEditMode()) {
       ContainerFilterBean emptyEntryFilter = new ContainerFilterBean("title",
           jParams.getEntryLoadRequest());
  -    emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL, "");
  +    emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL, 
"<empty>");
       containerFilterVector.add(emptyEntryFilter);
   }
   
  @@ -99,11 +99,11 @@
       request.setAttribute("entries_sort_handler", entries_sort_handler);
   
       JahiaContainerList entries = 
jData.containers().getContainerList("entries");
  -    if (entries != null) {      
  +    if (entries != null) {
           // only display the 15 last entries.
           entries.setCtnListPagination(15,0);
           entries.setIsContainersLoaded(false);
  -        
  +
           Enumeration entriesEnum = entries.getContainers();
   
           while (entriesEnum.hasMoreElements()) {
  
  
  
  Index: blog_rss_2_0.jsp
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates/src/view/jsp/blog_rss_2_0.jsp,v
  retrieving revision 1.1.2.18
  retrieving revision 1.1.2.19
  diff -u -r1.1.2.18 -r1.1.2.19
  --- blog_rss_2_0.jsp  4 May 2005 11:40:59 -0000       1.1.2.18
  +++ blog_rss_2_0.jsp  8 Jun 2005 14:00:17 -0000       1.1.2.19
  @@ -50,12 +50,12 @@
   if (! jData.gui().isEditMode()) {
       ContainerFilterBean emptyEntryFilter = new ContainerFilterBean("title",
           jParams.getEntryLoadRequest());
  -    emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL, "");
  +    emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL, 
"<empty>");
       containerFilterVector.add(emptyEntryFilter);
   }
   
   if ( containerFilterVector.size() > 0 ) {
  -    ContainerFilters containerFilters = new ContainerFilters("entries", 
  +    ContainerFilters containerFilters = new ContainerFilters("entries",
           jParams, containerFilterVector);
       request.setAttribute("entries_filter_handler", containerFilters);
   }
  
  
  
  Index: blog_declarations.inc
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_declarations.inc,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- blog_declarations.inc     8 Jun 2005 13:53:28 -0000       1.1.2.13
  +++ blog_declarations.inc     8 Jun 2005 14:00:18 -0000       1.1.2.14
  @@ -92,7 +92,7 @@
       dayDate = cal.getTimeInMillis();
       buf.append( "<a href=\"" + bypassUrl + "?t=" + dayDate + 
"&amp;range=month\">" );
       sdf.applyPattern("MMMM");
  -    buf.append( sdf.format( cal.getTime() ) );
  +    buf.append( JahiaTools.text2html(sdf.format( cal.getTime() )) );
       buf.append( "</a>" );
       buf.append( "<a href=\"" + bypassUrl + "?t=" + dayDate + 
"&amp;range=year\">" );
       buf.append( cal.get( Calendar.YEAR ) );