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

[nobody at svn.erp5.org]

Author: aurel
Date: Fri Feb  5 11:39:32 2010
New Revision: 32286

URL: http://svn.erp5.org?rev=32286&view=rev
Log:
fix script parameters used when populating content
modify the XSLT method :
- include an edit workflow bu default so that the creation date is the publication date
- remove sid
- change order for computation of id based on md5

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=32286&r1=32285&r2=32286&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] Fri Feb  5 11:39:32 2010
@@ -54,8 +54,8 @@
 <xsl:template match="item|entry">\n
        <xsl:variable name="md5_id">\n
         <xsl:choose>\n
+          <xsl:when test="title|dc:title"><xsl:value-of select="title|dc:title"/></xsl:when>\n
           <xsl:when test="link"><xsl:value-of select="link|link/@href"/></xsl:when>\n
-          <xsl:when test="title|dc:title"><xsl:value-of select="title|dc:title"/></xsl:when>\n
           <xsl:otherwise><xsl:value-of select="description|dc:description"/></xsl:otherwise>\n
         </xsl:choose>\n
       </xsl:variable>\n
@@ -63,7 +63,6 @@
         <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
-          <sid type="int"><xsl:value-of select="$sid"/></sid>\n
           <categories_list type="tokens"><xsl:value-of select="$categories_list"/></categories_list>\n
           <title type="string"><xsl:value-of select="title|dc:title"/></title>\n
           <subject_list type="lines"><xsl:value-of select="$subject_list"/></subject_list>\n
@@ -75,6 +74,15 @@
             </xsl:choose>\n
           </url_text>\n
           <pub_date><xsl:value-of select="pubDate|dc:date"/></pub_date>\n
+          <workflow_action id="edit_workflow">\n
+            <action type="string">edit</action>\n
+            <actor type="string">aurel</actor>\n
+            <comment type="string"></comment>\n
+            <error_message type="string"></error_message>\n
+            <serial type="string">0.0.0.0</serial>\n
+            <state type="string">current</state>\n
+            <time type="date"><xsl:value-of select="pubDate|dc:date"/></time>\n
+          </workflow_action>\n
         </object>\n
     </xsl:template>\n
     \n
@@ -82,7 +90,8 @@
       <xsl:apply-templates/>\n
     </xsl:template>\n
 \n
-</xsl:stylesheet>
+</xsl:stylesheet>\n
+
 
 ]]></string> </value>
         </item>

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=32286&r1=32285&r2=32286&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] Fri Feb  5 11:39:32 2010
@@ -61,7 +61,8 @@
 from DateTime import DateTime\n
 \n
 #Step1: transform an RSS Feed into ERP5 XML\n
-xsl_kw = {\'date\':DateTime()}\n
+#xsl_kw = {\'date\':DateTime()}\n
+xsl_kw = {}\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=32286&r1=32285&r2=32286&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_rss_reader/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_rss_reader/bt/revision [utf8] Fri Feb  5 11:39:32 2010
@@ -1,1 +1,1 @@
-205
+206