debian/changelog: release package version 0.5-1

[tweeper.git] / rss_converter_instagram.com.xsl

diff --git a/rss_converter_instagram.com.xsl b/rss_converter_instagram.com.xsl
index bf83dde..aaab2e8 100644 (file)
--- a/rss_converter_instagram.com.xsl
+++ b/rss_converter_instagram.com.xsl
@@ -36,10 +36,22 @@
         <xsl:value-of disable-output-escaping="yes" select="php:function('Tweeper::generate_enclosure', string(text()))"/>
     </xsl:template>
 
         <xsl:value-of disable-output-escaping="yes" select="php:function('Tweeper::generate_enclosure', string(text()))"/>
     </xsl:template>
 

-    <xsl:variable name="screen-name" select="//ProfilePage/XML_Serializer_Tag/user/full_name"/>
-    <xsl:variable name="user-name" select="//ProfilePage/XML_Serializer_Tag/user/username"/>
+    <xsl:variable name="user-name" select="//ProfilePage/user/username"/>

 
 

-    <xsl:template match="//media/nodes/XML_Serializer_Tag">
+    <!-- Some users do not specify the full name -->
+    <xsl:variable name="full-name" select="//ProfilePage/user/full_name"/>
+    <xsl:variable name="screen-name">
+        <xsl:choose>
+            <xsl:when test="$full-name != ''">
+                <xsl:value-of select="$full-name"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$user-name"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:variable>
+
+    <xsl:template match="//media/nodes">

         <xsl:variable name="item-content-image" select="./display_src"/>
         <xsl:variable name="item-content-caption" select="./caption"/>
         <xsl:variable name="item-permalink" select="concat($BaseURL, '/p/', ./code, '/')"/>
         <xsl:variable name="item-content-image" select="./display_src"/>
         <xsl:variable name="item-content-caption" select="./caption"/>
         <xsl:variable name="item-permalink" select="concat($BaseURL, '/p/', ./code, '/')"/>


@@ -101,7 +113,13 @@
                     <xsl:value-of select="$channel-link"/>
                 </link>
                 <description>
                     <xsl:value-of select="$channel-link"/>
                 </link>
                 <description>

-                    <xsl:value-of select="//user/biography"/>
+                    <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
+                    <xsl:value-of select="normalize-space(concat($screen-name, '. ', //user/biography))"/>
+                    <xsl:variable name="external-url" select="//user/external_url"/>
+                    <xsl:if test="$external-url != ''">
+                        <xsl:text> </xsl:text><a href="{$external-url}"><xsl:value-of select="$external-url"/></a>
+                    </xsl:if>
+                    <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>

                 </description>
                 <image>
                     <title>
                 </description>
                 <image>
                     <title>


@@ -114,7 +132,7 @@
                         <xsl:value-of select="//user/profile_pic_url"/>
                     </url>
                 </image>
                         <xsl:value-of select="//user/profile_pic_url"/>
                     </url>
                 </image>

-                <xsl:apply-templates select="//media/nodes/XML_Serializer_Tag"/>
+                <xsl:apply-templates select="//media/nodes"/>

             </channel>
         </rss>
     </xsl:template>
             </channel>
         </rss>
     </xsl:template>