You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by jo...@apache.org on 2006/02/09 15:15:58 UTC

svn commit: r376301 - in /lenya/trunk/src/pubs/blog: lenya/resources/samples/entry.xml xslt/feed/atom2other.xsl

Author: josias
Date: Thu Feb  9 06:15:56 2006
New Revision: 376301

URL: http://svn.apache.org/viewcvs?rev=376301&view=rev
Log:
use an empty link attribute as default, and rewrite it using the actual link. also added missing /entries as part of the url.

Modified:
    lenya/trunk/src/pubs/blog/lenya/resources/samples/entry.xml
    lenya/trunk/src/pubs/blog/xslt/feed/atom2other.xsl

Modified: lenya/trunk/src/pubs/blog/lenya/resources/samples/entry.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/pubs/blog/lenya/resources/samples/entry.xml?rev=376301&r1=376300&r2=376301&view=diff
==============================================================================
--- lenya/trunk/src/pubs/blog/lenya/resources/samples/entry.xml (original)
+++ lenya/trunk/src/pubs/blog/lenya/resources/samples/entry.xml Thu Feb  9 06:15:56 2006
@@ -5,7 +5,7 @@
   <echo:author>
     <echo:name>Bob B. Bobbington</echo:name>
   </echo:author>
-  <echo:link rel="alternate" href="http://bob.blog/" type="text/xml"/>
+  <echo:link rel="alternate" href="" type="text/xml"/>
   <echo:id>tag:bob.blog.net,2004:04:15:taxes</echo:id>
   <echo:created>2003-02-05T12:29:29-04:00</echo:created>
   <echo:issued>2003-02-05T08:29:29-04:00</echo:issued>

Modified: lenya/trunk/src/pubs/blog/xslt/feed/atom2other.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/pubs/blog/xslt/feed/atom2other.xsl?rev=376301&r1=376300&r2=376301&view=diff
==============================================================================
--- lenya/trunk/src/pubs/blog/xslt/feed/atom2other.xsl (original)
+++ lenya/trunk/src/pubs/blog/xslt/feed/atom2other.xsl Thu Feb  9 06:15:56 2006
@@ -56,9 +56,9 @@
       </title>
       <link>
         <xsl:choose>
-          <xsl:when test="echo:link/@href='self'">
-            <xsl:value-of select="$url"/>/<xsl:value-of select="$area"/>/<xsl:value-of select="echo:id"/>/index.html
-          </xsl:when>	
+          <xsl:when test="echo:link/@href=''">
+        <xsl:value-of select="concat($url, '/', $area, '/entries/', echo:id, '/index.html')"/>
+          </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="echo:link/@href"/>
           </xsl:otherwise>
@@ -71,7 +71,7 @@
         <xsl:value-of select="echo:content"/>
       </description>
       <guid isPermaLink="true">
-        <xsl:value-of select="$url"/>/<xsl:value-of select="$area"/>/<xsl:value-of select="echo:id"/>/index.html
+        <xsl:value-of select="concat($url, '/', $area, '/entries/', echo:id, '/index.html')"/>
       </guid>
     </item>
   </xsl:template>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org