[Erp5-report] r32309 aurel - in /erp5/trunk/bt5/erp5_rss_reader: SkinTemplateItem/portal_sk...

[nobody at svn.erp5.org]

Author: aurel
Date: Mon Feb  8 11:43:55 2010
New Revision: 32309

URL: http://svn.erp5.org?rev=32309&view=rev
Log:
modify xslt :
- now it parses georss data if present
- remove useless parameter
- make portal type a parameter

Modified:
    erp5/trunk/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_getAggregatedImportXSLT.xml
    erp5/trunk/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_populateContent.xml
    erp5/trunk/bt5/erp5_rss_reader/bt/revision

Modified: erp5/trunk/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_getAggregatedImportXSLT.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_getAggregatedImportXSLT.xml?rev=32309&r1=32308&r2=32309&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_getAggregatedImportXSLT.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_getAggregatedImportXSLT.xml [utf8] Mon Feb  8 11:43:55 2010
@@ -32,16 +32,18 @@
 <?xml version="1.0" encoding="utf-8"?>\n
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" \n
 xmlns:md5="http://exslt.org/crypto" exclude-result-prefixes="md5"\n
+xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"\n
+xmlns:georss="http://www.georss.org/georss"\n
+xmlns:atom="http://www.w3.org/2005/Atom"\n
 xmlns:dc="http://purl.org/dc/elements/1.1/">\n
 \n
 <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/>\n
 \n
 <!--Parameters list-->\n
-<xsl:param name="rid" select="None"/>\n
-<xsl:param name="sid" select="None"/>\n
 <xsl:param name="categories_list" select="None"/>\n
 <xsl:param name="subject_list" select="None"/>\n
 <xsl:param name="actor" select="None"/>\n
+<xsl:param name="portal_type" select="None"/>\n
 \n
 <!--Template matching the erp5 Tag-->\n
 <xsl:template match="/">\n
@@ -62,13 +64,12 @@
         </xsl:choose>\n
       </xsl:variable>\n
       <xsl:variable name="converted_id" select="md5:md5($md5_id)"/>\n
-        <object id="{$converted_id}" portal_type="RSS Item">\n
-          <id type="string"><xsl:value-of select="$converted_id"/></id>\n
-          <rid type="string"><xsl:value-of select=\'$rid\'/></rid>\n
+        <object id="{$converted_id}">\n
+          <portal_type type="string"><xsl:value-of select="$portal_type"/></portal_type>\n
           <categories_list type="tokens"><xsl:value-of select="$categories_list"/></categories_list>\n
           <title type="string"><xsl:value-of select="*[local-name() = \'title\']"/></title>\n
           <subject_list type="lines"><xsl:value-of select="$subject_list"/></subject_list>\n
-          <description type="text"><xsl:value-of select="description|dc:description|*[local-name() = \'content\']"/><xsl:apply-templates select=\'summary\'/></description>\n
+          <description type="text"><xsl:value-of select="description|dc:description|*[local-name() = \'content\']"/><xsl:apply-templates select="summary"/></description>\n
           <url_text>\n
             <xsl:choose>\n
               <xsl:when test="link"><xsl:value-of select="link"/></xsl:when>\n
@@ -85,12 +86,20 @@
             <state type="string">current</state>\n
             <time type="date"><xsl:value-of select="pubDate|dc:date"/></time>\n
           </workflow_action>\n
+          <xsl:apply-templates select=".//geo:lat"/>\n
+          <xsl:apply-templates select=".//geo:long"/>\n
         </object>\n
     </xsl:template>\n
+    <xsl:template match="geo:lat">\n
+      <latitude type="string"><xsl:value-of select="."/></latitude>\n
+    </xsl:template>\n
+    <xsl:template match="geo:long">\n
+      <longitude type="string"><xsl:value-of select="."/></longitude>\n
+    </xsl:template>    \n
     <xsl:template match="summary">\n
-      <xsl:apply-templates/>\n
+      <xsl:value-of select="."/>\n
     </xsl:template>\n
-\n
+ \n
 </xsl:stylesheet>\n
 
 

Modified: erp5/trunk/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_populateContent.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_populateContent.xml?rev=32309&r1=32308&r2=32309&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_populateContent.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_populateContent.xml [utf8] Mon Feb  8 11:43:55 2010
@@ -62,8 +62,7 @@
 from AccessControl import getSecurityManager\n
 \n
 #Step1: transform an RSS Feed into ERP5 XML\n
-#xsl_kw = {\'date\':DateTime()}\n
-xsl_kw = {\'actor\':getSecurityManager().getUser().getId()}\n
+xsl_kw = {\'actor\':getSecurityManager().getUser().getId(), \'portal_type\' : \'RSS Item\'}\n
 xml_output = context.TextDocument_asCallable.RSSFeed_asAggregatedImportXML(**xsl_kw)\n
 \n
 #Step2: extract xml subobjects and create RSS Item objects\n

Modified: erp5/trunk/bt5/erp5_rss_reader/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_rss_reader/bt/revision?rev=32309&r1=32308&r2=32309&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_rss_reader/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_rss_reader/bt/revision [utf8] Mon Feb  8 11:43:55 2010
@@ -1,1 +1,1 @@
-211
+213