Mercurial > hg > mpdl-group

changeset 8:d2a1c14fde31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fehlerkorrektur GIS Mode
author Josef Willenborg <jwillenborg@mpiwg-berlin.mpg.de>
date Thu, 10 Feb 2011 14:02:05 +0100
parents 5589d865af7a
children 1ec29fdd0db8
files software/eXist/webapp/mpdl/interface/external/object.xql software/eXist/webapp/mpdl/interface/page-fragment.xql software/eXist/webapp/mpdl/page-query-result.xql software/eXist/webapp/mpdl/presentation/pageFragmentHtml.xsl software/eXist/webapp/mpdl/presentation/pageHtml.xsl
diffstat 5 files changed, 11 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/software/eXist/webapp/mpdl/interface/external/object.xql	Tue Feb 08 15:16:46 2011 +0100
+++ b/software/eXist/webapp/mpdl/interface/external/object.xql	Thu Feb 10 14:02:05 2011 +0100
@@ -1,19 +1,11 @@
 xquery version "1.0";
 
 declare namespace request="http://exist-db.org/xquery/request";
-declare namespace response="http://exist-db.org/xquery/response";
-declare namespace session="http://exist-db.org/xquery/session";
-declare namespace echo="http://www.mpiwg-berlin.mpg.de/ns/echo/1.0/";
 
 let $operation := request:get-parameter("operation", "")
 let $type := request:get-parameter("type", "")
-let $uid := request:get-parameter("uid", "")
-let $document := request:get-parameter("document", "")
-let $pn := request:get-parameter("pn", "-1")
-let $xpath := request:get-parameter("xpath", "")
-let $charPosition := request:get-parameter("charPosition", "")
-let $externalObject := request:get-parameter("externalObject", "")
+let $object := request:get-parameter("object", "")
 
-let $result := mpdltext:externalObject($operation, $type, $uid, $document, $pn, $xpath, $charPosition, $externalObject)
+let $result := mpdltext:externalObject($operation, $type, $object)
 
 return $result
\ No newline at end of file
--- a/software/eXist/webapp/mpdl/interface/page-fragment.xql	Tue Feb 08 15:16:46 2011 +0100
+++ b/software/eXist/webapp/mpdl/interface/page-fragment.xql	Thu Feb 10 14:02:05 2011 +0100
@@ -217,12 +217,12 @@
   else ()
 let $returnPageFragmentTmp := util:parse($retPageFragment)  (: returns a valid xml document for that string   :)  
 
-let $externalElementsTmpTmp := mpdltext:externalObject("read", "element", "", $mpdlDocUri, string($pn), "", "", "")
+let $externalElementsTmpTmp := mpdltext:externalObject("read", "element", concat("<object uid='joe' documentId='", $mpdlDocUri, "' pageNumber='", $pn, "'></object>"))
 let $externalElementsTmp := 
   if(not($externalElementsTmpTmp = ""))
   then util:parse($externalElementsTmpTmp)
   else ()
-let $externalElements := $externalElementsTmp/result/element
+let $externalElements := $externalElementsTmp/result/object
 let $containsExternalElements := 
   if(not(empty($externalElements)))
   then true()
--- a/software/eXist/webapp/mpdl/page-query-result.xql	Tue Feb 08 15:16:46 2011 +0100
+++ b/software/eXist/webapp/mpdl/page-query-result.xql	Thu Feb 10 14:02:05 2011 +0100
@@ -260,7 +260,7 @@
   else ()
 let $returnPageFragmentTmp := util:parse($retPageFragment)  (: returns a valid xml document for that string   :)  
 
-let $externalElementsTmpTmp := mpdltext:externalObject("read", "element", "<object uid='joe' documentId='/archimedes/it/l223.xml' pageNumber='17'></object>")
+let $externalElementsTmpTmp := mpdltext:externalObject("read", "element", concat("<object uid='joe' documentId='", $mpdlDocUri, "' pageNumber='", $pn, "'></object>"))
 let $externalElementsTmp := 
   if(not($externalElementsTmpTmp = ""))
   then util:parse($externalElementsTmpTmp)
--- a/software/eXist/webapp/mpdl/presentation/pageFragmentHtml.xsl	Tue Feb 08 15:16:46 2011 +0100
+++ b/software/eXist/webapp/mpdl/presentation/pageFragmentHtml.xsl	Thu Feb 10 14:02:05 2011 +0100
@@ -549,6 +549,9 @@
         <a class="textPollux"><xsl:attribute name="href"><xsl:value-of select="$lexHref"/></xsl:attribute><xsl:value-of select="$wordStr"/></a>
       </span>
     </xsl:when>
+    <xsl:when test="$mode = 'gis'">
+      <a><xsl:attribute name="href"><xsl:value-of select="$href"/></xsl:attribute><xsl:apply-templates mode="text"/></a>
+    </xsl:when>
     <xsl:otherwise>
       <span class="place">
         <xsl:apply-templates mode="text"/>
--- a/software/eXist/webapp/mpdl/presentation/pageHtml.xsl	Tue Feb 08 15:16:46 2011 +0100
+++ b/software/eXist/webapp/mpdl/presentation/pageHtml.xsl	Thu Feb 10 14:02:05 2011 +0100
@@ -1079,6 +1079,9 @@
         <a class="textPollux"><xsl:attribute name="href"><xsl:value-of select="$lexHref"/></xsl:attribute><xsl:value-of select="$wordStr"/></a>
       </span>
     </xsl:when>
+    <xsl:when test="$mode = 'gis'">
+      <a><xsl:attribute name="href"><xsl:value-of select="$href"/></xsl:attribute><xsl:apply-templates mode="text"/></a>
+    </xsl:when>
     <xsl:otherwise>
       <span class="place">
         <xsl:apply-templates mode="text"/>