--- a/software/eXist/webapp/mpdl/page-query-result.xql	Mon Aug 29 17:40:02 2011 +0200
+++ b/software/eXist/webapp/mpdl/page-query-result.xql	Mon Aug 29 17:40:19 2011 +0200
@@ -23,6 +23,8 @@
 let $reqSN := number(request:get-parameter("sn", "-1"))
 let $xPointer := request:get-parameter("xpointer", "")
 let $query := request:get-parameter("query", "")
+let $highlightElement := request:get-parameter("highlightElement", "")
+let $highlightElementPos := number(request:get-parameter("highlightElementPos", "-1"))
 let $reqQueryResultPN := request:get-parameter("query-result-pn", "")
 let $queryResultPN := 
   if ($reqQueryResultPN = '' or $reqQueryResultPN = '0')
@@ -130,7 +132,7 @@
   else $reqPN
 let $sn := 
   if (($queryType = 'fulltext' or $queryType = 'fulltextMorph' or $queryType = 'fulltextMorphLemma') and $countHits > 0 and $reqPN <= 0 and $reqSN < 0)
-  then number($firstHit/pos-of-s)
+  then number($firstHit/posOfHit)
   else $reqSN
 
 (: 10 or more is an error :)
@@ -274,7 +276,7 @@
   else ()
 let $returnPageFragmentTmp := util:parse($retPageFragment)  (: returns a valid xml document for that string   :)  
 
-let $externalElementsTmpTmp := mpdltext:externalObject("read", "element", concat("<object uid=&quot;joe&quot; documentId=&quot;", $mpdlDocUri, "&quot; xpointer=&quot;", "#xpointer(id(", "'page", $pn, "'", "))&quot;></object>"))
+let $externalElementsTmpTmp := mpdltext:externalObject("read", "element", concat("<object documentId=&quot;", $mpdlDocUri, "&quot; xpointer=&quot;", "id(", "'page", $pn, "'", ")&quot;></object>"))
 let $externalElementsTmp := 
   if(not($externalElementsTmpTmp = ""))
   then util:parse($externalElementsTmpTmp)
@@ -374,6 +376,8 @@
         <mode>{$mode}</mode>
         <number>{$pn}</number>
         <sentence-number>{$sn}</sentence-number>
+        <highlightElement>{$highlightElement}</highlightElement>
+        <highlightElementPos>{$highlightElementPos}</highlightElementPos>
         <header>{$pageHeader}</header>
         <number-orig>{$pageNumberOrig}</number-orig>
         <digilib-available>{$digilibAvailable}</digilib-available>