svn commit: r643187 - in /lenya/trunk/src/modules/resource: sitemap.xmap xslt/resource2xhtml.xsl

Author: andreas
Date: Mon Mar 31 15:24:24 2008
New Revision: 643187

URL: http://svn.apache.org/viewvc?rev=643187&view=rev
Log:
Fixed index generation pipeline for resource module.

Modified:
    lenya/trunk/src/modules/resource/sitemap.xmap
    lenya/trunk/src/modules/resource/xslt/resource2xhtml.xsl

Modified: lenya/trunk/src/modules/resource/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/sitemap.xmap?rev=643187&r1=643186&r2=643187&view=diff
==============================================================================
--- lenya/trunk/src/modules/resource/sitemap.xmap (original)
+++ lenya/trunk/src/modules/resource/sitemap.xmap Mon Mar 31 15:24:24 2008
@@ -45,10 +45,7 @@
       
       <!-- {pub-id}/{area}/{uuid}/{language} -->
       <map:match pattern="lucene-index/*/*/*/*">
-        <map:aggregate element="cmsbody">
-          <map:part src="cocoon:/lenyametadata.xml/{1}/{2}/{3}/{4}/-1"/>
-          <map:part src="cocoon:/lucene-index-content/{1}/{2}/{3}/{4}.{doc-info:{1}:{2}:{3}:{4}:sourceExtension}"/>
-        </map:aggregate>
+        <map:generate src="cocoon:/lucene-index-content/{1}/{2}/{3}/{4}.{doc-info:{1}:{2}:{3}:{4}:sourceExtension}"/>
         <map:transform src="fallback://lenya/modules/xhtml/xslt/xhtml2index.xsl">
           <map:parameter name="url" value="{request:requestURI}"/>
         </map:transform>

Modified: lenya/trunk/src/modules/resource/xslt/resource2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/xslt/resource2xhtml.xsl?rev=643187&r1=643186&r2=643187&view=diff
==============================================================================
--- lenya/trunk/src/modules/resource/xslt/resource2xhtml.xsl (original)
+++ lenya/trunk/src/modules/resource/xslt/resource2xhtml.xsl Mon Mar 31 15:24:24 2008
@@ -100,7 +100,7 @@
         <th class="vertical"><i18n:text>MimeType</i18n:text>:</th>
         <td><xsl:value-of select="$mimeType"/></td>
       </tr>
-      <xsl:if test="mediameta:elements/mediameta:width != ''">
+      <xsl:if test="starts-with(docmeta:elements/docmeta:mimeType, 'image/')">
         <tr>
           <th class="vertical"><i18n:text>Width</i18n:text>:</th>
           <td><xsl:value-of select="mediameta:elements/mediameta:width"/></td>