apply some fixes for current eXist-db 4.7

expath-pkg.xml.tmpl

@@ -2,7 +2,7 @@
 <package xmlns="http://expath.org/ns/pkg" name="@project.name@"
     abbrev="@project.app@" version="@project.version@" spec="1.0">
     <title>@project.app@</title>
-    <dependency processor="http://exist-db.org" semver-min="3.0.0" semver-max="3.3.0"/>
+    <dependency processor="http://exist-db.org" />
     <dependency package="http://weber-gesamtausgabe.de/webapp-lib"/>
     <dependency package="http://exist-db.org/apps/shared"/>
     <dependency package="http://www.functx.com"/>

modules/app.xqm

@@ -920,7 +920,7 @@ declare
         return
             map { 'beaconLinks': 
                     for $i in map:keys($beaconMap)
-                    order by $beaconMap($i)[2] collation "?lang=de-DE"
+                    order by $beaconMap($i)[2]
                     return 
                         (: replacement in @href for invalid links from www.sbn.it :)
                         <a title="{$i}" href="{replace($beaconMap($i)[1], '\\', '%5C')}">{$beaconMap($i)[2]}</a>

modules/bibl.xqm

@@ -1,7 +1,7 @@
 xquery version "3.0" encoding "UTF-8";
 
 module namespace bibl="http://xquery.weber-gesamtausgabe.de/modules/bibl";
-declare default collation "?lang=de;strength=primary";
+
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace xhtml="http://www.w3.org/1999/xhtml";

modules/config.xqm

@@ -159,10 +159,22 @@ declare function config:set-option($key as xs:string, $value as xs:string) as xs
  : @return xs:string document type
 :)
 declare function config:get-doctype-by-id($id as xs:string?) as xs:string? {
-    for $func in $wdt:functions
-    return 
-        if($func($id)('check')() and $func($id)('prefix')) then $func($id)('name')
-        else ()
+    if(config:is-person($id)) then 'persons'
+    else if(config:is-writing($id)) then 'writings'
+    else if(config:is-work($id)) then 'works'
+    else if(config:is-diary($id)) then 'diaries'
+    else if(config:is-letter($id)) then 'letters'
+    else if(config:is-news($id)) then 'news'
+    else if(config:is-iconography($id)) then 'iconography'
+    else if(config:is-var($id)) then 'var'
+    else if(config:is-biblio($id)) then 'biblio'
+    else if(config:is-place($id)) then 'places'
+    else if(config:is-source($id)) then 'sources'
+    else if(config:is-org($id)) then 'orgs'
+    else if(config:is-addenda($id)) then 'addenda'
+    else if(config:is-thematicCommentary($id)) then 'thematicCommentaries'
+    else if(config:is-document($id)) then 'documents'
+    else ()
 };
 
 declare function config:get-combined-doctype-by-id($id as xs:string?) as xs:string* {
@@ -261,47 +273,47 @@ declare function config:is-var($docID as xs:string?) as xs:boolean {
 };
 
 (:~
- : Checks whether a given id matches the WeGA pattern of biblio ids
+ : Checks whether a given id matches the WeGA pattern of org ids
  :
  : @author Peter Stadler
  : @param $docID the id to test as string
  : @return xs:boolean
 :)
-declare function config:is-biblio($docID as xs:string?) as xs:boolean {
-    matches($docID, '^A11\d{4}$')
+declare function config:is-org($docID as xs:string?) as xs:boolean {
+    matches($docID, '^A08\d{4}$')
 };
 
 (:~
- : Checks whether a given id matches the WeGA pattern of places ids
+ : Checks whether a given id matches the WeGA pattern of thematicCommentary ids
  :
  : @author Peter Stadler
  : @param $docID the id to test as string
  : @return xs:boolean
 :)
-declare function config:is-place($docID as xs:string?) as xs:boolean {
-    matches($docID, '^A13\d{4}$')
+declare function config:is-thematicCommentary($docID as xs:string?) as xs:boolean {
+    matches($docID, '^A09\d{4}$')
 };
 
 (:~
- : Checks whether a given id matches the WeGA pattern of sources ids
+ : Checks whether a given id matches the WeGA pattern of document ids
  :
  : @author Peter Stadler
  : @param $docID the id to test as string
  : @return xs:boolean
 :)
-declare function config:is-source($docID as xs:string?) as xs:boolean {
-    matches($docID, '^A22\d{4}$')
+declare function config:is-document($docID as xs:string?) as xs:boolean {
+    matches($docID, '^A10\d{4}$')
 };
 
 (:~
- : Checks whether a given id matches the WeGA pattern of org ids
+ : Checks whether a given id matches the WeGA pattern of biblio ids
  :
  : @author Peter Stadler
  : @param $docID the id to test as string
  : @return xs:boolean
 :)
-declare function config:is-org($docID as xs:string?) as xs:boolean {
-    matches($docID, '^A08[0-9A-F]{4}$')
+declare function config:is-biblio($docID as xs:string?) as xs:boolean {
+    matches($docID, '^A11\d{4}$')
 };
 
 (:~
@@ -312,7 +324,29 @@ declare function config:is-org($docID as xs:string?) as xs:boolean {
  : @return xs:boolean
 :)
 declare function config:is-addenda($docID as xs:string?) as xs:boolean {
-    matches($docID, '^A12[0-9]{4}$')
+    matches($docID, '^A12\d{4}$')
+};
+
+(:~
+ : Checks whether a given id matches the WeGA pattern of places ids
+ :
+ : @author Peter Stadler
+ : @param $docID the id to test as string
+ : @return xs:boolean
+:)
+declare function config:is-place($docID as xs:string?) as xs:boolean {
+    matches($docID, '^A13\d{4}$')
+};
+
+(:~
+ : Checks whether a given id matches the WeGA pattern of sources ids
+ :
+ : @author Peter Stadler
+ : @param $docID the id to test as string
+ : @return xs:boolean
+:)
+declare function config:is-source($docID as xs:string?) as xs:boolean {
+    matches($docID, '^A22\d{4}$')
 };
 
 (:~

modules/core.xqm

@@ -4,7 +4,7 @@ xquery version "3.1";
  : Core functions of the WeGA-WebApp
  :)
 module namespace core="http://xquery.weber-gesamtausgabe.de/modules/core";
-declare default collation "?lang=de;strength=primary";
+
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace request="http://exist-db.org/xquery/request";

modules/dev/api.xql

@@ -7,7 +7,7 @@ xquery version "3.1" encoding "UTF-8";
  : @version 1.0
  :)
 
-declare default collation "?lang=de;strength=primary";
+
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace xhtml="http://www.w3.org/1999/xhtml";

modules/dev/dev-app.xqm

@@ -8,7 +8,7 @@ module namespace dev-app="http://xquery.weber-gesamtausgabe.de/modules/dev/dev-a
  : @version 1.0
  :)
 
-declare default collation "?lang=de;strength=primary";
+
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace templates="http://exist-db.org/xquery/templates";

modules/dev/dev.xqm

@@ -8,7 +8,7 @@ xquery version "3.0" encoding "UTF-8";
  :)
 
 module namespace dev="http://xquery.weber-gesamtausgabe.de/modules/dev";
-declare default collation "?lang=de;strength=primary";
+
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace xhtml="http://www.w3.org/1999/xhtml";

modules/dev/ediarum.xql

@@ -4,7 +4,7 @@ xquery version "3.0" encoding "UTF-8";
  : XQuery functions for integration with oXygen editor
 :)
 
-declare default collation "?lang=de;strength=primary";
+
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace xhtml="http://www.w3.org/1999/xhtml";

modules/facets.xqm

@@ -8,7 +8,7 @@ xquery version "3.1" encoding "UTF-8";
  :)
 
 module namespace facets="http://xquery.weber-gesamtausgabe.de/modules/facets";
-declare default collation "?lang=de;strength=primary";
+
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace xhtml="http://www.w3.org/1999/xhtml";

modules/img.xqm

@@ -7,7 +7,7 @@ xquery version "3.1" encoding "UTF-8";
 :)
 
 module namespace img="http://xquery.weber-gesamtausgabe.de/modules/img";
-declare default collation "?lang=de;strength=primary";
+
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace xhtml="http://www.w3.org/1999/xhtml";

modules/norm.xqm

@@ -4,7 +4,7 @@ xquery version "3.0";
  : XQuery module for creating normalized lists of documents
  :)
 module namespace norm="http://xquery.weber-gesamtausgabe.de/modules/norm";
-declare default collation "?lang=de;strength=primary";
+
 
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";

modules/query.xqm

@@ -4,7 +4,7 @@ xquery version "3.1" encoding "UTF-8";
  : Functions for querying data from the WeGA-data app 
 :)
 module namespace query="http://xquery.weber-gesamtausgabe.de/modules/query";
-declare default collation "?lang=de;strength=primary";
+
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace gn="http://www.geonames.org/ontology#";

modules/wega-util.xqm

@@ -4,7 +4,7 @@ xquery version "3.1" encoding "UTF-8";
  : Various utility functions for the WeGA WebApp
 :)
 module namespace wega-util="http://xquery.weber-gesamtausgabe.de/modules/wega-util";
-declare default collation "?lang=de;strength=primary";
+
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace wega="http://www.weber-gesamtausgabe.de";