diff software/eXist/webapp/mpdl/page-query-result.xql @ 9:1ec29fdd0db8

neue .lex Dateien f?r Normalisierung / externe Objekte update
author Josef Willenborg <jwillenborg@mpiwg-berlin.mpg.de>
date Tue, 22 Feb 2011 16:03:45 +0100
parents d2a1c14fde31
children d6f528ad5d96
line wrap: on
line diff
--- a/software/eXist/webapp/mpdl/page-query-result.xql	Thu Feb 10 14:02:05 2011 +0100
+++ b/software/eXist/webapp/mpdl/page-query-result.xql	Tue Feb 22 16:03:45 2011 +0100
@@ -270,16 +270,16 @@
   if(not(empty($externalElements)))
   then true()
   else false()
-let $returnPageFragmentTmpp := 
+let $returnPageFragmentWithExtObjects :=
+  <result>
+    <externalElements>{$externalElements}</externalElements>
+    <fragment>{$returnPageFragmentTmp}</fragment>
+  </result>
+let $returnPageFragment := 
   if (contains($options, "withXmlNodeId") or $containsExternalElements)
-  then mpdl-text:insertNodeIdAttribute($returnPageFragmentTmp/*[1])
+  then mpdl-text:transform($returnPageFragmentWithExtObjects, concat($presentationPath, "/insertExternalElements.xsl"))
   else $returnPageFragmentTmp
 
-let $returnPageFragment := 
-  if($containsExternalElements)
-  then mpdl-text:insert($returnPageFragmentTmpp/*[1], $externalElements) 
-  else $returnPageFragmentTmpp
-
 let $pageFigureAnchors := $returnPageFragment//anchor[@type = 'figure']
 let $pageFigures :=
     for $pageFigureAnchor in $pageFigureAnchors