Commit b7bef0ec authored by mrodzis's avatar mrodzis
Browse files

Merge branch 'feature/register' into 'develop'

refactored index transformation

See merge request !4
parents 0079e937 36765d5a
......@@ -230,13 +230,13 @@ declare function f-misc:list($datadir, $param, $num as xs:integer) {
<li>Stellenkommentar</li>
<li>Register
<ul>
<li><a href="register.html?nb={$uri[last()]}&amp;r=253sx">Register der Personen und Werke</a></li>
<li><a href="register.html?nb={$uri[last()]}&amp;r=253t3">Register der Werke</a></li>
<li>Register der Werke Theodor Fontanes</li>
<li>Register der Periodika</li>
<li><a href="register.html?nb={$uri[last()]}&amp;r=253t2">Geographisches Register</a></li>
<li><a href="register.html?nb={$uri[last()]}&amp;r=253t0">Register der Ereignisse</a></li>
<li><a href="register.html?nb={$uri[last()]}&amp;r=253t1">Register der Institutionen und Körperschaften</a></li>
<li><a href="register.html?nb={$uri[last()]}&amp;i=pers">Register der Personen und Werke</a></li>
<li><a href="register.html?nb={$uri[last()]}&amp;i=work">Register der Werke</a></li>
<li><a href="register.html?nb={$uri[last()]}&amp;i=work-fontane">Register der Werke Theodor Fontanes</a></li>
<li><a href="register.html?nb={$uri[last()]}&amp;i=work-periodical">Register der Periodika</a></li>
<li><a href="register.html?nb={$uri[last()]}&amp;i=place">Geographisches Register</a></li>
<li><a href="register.html?nb={$uri[last()]}&amp;i=event">Register der Ereignisse</a></li>
<li><a href="register.html?nb={$uri[last()]}&amp;i=org">Register der Institutionen und Körperschaften</a></li>
</ul>
</li>
</ul>
......
This diff is collapsed.
......@@ -584,7 +584,9 @@ declare function fontaneTransfo:surfaceDiv($node as node(), $inital as xs:string
if( config:get("sade.develop") = "true" )
then serialize($node)
else (serialize($node) => replace("<!--.*?-->", "") => replace("\n+", "&#10;")),
if($node/following-sibling::*[1]/local-name() = "note") then serialize($node/following-sibling::tei:note) else ()
for $n in $node/following-sibling::tei:note
where $n >> $node and $n << ($node/following-sibling::tei:surface)[1]
return serialize($n)
}
}
}
......
......@@ -15,7 +15,7 @@ import module namespace dsk-view="http://semtonotes.github.io/SemToNotes/dsk-vie
import module namespace fontaneTransfo="http://fontane-nb.dariah.eu/Transfo" at '../fontane/transform.xqm';
import module namespace fontaneSfEx="http://fontane-nb.dariah.eu/SfEx" at '../fontane/surfaceExtract.xqm';
import module namespace fontaneLitVZ="http://fontane-nb.dariah.eu/LitVZ" at "../fontane/literaturverzeichnis.xqm";
import module namespace fontaneregister="http://fontane-nb.dariah.eu/register" at "../fontane/register.xqm";
import module namespace f-register="http://fontane-nb.dariah.eu/register" at "../fontane/register.xqm";
import module namespace fontaneUeberblickskommentar="http://fontane-nb.dariah.eu/Ueberblickskommentar" at "../fontane/ueberblickskommentar.xqm";
import module namespace console="http://exist-db.org/xquery/console";
......@@ -73,7 +73,7 @@ declare function local:showAuth($node as node(), $model as map(*), $id as xs:str
case 'ueberblickskommentar' return
try {fontaneUeberblickskommentar:render($docpath)}
catch * { <error>Caught error {$err:code}: <br/> {$err:description}. <br/> Data: <br/> {$err:value} </error> }
case 'register' return fontaneregister:register($docpath)
case 'register' return f-register:register()
default return mviewer:renderFontane($node, $model, $docpath)
else
<div class="container FontaneAuth">
......@@ -427,5 +427,5 @@ declare function mviewer:registerT($node as node(), $model as map(*), $id as xs:
let $data-dir := config:get('data-dir')
let $docpath := $data-dir || '/' || $id
return
fontaneregister:register( $docpath )
f-register:register()
};
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment