Mercurial > hg > mpdl-group
comparison software/eXist/webapp/mpdl/interface/page-fragment.xql @ 13:469d927b9ca7
diverse Fehlerbehebungen
author | Josef Willenborg <jwillenborg@mpiwg-berlin.mpg.de> |
---|---|
date | Tue, 19 Apr 2011 16:51:59 +0200 |
parents | d6f528ad5d96 |
children | e99964f390e4 |
comparison
equal
deleted
inserted
replaced
12:fba5577e49d9 | 13:469d927b9ca7 |
---|---|
19 let $mode := request:get-parameter("mode", "image") | 19 let $mode := request:get-parameter("mode", "image") |
20 | 20 |
21 let $reqPN := number(request:get-parameter("pn", "-1")) | 21 let $reqPN := number(request:get-parameter("pn", "-1")) |
22 let $reqPF := request:get-parameter("pf", "") | 22 let $reqPF := request:get-parameter("pf", "") |
23 let $reqSN := number(request:get-parameter("sn", "-1")) | 23 let $reqSN := number(request:get-parameter("sn", "-1")) |
24 let $xPointer := request:get-parameter("xpointer", "") | |
24 let $highlightQuery := request:get-parameter("highlightQuery", "") | 25 let $highlightQuery := request:get-parameter("highlightQuery", "") |
25 let $regCharNorm := request:get-parameter("characterNormalization", "") | 26 let $regCharNorm := request:get-parameter("characterNormalization", "") |
26 let $tmpCharNorm := string-join($regCharNorm, ',') | 27 let $tmpCharNorm := string-join($regCharNorm, ',') |
27 let $charNorm := | 28 let $charNorm := |
28 if($tmpCharNorm = "regPlusNorm") | 29 if($tmpCharNorm = "regPlusNorm") |
229 else if ($mode = "textPollux") | 230 else if ($mode = "textPollux") |
230 then mpdltext:dictionarize($pageFragmentNormalized, $language) | 231 then mpdltext:dictionarize($pageFragmentNormalized, $language) |
231 else () | 232 else () |
232 let $returnPageFragmentTmp := util:parse($retPageFragment) (: returns a valid xml document for that string :) | 233 let $returnPageFragmentTmp := util:parse($retPageFragment) (: returns a valid xml document for that string :) |
233 | 234 |
234 let $externalElementsTmpTmp := mpdltext:externalObject("read", "element", concat("<object uid='joe' documentId='", $mpdlDocUri, "' pageNumber='", $pn, "'></object>")) | 235 let $externalElementsTmpTmp := mpdltext:externalObject("read", "element", concat("<object uid="joe" documentId="", $mpdlDocUri, "" xpointer="", "#xpointer(id(", "'page", $pn, "'", "))"></object>")) |
235 let $externalElementsTmp := | 236 let $externalElementsTmp := |
236 if(not($externalElementsTmpTmp = "")) | 237 if(not($externalElementsTmpTmp = "")) |
237 then util:parse($externalElementsTmpTmp) | 238 then util:parse($externalElementsTmpTmp) |
238 else () | 239 else () |
239 let $externalElements := $externalElementsTmp/result/object | 240 let $externalElements := $externalElementsTmp/result/object |
242 then true() | 243 then true() |
243 else false() | 244 else false() |
244 let $returnPageFragmentWithExtObjects := | 245 let $returnPageFragmentWithExtObjects := |
245 <result> | 246 <result> |
246 <externalElements>{$externalElements}</externalElements> | 247 <externalElements>{$externalElements}</externalElements> |
248 <xpointer>{$xPointer}</xpointer> | |
247 <fragment>{$returnPageFragmentTmp}</fragment> | 249 <fragment>{$returnPageFragmentTmp}</fragment> |
248 </result> | 250 </result> |
249 let $returnPageFragment := | 251 let $returnPageFragment := |
250 if (contains($options, "withXmlNodeId") or $containsExternalElements) | 252 if (contains($options, "withXmlNodeId") or $containsExternalElements or $xPointer != '') |
251 then mpdl-text:transform($returnPageFragmentWithExtObjects, concat($presentationPath, "/insertExternalElements.xsl")) | 253 then mpdl-text:transform($returnPageFragmentWithExtObjects, concat($presentationPath, "/insertExternalElements.xsl")) |
252 else $returnPageFragmentTmp | 254 else $returnPageFragmentTmp |
253 | 255 |
254 let $pageFigureAnchors := $returnPageFragment//anchor[@type = 'figure'] | 256 let $pageFigureAnchors := $returnPageFragment//anchor[@type = 'figure'] |
255 let $pageFigures := | 257 let $pageFigures := |
375 <options>{$options}</options> | 377 <options>{$options}</options> |
376 </page> | 378 </page> |
377 <performance>{$neededTime}</performance> | 379 <performance>{$neededTime}</performance> |
378 </result> | 380 </result> |
379 else if ($errorCode = 10) | 381 else if ($errorCode = 10) |
380 then <error><number>{$errorCode}</number><description>Fulltext document: {$mpdlDocUri} is not available yet</description></error> | 382 then <error><number>{$errorCode}</number><description>Can't find fulltext document: {$mpdlDocUri} </description></error> |
381 else if ($errorCode = 11) | 383 else if ($errorCode = 11) |
382 then <error><number>{$errorCode}</number><description>No result: Page {$pn} not found</description></error> | 384 then <error><number>{$errorCode}</number><description>No result: Page {$pn} not found</description></error> |
383 else if ($errorCode = 12) | 385 else if ($errorCode = 12) |
384 then <error><number>{$errorCode}</number><description>View mode {$mode} not available</description></error> | 386 then <error><number>{$errorCode}</number><description>View mode {$mode} not available</description></error> |
385 else <error><number>{$errorCode}</number><description>undefined error: {$errorCode}</description></error> | 387 else <error><number>{$errorCode}</number><description>undefined error: {$errorCode}</description></error> |
386 | 388 |
387 let $declare := | 389 let $declare := |
388 if ($errorCode > 9 or $mode = "text" or $mode = "textPollux" or $mode = "gis" or $mode = "image" or $mode = "xml") | 390 if ($errorCode > 9 or $mode = "text" or $mode = "textPollux" or $mode = "gis" or $mode = "image" or $mode = "xml") |
389 then util:declare-option("exist:serialize", "method=xhtml media-type=text/html omit-xml-declaration=no indent=yes encoding=utf-8") | 391 then util:declare-option("exist:serialize", "method=xhtml media-type=text/html omit-xml-declaration=no indent=no encoding=utf-8") |
390 else if ($mode = "pureXml") | 392 else if ($mode = "pureXml") |
391 then util:declare-option("exist:serialize", "method=xml media-type=text/xml omit-xml-declaration=no indent=yes encoding=utf-8") | 393 then util:declare-option("exist:serialize", "method=xml media-type=text/xml omit-xml-declaration=no indent=yes encoding=utf-8") |
392 else util:declare-option("exist:serialize", "method=xml media-type=text/xml omit-xml-declaration=no indent=yes encoding=utf-8") | 394 else util:declare-option("exist:serialize", "method=xml media-type=text/xml omit-xml-declaration=no indent=yes encoding=utf-8") |
393 let $xslFilePath := | 395 let $xslFilePath := |
394 if($mode = "text" or $mode = "textPollux" or $mode = "gis" or $mode = "image" or $mode = "xml") | 396 if($mode = "text" or $mode = "textPollux" or $mode = "gis" or $mode = "image" or $mode = "xml") |