From 2d6ceeb0267f322e71cc9aaa951fdf03a32593be Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Wed, 8 Jan 2025 14:10:30 +0100 Subject: [PATCH 1/2] fix imports the latest change in 4247d58d69cbb258c5a1f7c263abcf6780347cf6 did not update the module imports --- add/data/xql/getAnnotationsInText.xql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/add/data/xql/getAnnotationsInText.xql b/add/data/xql/getAnnotationsInText.xql index cdb9ee6ed..350c0daf6 100644 --- a/add/data/xql/getAnnotationsInText.xql +++ b/add/data/xql/getAnnotationsInText.xql @@ -9,6 +9,10 @@ xquery version "3.1"; @author Daniel Röwenstrunk :) +(: IMPORTS ================================================================= :) + +import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm"; + (: NAMESPACE DECLARATIONS ================================================== :) declare namespace ft = "http://exist-db.org/xquery/lucene"; @@ -17,8 +21,6 @@ declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization"; declare namespace request = "http://exist-db.org/xquery/request"; declare namespace xlink = "http://www.w3.org/1999/xlink"; declare namespace xmldb = "http://exist-db.org/xquery/xmldb"; -import module namespace eutil = "http://www.edirom.de/xquery/eutil" at "../xqm/eutil.xqm"; - (: OPTION DECLARATIONS ===================================================== :) From 36d86ba26dfbf4da6535b1ea2ffd3f8517ebe7ad Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Wed, 8 Jan 2025 17:17:08 +0100 Subject: [PATCH 2/2] fix datatype quantifiers --- add/data/xql/getAnnotationsInText.xql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/add/data/xql/getAnnotationsInText.xql b/add/data/xql/getAnnotationsInText.xql index 350c0daf6..d522e506e 100644 --- a/add/data/xql/getAnnotationsInText.xql +++ b/add/data/xql/getAnnotationsInText.xql @@ -39,14 +39,14 @@ declare function local:findAnnotations($uri as xs:string, $edition as xs:string) edition:collection($edition)//mei:annot[matches(@plist, $uri)] }; -declare function local:getAnnotations($uriSharp as xs:string, $annotations as element()*) as array(*)* { +declare function local:getAnnotations($uriSharp as xs:string, $annotations as element()*) as array(*) { array { for $annotation in $annotations let $id := $annotation/string(@xml:id) let $uri := concat('xmldb:exist://', document-uri($annotation/root()), '#', $id) let $prio := $annotation/mei:ptr[@type = "priority"]/replace(@target, '#', '') let $cat := $annotation/mei:ptr[@type = "categories"]/replace(@target, '#', '') - let $plist as array(*)* := + let $plist as array(*) := array { for $p in tokenize($annotation/@plist, '\s+') return