xlawrence    2005/04/26 17:25:08 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/view/jsp         blog_rss_2_0.jsp 
  Log:
  Added method to convert HTML to XML
  
  Revision  Changes    Path
  1.1.2.10  +18 -6     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.9&r2=1.1.2.10&f=h
  
  
  
  Index: blog_rss_2_0.jsp
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates/src/view/jsp/Attic/blog_rss_2_0.jsp,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- blog_rss_2_0.jsp  26 Apr 2005 14:34:11 -0000      1.1.2.9
  +++ blog_rss_2_0.jsp  26 Apr 2005 15:25:08 -0000      1.1.2.10
  @@ -1,10 +1,22 @@
  -<[EMAIL PROTECTED] language="java" contentType="text/xml"%><?xml 
version="1.0" encoding="UTF-8"?>
  +<[EMAIL PROTECTED] language="java" contentType="text/xml"%><?xml 
version="1.0" encoding="utf-8"?>
  +<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN"
  +    "http://my.netscape.com/publish/formats/rss-0.91.dtd";>
   <rss version="2.0"
       xmlns:dc="http://purl.org/dc/elements/1.1/";
       xmlns:slash="http://purl.org/rss/1.0/modules/slash/";>
  +
   <%@ include file="include/declarations.inc"%>
   <%@ include file="include/blog_definitions.inc"%>
   
  +<%!
  +    /**
  +     * Converts a given HTML String to XML
  +     */
  +    public String toXml(String html) {
  +        return JahiaTools.text2XMLEntityRef(JahiaTools.html2text(html), 0);
  +    }
  +%>
  +
   <%
   SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'kk:mmZ");
   sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
  @@ -27,9 +39,9 @@
   
   %>
       <channel>
  -         <title><%=pageTitle%></title>
  +         <title><%=toXml(pageTitle)%></title>
                <link><%=buffer.toString()%></link>
  -             <description>Blog: <%=pageTitle%></description>
  +             <description>Blog: <%=toXml(pageTitle)%></description>
                <dc:language><%=jParams.getLocale().toString()%></dc:language>
                <dc:rights>Copyright 2002-2005, Jahia Ltd - All rights 
reserved</dc:rights>
                <generator>Jahia 4.1, http://www.jahia.org</generator>
  @@ -58,10 +70,10 @@
               JahiaContainer entry = (JahiaContainer)entriesEnum.nextElement();
   %>
           <item>
  -                 <title><%=entry.getFieldValue("title", "")%></title>
  +                 <title><%=toXml(entry.getFieldValue("title", ""))%></title>
                        
<link><%=buffer.toString()%>?entryId=<%=entry.getID()%></link>
                        <guid 
isPermaLink="false"><%=entry.getID()%>@<%=jParams.getRequest().getServerName()%></guid>
  -                     
<description><![CDATA[<%=removeTags(entry.getFieldValue("body", 
""))%>]]></description>
  +                     
<description><![CDATA[<%=toXml(removeTags(entry.getFieldValue("body", 
"")))%>]]></description>
   
   <%
   long dateLong = -1;
  @@ -93,7 +105,7 @@
   }
   
   %>
  -                     <dc:creator><%=entry.getFieldValue("author", 
"")%></dc:creator>
  +                     <dc:creator><%=toXml(entry.getFieldValue("author", 
""))%></dc:creator>
                        <dc:date><%=postDate%></dc:date>
   <%
   
  

Reply via email to