diff software/eXist/webapp/mpdl/presentation/insertExternalElements.xsl @ 15:e99964f390e4

diverse Fehlerbehebungen
author Josef Willenborg <jwillenborg@mpiwg-berlin.mpg.de>
date Mon, 29 Aug 2011 17:40:19 +0200
parents 469d927b9ca7
children 7e883ce72fec
line wrap: on
line diff
--- a/software/eXist/webapp/mpdl/presentation/insertExternalElements.xsl	Mon Aug 29 17:40:02 2011 +0200
+++ b/software/eXist/webapp/mpdl/presentation/insertExternalElements.xsl	Mon Aug 29 17:40:19 2011 +0200
@@ -84,9 +84,10 @@
   <xsl:variable name="elemXmlNodeIdTmp" select="saxon:path(.)"/>
   <xsl:variable name="elemXmlNodeId" select="concat('/', substring-after(substring-after(substring-after($elemXmlNodeIdTmp, '/'), '/'), '/'))"/>
   <xsl:variable name="extElemXmlNodeIds" select="$externalElements//@xmlNodeId"/>
+  <!-- Bug: if there are more than one external node at the same position, index-of delivers an error: ToDo: handle more than one external nodes at one position  -->
   <xsl:variable name="extElemIndex" select="index-of($extElemXmlNodeIds, $elemXmlNodeId)"/>
   <xsl:variable name="extElem" select="$externalElements/*[$extElemIndex]"/>
-  <xsl:variable name="extElemContent" select="$extElem/content/*[1]"/>
+  <xsl:variable name="extElemContent" select="$extElem/*[1]"/>
   <xsl:variable name="extElemXPointer" select="$extElem/@xpointer"/>
   <xsl:variable name="extElemXPointerPoint" select="substring-before(substring-after($extElemXPointer, '/point('), ')')"/>
   <xsl:variable name="extElemXPointerPointInt">
@@ -140,7 +141,7 @@
     <xsl:sequence select="$extElemContent"/>
   </xsl:if>
   <xsl:if test="$extElemXPointerPointInt &gt;= 0">
-    <xsl:variable name="extElemContent" select="$extElem/content/*[1]"/>
+    <xsl:variable name="extElemContent" select="$extElem/*[1]"/>
     <xsl:variable name="extElemContentSerialized" select="saxon:serialize($extElemContent, 'myXml')"/>
     <xsl:variable name="elemSerialized" select="saxon:serialize(., 'myXml')"/>
     <xsl:variable name="insertedElemSerialized" select="mpdlxmlutil:insertAtCharPos(mpdlxmlutil:new(), $elemSerialized, string($extElemXPointerPointInt), $extElemContentSerialized)"/>