diff --git a/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_getAggregatedImportXSLT.xml b/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_getAggregatedImportXSLT.xml index efa3bcbc04b9946a14b2330fb0641a836f557f75..c7b50c7a21d1d6c7ac904fa933d8367dfcf79b35 100644 --- a/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_getAggregatedImportXSLT.xml +++ b/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_getAggregatedImportXSLT.xml @@ -54,8 +54,8 @@ xmlns:dc="http://purl.org/dc/elements/1.1/">\n <xsl:template match="item|entry">\n <xsl:variable name="md5_id">\n <xsl:choose>\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:when test="link"><xsl:value-of select="link|link/@href"/></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 @@ xmlns:dc="http://purl.org/dc/elements/1.1/">\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 - <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 @@ xmlns:dc="http://purl.org/dc/elements/1.1/">\n </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 @@ xmlns:dc="http://purl.org/dc/elements/1.1/">\n <xsl:apply-templates/>\n </xsl:template>\n \n -</xsl:stylesheet> +</xsl:stylesheet>\n + ]]></string> </value> </item> diff --git a/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_populateContent.xml b/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_populateContent.xml index 9cab184eab4cd8dc972ecadcbb037605dd87b314..eff2b5ae4a6a39ee5d6d9d6acb6e2c947f51a112 100644 --- a/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_populateContent.xml +++ b/bt5/erp5_rss_reader/SkinTemplateItem/portal_skins/erp5_rss_reader/RSSFeed_populateContent.xml @@ -61,7 +61,8 @@ to create the corresponding RSS Item objects.\n 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 diff --git a/bt5/erp5_rss_reader/bt/revision b/bt5/erp5_rss_reader/bt/revision index e0d1ea1e9ac39d1d0d9353874b9ca7b440121f23..4c009fb2fb4ac259990d1c18054f58bfd246f37f 100644 --- a/bt5/erp5_rss_reader/bt/revision +++ b/bt5/erp5_rss_reader/bt/revision @@ -1 +1 @@ -205 \ No newline at end of file +206 \ No newline at end of file