From 496fa18d95969c91c7c31be3e217b181d7b957f9 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Mon, 14 Sep 2020 17:35:02 +0200
Subject: [PATCH 01/14] first shot at implementing #359

---
 catalogues/dictionary_de.xml       |  5 ++++-
 catalogues/dictionary_en.xml       |  5 ++++-
 modules/api.xqm                    | 11 +++++++++++
 modules/facets.xqm                 | 29 ++++++++++++++++++++++++++++-
 modules/search.xqm                 | 12 +++++++++++-
 templates/ajax/correspondence.html |  2 ++
 templates/ajax/documents.html      |  3 +++
 7 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/catalogues/dictionary_de.xml b/catalogues/dictionary_de.xml
index b7cb8716c..d03d80bef 100644
--- a/catalogues/dictionary_de.xml
+++ b/catalogues/dictionary_de.xml
@@ -600,4 +600,7 @@
     <entry xml:id="nextMatch">Nächstes Suchergebnis</entry>
     <entry xml:id="dataMigratedFrom">Datenübernahme aus</entry>
     <entry xml:id="furtherInformationSeeThere">weitere Informationen siehe dort</entry>
-</dictionary>
+    <entry xml:id="internal">intern (WeGA)</entry>
+    <entry xml:id="external">extern</entry>
+    <entry xml:id="without">ohne</entry>
+</dictionary>
\ No newline at end of file
diff --git a/catalogues/dictionary_en.xml b/catalogues/dictionary_en.xml
index 6532c8891..db166a167 100644
--- a/catalogues/dictionary_en.xml
+++ b/catalogues/dictionary_en.xml
@@ -570,4 +570,7 @@
     <entry xml:id="nextMatch">Next Match</entry>
     <entry xml:id="dataMigratedFrom">Data migrated from</entry>
     <entry xml:id="furtherInformationSeeThere">further information see there</entry>
-</dictionary>
+    <entry xml:id="internal">internal (WeGA)</entry>
+    <entry xml:id="external">external</entry>
+    <entry xml:id="without">without</entry>
+</dictionary>
\ No newline at end of file
diff --git a/modules/api.xqm b/modules/api.xqm
index 475333569..9e43a1e77 100644
--- a/modules/api.xqm
+++ b/modules/api.xqm
@@ -733,6 +733,17 @@ declare function api:validate-repository($model as map()) as map()? {
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "repository".' )
 }; 
 
+
+(:~
+ : Check parameter facsimile ('internal','external','without')
+ : multiple values allowed as input, either by providing multiple URL parameters
+ : or by sending a comma separated list as the value of one URL parameter
+~:)
+declare function api:validate-facsimile($model as map()) as map()? {
+    if(xmldb:decode-uri($model?facsimile) = ('internal','external','without')) then $model
+    else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "facsimile". Must be one of "internal", "external", or "without".')
+};
+
 (:~
  : Fallback for unknown API parameters 
  : Simply returns an error message
diff --git a/modules/facets.xqm b/modules/facets.xqm
index 85fe3211e..fd78fcc4a 100644
--- a/modules/facets.xqm
+++ b/modules/facets.xqm
@@ -39,7 +39,7 @@ declare
         let $facet := $node/data(@name)
         let $selected := $model?filters?($facet)
         let $selectedObjs as array(*)? := 
-            if(count($selected) gt 0) then facets:createFacets($model?search-results, $facet, -1, $lang)
+            if(count($selected) gt 0) then facets:facets($model?search-results, $facet, -1, $lang)
             else ()
         return
             element {name($node)} {
@@ -67,6 +67,7 @@ declare
 declare function facets:facets($nodes as node()*, $facet as xs:string, $max as xs:integer, $lang as xs:string) as array(*)  {
     switch($facet)
     case 'textType' return facets:from-docType($nodes, $facet, $lang)
+    case 'facsimile' return facets:facsimile($nodes, $facet, $lang)
     default return facets:createFacets($nodes, $facet, $max, $lang)
 };
 
@@ -84,6 +85,32 @@ declare %private function facets:from-docType($collection as node()*, $facet as
     ]
 };
 
+declare %private function facets:facsimile($collection as node()*, $facet as xs:string, $lang as xs:string) as array(*) {
+    let $facsimiles := $collection ! query:facsimile(.)
+    let $external := count($facsimiles[@sameAs]/root())
+    let $internal := count($facsimiles[not(@sameAs)][tei:graphic]/root())
+    let $noFacs := count($collection) - $external - $internal
+    return
+        [
+            map {
+                'value' : 'internal',
+                'label' : lang:get-language-string('internal', $lang),
+                'frequency' : $internal
+            },
+            map {
+                'value' : 'external',
+                'label' : lang:get-language-string('external', $lang),
+                'frequency' : $external
+            },
+            map {
+                'value' : 'without',
+                'label' : lang:get-language-string('without', $lang),
+                'frequency' : $noFacs
+            }
+        ]
+};
+
+
 (:~
  : Create facets
  :
diff --git a/modules/search.xqm b/modules/search.xqm
index 389ebd7dc..a993b6231 100644
--- a/modules/search.xqm
+++ b/modules/search.xqm
@@ -34,7 +34,7 @@ declare variable $search:valid-params := ('biblioType', 'editors', 'authors', 'w
     'occupations', 'docSource', 'composers', 'librettists', 'lyricists', 'dedicatees', 'journals', 
     'docStatus', 'addressee', 'sender', 'textType', 'residences', 'places', 'placeOfAddressee', 'placeOfSender',
     'fromDate', 'toDate', 'undated', 'hideRevealed', 'docTypeSubClass', 'sex', 'surnames', 'forenames', 
-    'asksam-cat', 'vorlageform', 'einrichtungsform', 'placenames', 'repository');
+    'asksam-cat', 'vorlageform', 'einrichtungsform', 'placenames', 'repository', 'facsimile');
 
 (:~
  : Main function called from the templating module
@@ -302,6 +302,7 @@ declare %private function search:filter-result($collection as document-node()*,
         else if($filter = ('fromDate', 'toDate')) then wdt:lookup($docType, $collection)?filter-by-date(try {$filters?fromDate cast as xs:date} catch * {()}, try {$filters?toDate cast as xs:date} catch * {()} )
         else if($filter = 'textType') then search:textType-filter($collection, $filters)
         else if($filter = 'hideRevealed') then search:revealed-filter($collection, $filters)
+        else if($filter = 'facsimile') then search:facsimile-filter($collection, $filters)
         (: exact search for terms -> range:eq :)
         else if($filter = ('journals', 'forenames', 'surnames', 'sex', 'occupations')) then query:get-facets($collection, $filter)[range:eq(.,$filters($filter))]/root()
         (: range:contains for tokens within key values  :)
@@ -350,6 +351,15 @@ declare %private function search:revealed-filter($collection as document-node()*
     $collection//tei:correspDesc[not(@n='revealed')]/root()
 };
 
+declare %private function search:facsimile-filter($collection as document-node()*, $filters as map(*)) as document-node()* {
+    let $facsimiles := $collection ! query:facsimile(.)
+    return
+        switch($filters?facsimile)
+        case 'internal' return $facsimiles[not(@sameAs)][tei:graphic]/root()
+        case 'external' return $facsimiles[@sameAs]/root()
+        default return $collection except $facsimiles/root()
+};
+
 (:~
  : 
 ~:)
diff --git a/templates/ajax/correspondence.html b/templates/ajax/correspondence.html
index f4a753189..2703daec7 100644
--- a/templates/ajax/correspondence.html
+++ b/templates/ajax/correspondence.html
@@ -26,6 +26,8 @@ <h4 data-template="lang:translate">works</h4>
             <select multiple="multiple" data-template="facets:select" name="works"/>
             <h4 data-template="lang:translate">repository</h4>
             <select multiple="multiple" data-template="facets:select" name="repository"/>
+            <h4 data-template="lang:translate">facsimile</h4>
+            <select multiple="multiple" data-template="facets:select" name="facsimile"/>
             <h4 data-template="lang:translate">docStatus</h4>
             <select multiple="multiple" data-template="facets:select" name="docStatus"/>
         </div>
diff --git a/templates/ajax/documents.html b/templates/ajax/documents.html
index 10ec9fe44..ae27cd591 100644
--- a/templates/ajax/documents.html
+++ b/templates/ajax/documents.html
@@ -21,6 +21,9 @@ <h4 data-template="lang:translate">docType</h4>
             <h4 data-template="lang:translate">repository</h4>
             <select multiple="multiple" data-template="facets:select" name="repository"/>
             
+            <h4 data-template="lang:translate">facsimile</h4>
+            <select multiple="multiple" data-template="facets:select" name="facsimile"/>
+            
             <h4 data-template="lang:translate">docStatus</h4>
             <select multiple="multiple" data-template="facets:select" name="docStatus"/>
         </div>

From f8c10a4336d4d086da58a6c296a853e0c2c6baf4 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Tue, 15 Sep 2020 14:50:50 +0200
Subject: [PATCH 02/14] allow for multiple values

---
 modules/api.xqm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/api.xqm b/modules/api.xqm
index 9e43a1e77..bdec48dd6 100644
--- a/modules/api.xqm
+++ b/modules/api.xqm
@@ -740,7 +740,7 @@ declare function api:validate-repository($model as map()) as map()? {
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
 declare function api:validate-facsimile($model as map()) as map()? {
-    if(xmldb:decode-uri($model?facsimile) = ('internal','external','without')) then $model
+    if(every $i in $model?facsimile satisfies $i castable as xs:string) then map { 'facsimile': ($model?facsimile ! tokenize(., ','))[. = ('internal','external','without')] }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "facsimile". Must be one of "internal", "external", or "without".')
 };
 

From 2920d2f809a903bca5885139f3709c344da007f8 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Tue, 15 Sep 2020 14:51:08 +0200
Subject: [PATCH 03/14] improve counting

---
 modules/facets.xqm | 48 +++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/modules/facets.xqm b/modules/facets.xqm
index fd78fcc4a..e800c509d 100644
--- a/modules/facets.xqm
+++ b/modules/facets.xqm
@@ -87,27 +87,35 @@ declare %private function facets:from-docType($collection as node()*, $facet as
 
 declare %private function facets:facsimile($collection as node()*, $facet as xs:string, $lang as xs:string) as array(*) {
     let $facsimiles := $collection ! query:facsimile(.)
-    let $external := count($facsimiles[@sameAs]/root())
-    let $internal := count($facsimiles[not(@sameAs)][tei:graphic]/root())
-    let $noFacs := count($collection) - $external - $internal
+    let $external := $facsimiles[@sameAs]/root()
+    let $internal := $facsimiles[not(@sameAs)][tei:graphic]/root()
+    let $internalCount := count($internal)
+    let $externalCount := count($external)
+    let $noFacsCount := count($collection) - count($external | $internal)
     return
-        [
-            map {
-                'value' : 'internal',
-                'label' : lang:get-language-string('internal', $lang),
-                'frequency' : $internal
-            },
-            map {
-                'value' : 'external',
-                'label' : lang:get-language-string('external', $lang),
-                'frequency' : $external
-            },
-            map {
-                'value' : 'without',
-                'label' : lang:get-language-string('without', $lang),
-                'frequency' : $noFacs
-            }
-        ]
+        array {
+            if($internalCount > 0) then
+                map {
+                    'value' : 'internal',
+                    'label' : lang:get-language-string('internal', $lang),
+                    'frequency' : $internalCount
+                }
+            else (),
+            if($externalCount > 0) then
+                map {
+                    'value' : 'external',
+                    'label' : lang:get-language-string('external', $lang),
+                    'frequency' : $externalCount
+                }
+            else (),
+            if($noFacsCount > 0) then
+                map {
+                    'value' : 'without',
+                    'label' : lang:get-language-string('without', $lang),
+                    'frequency' : $noFacsCount
+                }
+            else ()
+        }
 };
 
 

From 30f5ab245ea3756188da6460b4e4a91f44489589 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Tue, 15 Sep 2020 21:39:22 +0200
Subject: [PATCH 04/14] fixes processing of multiple values for one param

---
 modules/api.xqm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/modules/api.xqm b/modules/api.xqm
index bdec48dd6..309104189 100644
--- a/modules/api.xqm
+++ b/modules/api.xqm
@@ -653,7 +653,7 @@ declare function api:validate-hideRevealed($model as map()) as map()? {
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
 declare function api:validate-docTypeSubClass($model as map()) as map()? {
-    if($model?docTypeSubClass castable as xs:string) then map { 'docTypeSubClass': xmldb:decode-uri($model?docTypeSubClass) }
+    if(every $i in $model?docTypeSubClass ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'docTypeSubClass': ($model?docTypeSubClass ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "docTypeSubClass".' )
 }; 
 
@@ -663,23 +663,27 @@ declare function api:validate-docTypeSubClass($model as map()) as map()? {
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
 declare function api:validate-sex($model as map()) as map()? {
-    if(xmldb:decode-uri($model?sex) = ('f','m','unknown','Art der Institution')) then $model
+    if(every $i in $model?sex ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'sex':  (($model?sex ! tokenize(., ',')) ! xmldb:decode-uri(.))[. = ('f','m','unknown','Art der Institution')] }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "sex". Must be one of "f", "m", "unknown", or "Art der Institution".')
 }; 
 
 (:~
  : Check parameter surnames
+ : multiple values allowed as input, either by providing multiple URL parameters
+ : or by sending a comma separated list as the value of one URL parameter
 ~:)
 declare function api:validate-surnames($model as map()) as map()? {
-    if($model?surnames castable as xs:string) then map { 'surnames': xmldb:decode-uri($model?surnames) }
+    if(every $i in $model?surnames ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'surnames': ($model?surnames ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "surnames".' )
 }; 
 
 (:~
  : Check parameter forenames
+ : multiple values allowed as input, either by providing multiple URL parameters
+ : or by sending a comma separated list as the value of one URL parameter
 ~:)
 declare function api:validate-forenames($model as map()) as map()? {
-    if($model?forenames castable as xs:string) then map { 'forenames': xmldb:decode-uri($model?forenames) }
+    if(every $i in $model?forenames ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'forenames': ($model?forenames ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "forenames".' )
 }; 
 
@@ -689,7 +693,7 @@ declare function api:validate-forenames($model as map()) as map()? {
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
 declare function api:validate-asksam-cat($model as map()) as map()? {
-    if($model?asksam-cat castable as xs:string) then map { 'asksam-cat': xmldb:decode-uri($model?asksam-cat) }
+    if(every $i in $model?asksam-cat ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'asksam-cat': ($model?asksam-cat ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "asksam-cat".' )
 };
 
@@ -699,7 +703,7 @@ declare function api:validate-asksam-cat($model as map()) as map()? {
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
 declare function api:validate-vorlageform($model as map()) as map()? {
-    if($model?vorlageform castable as xs:string) then map { 'vorlageform': xmldb:decode-uri($model?vorlageform) }
+    if(every $i in $model?vorlageform ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'vorlageform': ($model?vorlageform ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "vorlageform".' )
 }; 
 
@@ -709,7 +713,7 @@ declare function api:validate-vorlageform($model as map()) as map()? {
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
 declare function api:validate-einrichtungsform($model as map()) as map()? {
-    if($model?einrichtungsform castable as xs:string) then map { 'einrichtungsform': xmldb:decode-uri($model?einrichtungsform) }
+    if(every $i in $model?einrichtungsform ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'einrichtungsform': ($model?einrichtungsform ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "einrichtungsform".' )
 }; 
 
@@ -729,18 +733,17 @@ declare function api:validate-placenames($model as map()) as map()? {
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
 declare function api:validate-repository($model as map()) as map()? {
-    if($model?repository castable as xs:string) then map { 'repository': xmldb:decode-uri($model?repository) }
+    if(every $i in $model?repository ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'repository': ($model?repository ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "repository".' )
 }; 
 
-
 (:~
  : Check parameter facsimile ('internal','external','without')
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
 declare function api:validate-facsimile($model as map()) as map()? {
-    if(every $i in $model?facsimile satisfies $i castable as xs:string) then map { 'facsimile': ($model?facsimile ! tokenize(., ','))[. = ('internal','external','without')] }
+    if(every $i in $model?facsimile ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'facsimile': (($model?facsimile ! tokenize(., ',')) ! xmldb:decode-uri(.))[. = ('internal','external','without')] }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "facsimile". Must be one of "internal", "external", or "without".')
 };
 

From 4b8974f50d7efeabf557e3aca6711932385d19d2 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Tue, 15 Sep 2020 23:07:15 +0200
Subject: [PATCH 05/14] make use of the `api:validate-*` functions for checking
 the sanity of parameter values

---
 modules/search.xqm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/modules/search.xqm b/modules/search.xqm
index a993b6231..a9ebdf267 100644
--- a/modules/search.xqm
+++ b/modules/search.xqm
@@ -19,6 +19,7 @@ import module namespace lang="http://xquery.weber-gesamtausgabe.de/modules/lang"
 import module namespace wega-util="http://xquery.weber-gesamtausgabe.de/modules/wega-util" at "wega-util.xqm";
 import module namespace controller="http://xquery.weber-gesamtausgabe.de/modules/controller" at "controller.xqm";
 import module namespace app="http://xquery.weber-gesamtausgabe.de/modules/app" at "app.xqm";
+import module namespace api="http://xquery.weber-gesamtausgabe.de/modules/api" at "api.xqm";
 import module namespace functx="http://www.functx.com";
 
 declare variable $search:ERROR := QName("http://xquery.weber-gesamtausgabe.de/modules/search", "Error");
@@ -278,14 +279,26 @@ declare %private function search:additional-mappings($str as xs:string) as eleme
 
 (:~
  : Creates a map of to-be-applied-filters from URL request parameters
+ : Makes use of the `api:validate-*` functions for checking the sanity of parameter values
 ~:)
 declare %private function search:create-filters() as map(*) {
-    let $params := request:get-parameter-names()[.=$search:valid-params]
+    let $paramsOrg := request:get-parameter-names()[.=$search:valid-params]
+    let $params :=
+        (: "undated" takes precedence over date filter :)
+        if($paramsOrg[.='undated']) then $paramsOrg[not(.= ('fromDate', 'toDate'))] 
+        else $paramsOrg
+    let $validate-unknown-param := function-lookup(QName('http://xquery.weber-gesamtausgabe.de/modules/api', 'api:validate-unknown-param'), 1)
     return
         map:merge(
-            (: "undated" takes precedence over date filter :)
-            if($params[.='undated']) then $params[not(.= ('fromDate', 'toDate'))] ! map:entry(., request:get-parameter(., ()))
-            else $params ! map:entry(., request:get-parameter(., ()))
+            for $param in $params
+            let $lookup := function-lookup(QName('http://xquery.weber-gesamtausgabe.de/modules/api', 'api:validate-' || $param), 1) 
+            return
+                if(exists($lookup)) then $lookup(map {$param := request:get-parameter($param, ()) })
+                else if(exists($validate-unknown-param)) then $validate-unknown-param(map {$param := request:get-parameter($param, ()) })
+                else (
+                    util:log-system-out('It seems you did not provide a validate-unknown-param function'),
+                    error($search:ERROR, 'Unknown parameter "' || $param || '". Details should be provided in the system log.') 
+                )
         )
 };
 

From 8b5bd0ce71aa58e7abe192775c34b753625f3984 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Tue, 15 Sep 2020 23:10:33 +0200
Subject: [PATCH 06/14] silently drop empty strings

for fromDate and toDate
---
 modules/api.xqm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/api.xqm b/modules/api.xqm
index 309104189..9ca9fd059 100644
--- a/modules/api.xqm
+++ b/modules/api.xqm
@@ -365,6 +365,7 @@ declare function api:validate-limit($model as map()) as map()? {
 ~:)
 declare function api:validate-fromDate($model as map()) as map()? {
     if($model('fromDate') castable as xs:date) then $model
+    else if($model?fromDate ='') then () (: an empty string is simply dropped :)
     else error($api:INVALID_PARAMETER, 'Unsupported date format given: "' || $model('fromDate') || '". Should be YYYY-MM-DD.')
 };
 
@@ -373,6 +374,7 @@ declare function api:validate-fromDate($model as map()) as map()? {
 ~:)
 declare function api:validate-toDate($model as map()) as map()? {
     if($model('toDate') castable as xs:date) then $model
+    else if($model?toDate ='') then () (: an empty string is simply dropped :)
     else error($api:INVALID_PARAMETER, 'Unsupported date format given: "' || $model('toDate') || '". Should be YYYY-MM-DD.')
 };
 

From 137639f0310fa4a8cff06eef2c06be6ce6443173 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Tue, 15 Sep 2020 23:48:01 +0200
Subject: [PATCH 07/14] some code refactoring

---
 modules/api.xqm    | 132 +++++++++++++++++++++++----------------------
 modules/search.xqm |  29 +++++-----
 2 files changed, 85 insertions(+), 76 deletions(-)

diff --git a/modules/api.xqm b/modules/api.xqm
index 9ca9fd059..c3d8d455a 100644
--- a/modules/api.xqm
+++ b/modules/api.xqm
@@ -11,6 +11,10 @@ module namespace api="http://xquery.weber-gesamtausgabe.de/modules/api";
 
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
+declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace util="http://exist-db.org/xquery/util";
+declare namespace map="http://www.w3.org/2005/xpath-functions/map";
+declare namespace repo="http://exist-db.org/xquery/repo";
 import module namespace core="http://xquery.weber-gesamtausgabe.de/modules/core" at "core.xqm";
 import module namespace facets="http://xquery.weber-gesamtausgabe.de/modules/facets" at "facets.xqm";
 import module namespace search="http://xquery.weber-gesamtausgabe.de/modules/search" at "search.xqm";
@@ -31,7 +35,7 @@ declare variable $api:max-limit := function($swagger-conf as map(*)) as xs:integ
     $swagger-conf?parameters?limitParam?maximum
 };
 
-declare function api:documents($model as map()) as map()* {
+declare function api:documents($model as map(*)) as map(*)* {
     let $ids :=
         if(exists($model('docID'))) then api:findByID($model('docID'))
         else for $docType in api:resolve-docTypes($model) return core:getOrCreateColl($docType, 'indices', true())
@@ -41,7 +45,7 @@ declare function api:documents($model as map()) as map()* {
     )
 };
 
-declare function api:documents-findByDate($model as map()) as map()* {
+declare function api:documents-findByDate($model as map(*)) as map(*)* {
     let $documents := for $docType in api:resolve-docTypes($model) return wdt:lookup($docType, core:getOrCreateColl($docType, 'indices', true()))?filter-by-date($model?fromDate, $model?toDate)
     return (
         map { 'totalRecordCount': count($documents) },
@@ -49,7 +53,7 @@ declare function api:documents-findByDate($model as map()) as map()* {
     )
 };
 
-declare function api:documents-findByMention($model as map()) as map()* {
+declare function api:documents-findByMention($model as map(*)) as map(*)* {
     let $mentioned-doc := api:findByID($model('docID'))
     let $backlinks := 
         if($mentioned-doc) 
@@ -64,7 +68,7 @@ declare function api:documents-findByMention($model as map()) as map()* {
     )
 };
 
-declare function api:documents-findByAuthor($model as map()) as map()* {
+declare function api:documents-findByAuthor($model as map(*)) as map(*)* {
     let $author := api:findByID($model('authorID'))
     let $documents := 
         if($author)
@@ -79,7 +83,7 @@ declare function api:documents-findByAuthor($model as map()) as map()* {
     )
 };
 
-declare function api:code-findByElement($model as map()) {
+declare function api:code-findByElement($model as map(*)) {
     let $documents := 
         for $docType in api:resolve-docTypes($model)
         return core:getOrCreateColl($docType,'indices', true())
@@ -96,14 +100,14 @@ declare function api:code-findByElement($model as map()) {
         (: NB: when searching for tei:facsimile empty code samples may be returned due to licensing issues :)
         if($model?total) then $eval
         (: The 'secret' $total switch is used for our list of examples on the spec pages and is of type element()*; 
-            regular output from the API is the following subsequence of type map()* :)
+            regular output from the API is the following subsequence of type map(*)* :)
         else (
             map { 'totalRecordCount': count($eval) },
             api:codeSample(api:subsequence($eval, $model), $model)
         )
 };
 
-declare function api:application-status($model as map()*) as map()* {
+declare function api:application-status($model as map(*)*) as map(*)* {
     let $healthy := query:facsimile(core:doc('A040043'))[tei:graphic/@url]
                     and core:getOrCreateColl('letters', 'A002068', true())//tei:seg[@type='wordOfTheDay']
     return
@@ -121,7 +125,7 @@ declare function api:application-status($model as map()*) as map()* {
     )
 };
 
-declare function api:application-newID($model as map(*)) as map()* {
+declare function api:application-newID($model as map(*)) as map(*)* {
     if($config:isDevelopment) 
     then (
         map { 'totalRecordCount': 1 },
@@ -137,7 +141,7 @@ declare function api:application-newID($model as map(*)) as map()* {
         }
 };
 
-declare function api:facets($model as map(*)) as map()* {
+declare function api:facets($model as map(*)) as map(*)* {
     let $fileName := util:hash($model?facet || $model?scope || $model?docType, 'md5')
     let $localFilepath := str:join-path-elements(($config:tmp-collection-path, 'facets', $fileName || '.json'))
     let $lease := function($currentDateTimeOfFile as xs:dateTime?) as xs:boolean { wega-util:check-if-update-necessary($currentDateTimeOfFile, ()) }
@@ -176,7 +180,7 @@ declare function api:facets($model as map(*)) as map()* {
 declare %private function api:get-facets($model as map(*)) as array(*) {
     let $search := search:results(<span/>, map { 'docID' : $model('scope') }, $model('docType'))
     let $lang := config:guess-language($model('lang'))
-    let $allFacets as map()* := facets:facets($search?search-results, $model('facet'), -1, $lang)?*
+    let $allFacets as map(*)* := facets:facets($search?search-results, $model('facet'), -1, $lang)?*
     return
         array {
             for $i in $allFacets
@@ -201,11 +205,11 @@ declare %private function api:findByID($id as xs:string) as document-node()* {
 };
 
 (:
-declare function api:ant-currentSvnRev($model as map()) as xs:int? {
+declare function api:ant-currentSvnRev($model as map(*)) as xs:int? {
     config:getCurrentSvnRev()
 };
 
-declare function api:ant-deleteResources($model as map()) {
+declare function api:ant-deleteResources($model as map(*)) {
     ()
     (\:
     for $path in tokenize(normalize-space(util:binary-to-string($model('data'))), '\s+')
@@ -221,7 +225,7 @@ declare function api:ant-deleteResources($model as map()) {
 };
 :)
 
-(:declare function api:ant-patchSvnHistory($model as map()) as map()? {
+(:declare function api:ant-patchSvnHistory($model as map(*)) as map(*)? {
     if($model('data')/*/@head castable as xs:integer) then (
         update value $config:svn-change-history-file/dictionary/@head with $model('data')/*/data(@head),
         for $entry in $model('data')//entry
@@ -238,7 +242,7 @@ declare function api:ant-deleteResources($model as map()) {
 (:~
  : Helper function for resolving docTypes
 ~:)
-declare %private function api:resolve-docTypes($model as map()) as xs:string* {
+declare %private function api:resolve-docTypes($model as map(*)) as xs:string* {
     if(exists($model('docType'))) then $model('docType')
     else for $func in wdt:members('unary-docTypes') return $func(())('name')
 };
@@ -246,7 +250,7 @@ declare %private function api:resolve-docTypes($model as map()) as xs:string* {
 (:~
  :  Helper function for creating a subsequence based on external parameters
 ~:)
-declare %private function api:subsequence($seq as item()*, $model as map()) {
+declare %private function api:subsequence($seq as item()*, $model as map(*)) {
     let $offset := if($model('offset') castable as xs:integer) then $model('offset') cast as xs:integer else 0
     let $limit := if($model('limit') castable as xs:integer) then $model('limit') cast as xs:integer else 0
     return
@@ -259,7 +263,7 @@ declare %private function api:subsequence($seq as item()*, $model as map()) {
 (:~
  :  Helper function for creating a Document object
 ~:)
-declare %private function api:document($documents as document-node()*, $model as map()) as map()* {
+declare %private function api:document($documents as document-node()*, $model as map(*)) as map(*)* {
     let $host := $model('swagger:config')?host
     let $basePath := $model('swagger:config')?basePath
     let $scheme := $model('swagger:config')?schemes[1]
@@ -280,7 +284,7 @@ declare %private function api:document($documents as document-node()*, $model as
 (:~
  :  Helper function for creating a CodeSample object 
 ~:)
-declare function api:codeSample($nodes as node()*, $model as map()) as map()* {
+declare function api:codeSample($nodes as node()*, $model as map(*)) as map(*)* {
     let $host := $model('swagger:config')?host
     let $basePath := $model('swagger:config')?basePath
     let $scheme := $model('swagger:config')?schemes?1
@@ -298,7 +302,7 @@ declare function api:codeSample($nodes as node()*, $model as map()) as map()* {
 (:~
  : Helper function for validating user input (= function parameters)
 ~:)
-(:declare %private function api:validateInput($model as map()) as empty-sequence() {
+(:declare %private function api:validateInput($model as map(*)) as empty-sequence() {
     for $param in map:keys($model)
     return
         switch($param)
@@ -312,7 +316,7 @@ declare function api:codeSample($nodes as node()*, $model as map()) as map()* {
 (:~
  : Check parameter docType and split comma separated value into a sequence
 ~:)
-declare function api:validate-docType($model as map()) as map()? {
+declare function api:validate-docType($model as map(*)) as map(*)? {
     let $wega-docTypes := for $func in wdt:members('unary-docTypes') return $func(())('name')
     return
         map:entry(
@@ -327,7 +331,7 @@ declare function api:validate-docType($model as map()) as map()? {
 (:~
  : Check parameter element
 ~:)
-declare function api:validate-element($model as map()) as map()? {
+declare function api:validate-element($model as map(*)) as map(*)? {
     if(matches($model('element'), '^[-a-zA-Z]+$')) then $model 
     else error($api:INVALID_PARAMETER, 'Unsupported element name "' || $model('element') || '"')
 };
@@ -335,7 +339,7 @@ declare function api:validate-element($model as map()) as map()? {
 (:~
  : Check parameter namespace
 ~:)
-declare function api:validate-namespace($model as map()) as map()? {
+declare function api:validate-namespace($model as map(*)) as map(*)? {
     if(xmldb:decode-uri($model('namespace')) castable as xs:anyURI and matches(xmldb:decode-uri($model('namespace')), '^[-\.:#+/a-zA-Z0-9]+$')) then 
         map { 'namespace' : xmldb:decode-uri($model?namespace) }
     else 
@@ -347,7 +351,7 @@ declare function api:validate-namespace($model as map()) as map()? {
 (:~
  : Check parameter offset
 ~:)
-declare function api:validate-offset($model as map()) as map()? {
+declare function api:validate-offset($model as map(*)) as map(*)? {
     if($model('offset') castable as xs:positiveInteger) then $model 
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "offset". It should be a positive integer.')
 };
@@ -355,7 +359,7 @@ declare function api:validate-offset($model as map()) as map()? {
 (:~
  : Check parameter limit
 ~:)
-declare function api:validate-limit($model as map()) as map()? {
+declare function api:validate-limit($model as map(*)) as map(*)? {
     if($model('limit') castable as xs:positiveInteger and xs:integer($model('limit')) le $api:max-limit($model('swagger:config'))) then $model 
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "limit". It should be a positive integer less or equal to ' || $api:max-limit($model('swagger:config')) || '.')
 };
@@ -363,7 +367,7 @@ declare function api:validate-limit($model as map()) as map()? {
 (:~
  : Check parameter fromDate
 ~:)
-declare function api:validate-fromDate($model as map()) as map()? {
+declare function api:validate-fromDate($model as map(*)) as map(*)? {
     if($model('fromDate') castable as xs:date) then $model
     else if($model?fromDate ='') then () (: an empty string is simply dropped :)
     else error($api:INVALID_PARAMETER, 'Unsupported date format given: "' || $model('fromDate') || '". Should be YYYY-MM-DD.')
@@ -372,7 +376,7 @@ declare function api:validate-fromDate($model as map()) as map()? {
 (:~
  : Check parameter toDate
 ~:)
-declare function api:validate-toDate($model as map()) as map()? {
+declare function api:validate-toDate($model as map(*)) as map(*)? {
     if($model('toDate') castable as xs:date) then $model
     else if($model?toDate ='') then () (: an empty string is simply dropped :)
     else error($api:INVALID_PARAMETER, 'Unsupported date format given: "' || $model('toDate') || '". Should be YYYY-MM-DD.')
@@ -381,7 +385,7 @@ declare function api:validate-toDate($model as map()) as map()? {
 (:~
  : Check parameter docID
 ~:)
-declare function api:validate-docID($model as map()) as map()? {
+declare function api:validate-docID($model as map(*)) as map(*)? {
     (: Nothing to do here but decoding, IDs will be checked within api:findByID()   :)
     map { 'docID': xmldb:decode-uri($model?docID) }
 };
@@ -389,7 +393,7 @@ declare function api:validate-docID($model as map()) as map()? {
 (:~
  : Check parameter authorID
 ~:)
-declare function api:validate-authorID($model as map()) as map()? {
+declare function api:validate-authorID($model as map(*)) as map(*)? {
     (: Nothing to do here but decoding, IDs will be checked within api:findByID()   :)
     map { 'authorID': xmldb:decode-uri($model?authorID) }
 };
@@ -398,7 +402,7 @@ declare function api:validate-authorID($model as map()) as map()? {
  : Check parameter facet
  : only one value allowed
 ~:)
-declare function api:validate-facet($model as map()) as map()? {
+declare function api:validate-facet($model as map(*)) as map(*)? {
     if($model?facet castable as xs:string and $model?facet = $search:valid-params) then $model 
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "facet". It must be one of the following values: ' || string-join($search:valid-params, ', '))
 };
@@ -407,7 +411,7 @@ declare function api:validate-facet($model as map()) as map()? {
  : Check parameter term (= search term for facets)
  : only one value allowed
 ~:)
-declare function api:validate-term($model as map()) as map()? {
+declare function api:validate-term($model as map(*)) as map(*)? {
     if($model('term') castable as xs:string) then map { 'term': xmldb:decode-uri($model?term) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "term".')
 };
@@ -416,7 +420,7 @@ declare function api:validate-term($model as map()) as map()? {
  : Check parameter scope (either 'indices' or a WeGA ID)
  : only one value allowed
 ~:)
-declare function api:validate-scope($model as map()) as map()? {
+declare function api:validate-scope($model as map(*)) as map(*)? {
     if($model?scope castable as xs:string and (matches($model?scope, '^indices$') or config:get-doctype-by-id($model?scope))) then $model 
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "scope". It must be either a WeGA ID or the term "indices".' )
 };
@@ -426,7 +430,7 @@ declare function api:validate-scope($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-placeOfAddressee($model as map()) as map()? {
+declare function api:validate-placeOfAddressee($model as map(*)) as map(*)? {
     if(every $i in $model?placeOfAddressee ! tokenize(., ',') satisfies wdt:places($i)('check')()) then map { 'placeOfAddressee': $model?placeOfAddressee ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "placeOfAddressee". It must be a WeGA place ID.' )
 }; 
@@ -436,7 +440,7 @@ declare function api:validate-placeOfAddressee($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-biblioType($model as map()) as map()? {
+declare function api:validate-biblioType($model as map(*)) as map(*)? {
     if(every $i in $model?biblioType ! tokenize(., ',') satisfies wdt:biblio($i)('check')()) then map { 'biblioType': $model?biblioType ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "biblioType". It must be a WeGA biblio ID.' )
 }; 
@@ -446,7 +450,7 @@ declare function api:validate-biblioType($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-editors($model as map()) as map()? {
+declare function api:validate-editors($model as map(*)) as map(*)? {
     if(every $i in $model?editors ! tokenize(., ',') satisfies wdt:persons($i)('check')()) then map { 'editors': $model?editors ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "editors". It must be a WeGA person ID.' )
 }; 
@@ -456,7 +460,7 @@ declare function api:validate-editors($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-authors($model as map()) as map()? {
+declare function api:validate-authors($model as map(*)) as map(*)? {
     if(every $i in $model?authors ! tokenize(., ',') satisfies wdt:persons($i)('check')()) then map { 'authors': $model?authors ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "authors". It must be a WeGA person ID.' )
 }; 
@@ -466,7 +470,7 @@ declare function api:validate-authors($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-works($model as map()) as map()? {
+declare function api:validate-works($model as map(*)) as map(*)? {
     if(every $i in $model?works ! tokenize(., ',') satisfies wdt:works($i)('check')()) then map { 'works': $model?works ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "works". It must be a WeGA work ID.' )
 }; 
@@ -476,7 +480,7 @@ declare function api:validate-works($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-persons($model as map()) as map()? {
+declare function api:validate-persons($model as map(*)) as map(*)? {
     if(every $i in $model?persons ! tokenize(., ',') satisfies wdt:personsPlus($i)('check')()) then map { 'persons': $model?persons ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "persons". It must be a WeGA person or org ID.' )
 }; 
@@ -486,7 +490,7 @@ declare function api:validate-persons($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-orgs($model as map()) as map()? {
+declare function api:validate-orgs($model as map(*)) as map(*)? {
     if(every $i in $model?orgs ! tokenize(., ',') satisfies wdt:orgs($i)('check')()) then map { 'orgs': $model?orgs ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "orgs". It must be a WeGA org ID.' )
 }; 
@@ -496,7 +500,7 @@ declare function api:validate-orgs($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-occupations($model as map()) as map()? {
+declare function api:validate-occupations($model as map(*)) as map(*)? {
     if(every $i in $model?occupations ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'occupations': $model?occupations ! tokenize(., ',') ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "occupations".' )
 }; 
@@ -506,7 +510,7 @@ declare function api:validate-occupations($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-docSource($model as map()) as map()? {
+declare function api:validate-docSource($model as map(*)) as map(*)? {
     if(every $i in $model?docSource ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'docSource': $model?docSource ! tokenize(., ',') ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "docSource".' )
 }; 
@@ -516,7 +520,7 @@ declare function api:validate-docSource($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-composers($model as map()) as map()? {
+declare function api:validate-composers($model as map(*)) as map(*)? {
     if(every $i in $model?composers ! tokenize(., ',') satisfies wdt:persons($i)('check')()) then map { 'composers': $model?composers ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "composers". It must be a WeGA person ID.' )
 }; 
@@ -526,7 +530,7 @@ declare function api:validate-composers($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-librettists($model as map()) as map()? {
+declare function api:validate-librettists($model as map(*)) as map(*)? {
     if(every $i in $model?librettists ! tokenize(., ',') satisfies wdt:persons($i)('check')()) then map { 'librettists': $model?librettists ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "librettists". It must be a WeGA person ID.' )
 }; 
@@ -536,7 +540,7 @@ declare function api:validate-librettists($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-lyricists($model as map()) as map()? {
+declare function api:validate-lyricists($model as map(*)) as map(*)? {
     if(every $i in $model?lyricists ! tokenize(., ',') satisfies wdt:persons($i)('check')()) then map { 'lyricists': $model?lyricists ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "lyricists". It must be a WeGA person ID.' )
 }; 
@@ -546,7 +550,7 @@ declare function api:validate-lyricists($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-dedicatees($model as map()) as map()? {
+declare function api:validate-dedicatees($model as map(*)) as map(*)? {
     if(every $i in $model?dedicatees ! tokenize(., ',') satisfies wdt:persons($i)('check')()) then map { 'dedicatees': $model?dedicatees ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "dedicatees". It must be a WeGA person ID.' )
 }; 
@@ -556,7 +560,7 @@ declare function api:validate-dedicatees($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-journals($model as map()) as map()? {
+declare function api:validate-journals($model as map(*)) as map(*)? {
     if(every $i in $model?journals ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'journals': $model?journals ! tokenize(., ',') ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "journals".' )
 }; 
@@ -566,7 +570,7 @@ declare function api:validate-journals($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-docStatus($model as map()) as map()? {
+declare function api:validate-docStatus($model as map(*)) as map(*)? {
     if(every $i in $model?docStatus ! tokenize(., ',') satisfies $i = ('approved','candidate','proposed')) then map { 'docStatus': $model?docStatus ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "docStatus". It must be one of "approved", "candidate", or "proposed".' )
 }; 
@@ -576,7 +580,7 @@ declare function api:validate-docStatus($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-addressee($model as map()) as map()? {
+declare function api:validate-addressee($model as map(*)) as map(*)? {
     if(every $i in $model?addressee ! tokenize(., ',') satisfies wdt:personsPlus($i)('check')()) then map { 'addressee': $model?addressee ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "addressee". It must be a WeGA person or org ID.' )
 }; 
@@ -586,7 +590,7 @@ declare function api:validate-addressee($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-sender($model as map()) as map()? {
+declare function api:validate-sender($model as map(*)) as map(*)? {
     if(every $i in $model?sender ! tokenize(., ',') satisfies wdt:personsPlus($i)('check')()) then map { 'sender': $model?sender ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "sender". It must be a WeGA person or org ID.' )
 }; 
@@ -596,7 +600,7 @@ declare function api:validate-sender($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-textType($model as map()) as map()? {
+declare function api:validate-textType($model as map(*)) as map(*)? {
     if($model?textType castable as xs:string) then map { 'textType': xmldb:decode-uri($model?textType) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "textType".' )
 }; 
@@ -606,7 +610,7 @@ declare function api:validate-textType($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-residences($model as map()) as map()? {
+declare function api:validate-residences($model as map(*)) as map(*)? {
     if(every $i in $model?residences ! tokenize(., ',') satisfies wdt:places($i)('check')()) then map { 'residences': $model?residences ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "residences". It must be a WeGA place ID.' )
 }; 
@@ -616,7 +620,7 @@ declare function api:validate-residences($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-places($model as map()) as map()? {
+declare function api:validate-places($model as map(*)) as map(*)? {
     if(every $i in $model?places ! tokenize(., ',') satisfies wdt:places($i)('check')()) then map { 'places': $model?places ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "places". It must be a WeGA place ID.' )
 }; 
@@ -626,7 +630,7 @@ declare function api:validate-places($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-placeOfSender($model as map()) as map()? {
+declare function api:validate-placeOfSender($model as map(*)) as map(*)? {
     if(every $i in $model?placeOfSender ! tokenize(., ',') satisfies wdt:places($i)('check')()) then map { 'placeOfSender': $model?placeOfSender ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "placeOfSender". It must be a WeGA place ID.' )
 }; 
@@ -635,7 +639,7 @@ declare function api:validate-placeOfSender($model as map()) as map()? {
  : Check parameter undated (true|false)
  : only one value allowed
 ~:)
-declare function api:validate-undated($model as map()) as map()? {
+declare function api:validate-undated($model as map(*)) as map(*)? {
     if($model?undated castable as xs:string) then map { 'undated': wega-util-shared:semantic-boolean($model?undated) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "undated".' )
 }; 
@@ -644,7 +648,7 @@ declare function api:validate-undated($model as map()) as map()? {
  : Check parameter hideRevealed (true|false)
  : only one value allowed
 ~:)
-declare function api:validate-hideRevealed($model as map()) as map()? {
+declare function api:validate-hideRevealed($model as map(*)) as map(*)? {
     if($model?hideRevealed castable as xs:string) then map { 'hideRevealed': wega-util-shared:semantic-boolean($model?hideRevealed) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "hideRevealed".' )
 }; 
@@ -654,7 +658,7 @@ declare function api:validate-hideRevealed($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-docTypeSubClass($model as map()) as map()? {
+declare function api:validate-docTypeSubClass($model as map(*)) as map(*)? {
     if(every $i in $model?docTypeSubClass ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'docTypeSubClass': ($model?docTypeSubClass ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "docTypeSubClass".' )
 }; 
@@ -664,7 +668,7 @@ declare function api:validate-docTypeSubClass($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-sex($model as map()) as map()? {
+declare function api:validate-sex($model as map(*)) as map(*)? {
     if(every $i in $model?sex ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'sex':  (($model?sex ! tokenize(., ',')) ! xmldb:decode-uri(.))[. = ('f','m','unknown','Art der Institution')] }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "sex". Must be one of "f", "m", "unknown", or "Art der Institution".')
 }; 
@@ -674,7 +678,7 @@ declare function api:validate-sex($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-surnames($model as map()) as map()? {
+declare function api:validate-surnames($model as map(*)) as map(*)? {
     if(every $i in $model?surnames ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'surnames': ($model?surnames ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "surnames".' )
 }; 
@@ -684,7 +688,7 @@ declare function api:validate-surnames($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-forenames($model as map()) as map()? {
+declare function api:validate-forenames($model as map(*)) as map(*)? {
     if(every $i in $model?forenames ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'forenames': ($model?forenames ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "forenames".' )
 }; 
@@ -694,7 +698,7 @@ declare function api:validate-forenames($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-asksam-cat($model as map()) as map()? {
+declare function api:validate-asksam-cat($model as map(*)) as map(*)? {
     if(every $i in $model?asksam-cat ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'asksam-cat': ($model?asksam-cat ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "asksam-cat".' )
 };
@@ -704,7 +708,7 @@ declare function api:validate-asksam-cat($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-vorlageform($model as map()) as map()? {
+declare function api:validate-vorlageform($model as map(*)) as map(*)? {
     if(every $i in $model?vorlageform ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'vorlageform': ($model?vorlageform ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "vorlageform".' )
 }; 
@@ -714,7 +718,7 @@ declare function api:validate-vorlageform($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-einrichtungsform($model as map()) as map()? {
+declare function api:validate-einrichtungsform($model as map(*)) as map(*)? {
     if(every $i in $model?einrichtungsform ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'einrichtungsform': ($model?einrichtungsform ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "einrichtungsform".' )
 }; 
@@ -724,7 +728,7 @@ declare function api:validate-einrichtungsform($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-placenames($model as map()) as map()? {
+declare function api:validate-placenames($model as map(*)) as map(*)? {
     if(every $i in $model?placenames ! tokenize(., ',') satisfies wdt:places($i)('check')()) then map { 'placenames': $model?placenames ! tokenize(., ',') }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "placenames". It must be a WeGA place ID.' )
 }; 
@@ -734,7 +738,7 @@ declare function api:validate-placenames($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-repository($model as map()) as map()? {
+declare function api:validate-repository($model as map(*)) as map(*)? {
     if(every $i in $model?repository ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'repository': ($model?repository ! tokenize(., ',')) ! xmldb:decode-uri(.) }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "repository".' )
 }; 
@@ -744,7 +748,7 @@ declare function api:validate-repository($model as map()) as map()? {
  : multiple values allowed as input, either by providing multiple URL parameters
  : or by sending a comma separated list as the value of one URL parameter
 ~:)
-declare function api:validate-facsimile($model as map()) as map()? {
+declare function api:validate-facsimile($model as map(*)) as map(*)? {
     if(every $i in $model?facsimile ! tokenize(., ',') satisfies $i castable as xs:string) then map { 'facsimile': (($model?facsimile ! tokenize(., ',')) ! xmldb:decode-uri(.))[. = ('internal','external','without')] }
     else error($api:INVALID_PARAMETER, 'Unsupported value for parameter "facsimile". Must be one of "internal", "external", or "without".')
 };
@@ -753,6 +757,6 @@ declare function api:validate-facsimile($model as map()) as map()? {
  : Fallback for unknown API parameters 
  : Simply returns an error message
 ~:)
-declare function api:validate-unknown-param($model as map()) as map()? {
+declare function api:validate-unknown-param($model as map(*)) as map(*)? {
     error($api:INVALID_PARAMETER, 'Unsupported parameter "' || string-join(map:keys($model), '; ') || '". If you believe this to be an error please send a note to bugs@weber-gesamtausgabe.de.')
 };
diff --git a/modules/search.xqm b/modules/search.xqm
index a9ebdf267..bd592ffa0 100644
--- a/modules/search.xqm
+++ b/modules/search.xqm
@@ -6,9 +6,14 @@ 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";
 declare namespace exist="http://exist.sourceforge.net/NS/exist";
-
+declare namespace map="http://www.w3.org/2005/xpath-functions/map";
+declare namespace request="http://exist-db.org/xquery/request";
+declare namespace session="http://exist-db.org/xquery/session";
+declare namespace range="http://exist-db.org/xquery/range";
+declare namespace ft="http://exist-db.org/xquery/lucene";
 import module namespace kwic="http://exist-db.org/xquery/kwic";
 import module namespace templates="http://exist-db.org/xquery/templates";
+import module namespace functx="http://www.functx.com";
 import module namespace core="http://xquery.weber-gesamtausgabe.de/modules/core" at "core.xqm";
 import module namespace norm="http://xquery.weber-gesamtausgabe.de/modules/norm" at "norm.xqm";
 import module namespace config="http://xquery.weber-gesamtausgabe.de/modules/config" at "config.xqm";
@@ -20,7 +25,7 @@ import module namespace wega-util="http://xquery.weber-gesamtausgabe.de/modules/
 import module namespace controller="http://xquery.weber-gesamtausgabe.de/modules/controller" at "controller.xqm";
 import module namespace app="http://xquery.weber-gesamtausgabe.de/modules/app" at "app.xqm";
 import module namespace api="http://xquery.weber-gesamtausgabe.de/modules/api" at "api.xqm";
-import module namespace functx="http://www.functx.com";
+
 
 declare variable $search:ERROR := QName("http://xquery.weber-gesamtausgabe.de/modules/search", "Error");
 
@@ -83,7 +88,7 @@ declare
         let $result-page-hits-per-entry := map:merge(
             for $doc in $subseq
             return (
-                if($doc instance of map() and exists($doc?hits)) then 
+                if($doc instance of map(*) and exists($doc?hits)) then 
                     map:entry($doc?doc/*/data(@xml:id), $doc?hits)
                 else ()
             )
@@ -201,7 +206,7 @@ declare %private function search:list($model as map(*)) as map(*) {
  : Sorting and merging search results
  : Helper function for search:search()
 ~:)
-declare %private function search:merge-hits($hits as item()*) as map()* {
+declare %private function search:merge-hits($hits as item()*) as map(*)* {
     for $hit in $hits
     group by $doc := $hit/root()
     let $score := sum($hit ! ft:score(.))
@@ -218,7 +223,7 @@ declare %private function search:merge-hits($hits as item()*) as map()* {
  :  Do a full text search 
  :  by looking up the appropriate search function in the wdt module 
 ~:)
-declare %private function search:fulltext($items as item()*, $searchString as xs:string, $filters as map(), $docType as xs:string) as item()* {
+declare %private function search:fulltext($items as item()*, $searchString as xs:string, $filters as map(*), $docType as xs:string) as item()* {
     let $query := search:create-lucene-query-element($searchString)
     let $search-func := wdt:lookup(., $items)?search
     return
@@ -293,10 +298,10 @@ declare %private function search:create-filters() as map(*) {
             for $param in $params
             let $lookup := function-lookup(QName('http://xquery.weber-gesamtausgabe.de/modules/api', 'api:validate-' || $param), 1) 
             return
-                if(exists($lookup)) then $lookup(map {$param := request:get-parameter($param, ()) })
-                else if(exists($validate-unknown-param)) then $validate-unknown-param(map {$param := request:get-parameter($param, ()) })
+                if(exists($lookup)) then $lookup(map:entry($param, request:get-parameter($param, ())))
+                else if(exists($validate-unknown-param)) then $validate-unknown-param(map:entry($param, request:get-parameter($param, ())))
                 else (
-                    util:log-system-out('It seems you did not provide a validate-unknown-param function'),
+                    core:logToFile('warn', 'It seems you did not provide a validate-unknown-param function'),
                     error($search:ERROR, 'Unknown parameter "' || $param || '". Details should be provided in the system log.') 
                 )
         )
@@ -422,7 +427,7 @@ declare %private function search:get-latest-date($coll as document-node()*, $doc
  :
  : @return a map with sanitized query string, parameters and recognized dates
 ~:)
-declare %private function search:prepare-search-string($model as map()) as map(*) {
+declare %private function search:prepare-search-string($model as map(*)) as map(*) {
     let $query-docTypes := request:get-parameter('d', 'all') ! str:sanitize(.)
     let $query-string-org := request:get-parameter('q', '')
     let $sanitized-query-string := str:normalize-space(str:sanitize(string-join($query-string-org, ' ')))
@@ -457,7 +462,7 @@ declare %private function search:prepare-search-string($model as map()) as map(*
  : @param $callback a callback function to actually do the search if the session is empty
  : @return a map object {'filters': {}, 'search-results': {}, 'query-string-org': '', 'query-docTypes': ('') }
 ~:)
-declare %private function search:search-session($model as map(), $callback as function() as map(*)) as map(*) {
+declare %private function search:search-session($model as map(*), $callback as function() as map(*)) as map(*) {
     let $updatedModel := search:prepare-search-string($model)
     let $session-exists :=
         try { 
@@ -482,7 +487,7 @@ declare %private function search:search-session($model as map(), $callback as fu
 
 declare 
     %templates:wrap
-    function search:get-session-for-singleview($node as node(), $model as map(*)) as map()? {
+    function search:get-session-for-singleview($node as node(), $model as map(*)) as map(*)? {
         let $wegasearch := (:session:get-attribute('wegasearch'):) search:search-session($model, search:search#1)
         let $docs := search:normalize-result-entries($wegasearch?search-results)
         let $index-of-current-doc := functx:index-of-node($docs, $model?doc)
@@ -517,7 +522,7 @@ declare %private function search:normalize-result-entries($entries as item()*) a
     for $doc in $entries
     return
         if($doc instance of document-node()) then $doc
-        else if($doc instance of map()) then $doc?doc
+        else if($doc instance of map(*)) then $doc?doc
         else if($doc instance of element()) then $doc 
         else if($doc instance of node()) then error($search:ERROR, 'unable to process node: ' || functx:node-kind($doc) || ' ' || name($doc))
         else if($doc instance of xs:anyAtomicType) then error($search:ERROR, 'unable to process atomic type: ' || functx:atomic-type($doc))

From ef474599bd8adaba75d3b91f861808346f05cea6 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Tue, 15 Sep 2020 23:51:54 +0200
Subject: [PATCH 08/14] update expected results

---
 testing/expected-results/var/Briefe    | 3 +++
 testing/expected-results/var/Dokumente | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/testing/expected-results/var/Briefe b/testing/expected-results/var/Briefe
index 3b4a381b3..a62d9b23d 100644
--- a/testing/expected-results/var/Briefe
+++ b/testing/expected-results/var/Briefe
@@ -262,6 +262,9 @@
             <h4>Bibliothek</h4>
             <select multiple="multiple" name="repository" data-api-url="http://localhost:8080/exist/apps/WeGA-WebApp/api/v1/facets/repository" data-doc-id="indices" data-doc-type="letters">
                                         <option value="">alle</option></select>
+            <h4>Faksimile</h4>
+            <select multiple="multiple" name="facsimile" data-api-url="http://localhost:8080/exist/apps/WeGA-WebApp/api/v1/facets/facsimile" data-doc-id="indices" data-doc-type="letters">
+                                        <option value="">alle</option></select>
             <h4>Dokumentenstatus</h4>
             <select multiple="multiple" name="docStatus" data-api-url="http://localhost:8080/exist/apps/WeGA-WebApp/api/v1/facets/docStatus" data-doc-id="indices" data-doc-type="letters">
                                         <option value="">alle</option></select>
diff --git a/testing/expected-results/var/Dokumente b/testing/expected-results/var/Dokumente
index 15c5ca44b..cb154b4fe 100644
--- a/testing/expected-results/var/Dokumente
+++ b/testing/expected-results/var/Dokumente
@@ -255,6 +255,10 @@
             <select multiple="multiple" name="repository" data-api-url="http://localhost:8080/exist/apps/WeGA-WebApp/api/v1/facets/repository" data-doc-id="indices" data-doc-type="documents">
                                         <option value="">alle</option></select>
             
+            <h4>Faksimile</h4>
+            <select multiple="multiple" name="facsimile" data-api-url="http://localhost:8080/exist/apps/WeGA-WebApp/api/v1/facets/facsimile" data-doc-id="indices" data-doc-type="letters">
+                                        <option value="">alle</option></select>
+            
             <h4>Dokumentenstatus</h4>
             <select multiple="multiple" name="docStatus" data-api-url="http://localhost:8080/exist/apps/WeGA-WebApp/api/v1/facets/docStatus" data-doc-id="indices" data-doc-type="documents">
                                         <option value="">alle</option></select>

From dc35fd449a551602a19675d7ec4cf3a9da788a43 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Wed, 16 Sep 2020 00:17:07 +0200
Subject: [PATCH 09/14] fix expected result

---
 testing/expected-results/var/Dokumente | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/expected-results/var/Dokumente b/testing/expected-results/var/Dokumente
index cb154b4fe..e14321c61 100644
--- a/testing/expected-results/var/Dokumente
+++ b/testing/expected-results/var/Dokumente
@@ -256,7 +256,7 @@
                                         <option value="">alle</option></select>
             
             <h4>Faksimile</h4>
-            <select multiple="multiple" name="facsimile" data-api-url="http://localhost:8080/exist/apps/WeGA-WebApp/api/v1/facets/facsimile" data-doc-id="indices" data-doc-type="letters">
+            <select multiple="multiple" name="facsimile" data-api-url="http://localhost:8080/exist/apps/WeGA-WebApp/api/v1/facets/facsimile" data-doc-id="indices" data-doc-type="documents">
                                         <option value="">alle</option></select>
             
             <h4>Dokumentenstatus</h4>

From 21e9df5c7cf8987850d887a39438a59a0474931e Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Wed, 16 Sep 2020 08:17:23 +0200
Subject: [PATCH 10/14] yet another fix for multiple values

---
 modules/search.xqm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/search.xqm b/modules/search.xqm
index bd592ffa0..af07eaf40 100644
--- a/modules/search.xqm
+++ b/modules/search.xqm
@@ -372,10 +372,12 @@ declare %private function search:revealed-filter($collection as document-node()*
 declare %private function search:facsimile-filter($collection as document-node()*, $filters as map(*)) as document-node()* {
     let $facsimiles := $collection ! query:facsimile(.)
     return
-        switch($filters?facsimile)
-        case 'internal' return $facsimiles[not(@sameAs)][tei:graphic]/root()
-        case 'external' return $facsimiles[@sameAs]/root()
-        default return $collection except $facsimiles/root()
+        for $filter in $filters?facsimile
+        return 
+            switch($filter)
+            case 'internal' return $facsimiles[not(@sameAs)][tei:graphic]/root()
+            case 'external' return $facsimiles[@sameAs]/root()
+            default return $collection except $facsimiles/root()
 };
 
 (:~

From 156ead0e3eaaafe750da234ef06b7e435871d8b8 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Wed, 16 Sep 2020 08:27:28 +0200
Subject: [PATCH 11/14] add translation of facsimile facet

---
 modules/facets.xqm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/facets.xqm b/modules/facets.xqm
index e800c509d..ae2508c1a 100644
--- a/modules/facets.xqm
+++ b/modules/facets.xqm
@@ -153,7 +153,7 @@ declare %private function facets:display-term($facet as xs:string, $term as xs:s
     case 'sex' return 
         if($term ='Art der Institution') then lang:get-language-string('organisationsInstitutions', $lang)
         else lang:get-language-string('sex_' || $term, $lang)
-    case 'docTypeSubClass' case 'docStatus' case 'textType' return lang:get-language-string($term, $lang)
+    case 'docTypeSubClass' case 'docStatus' case 'textType' case 'facsimile' return lang:get-language-string($term, $lang)
     case 'repository' return facets:display-term-repository($term)
     default return str:normalize-space($term)
 };

From b740ee9ef0a29aa723c02c599063acbddcf9d962 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Wed, 16 Sep 2020 08:27:47 +0200
Subject: [PATCH 12/14] add facsimile facet to writings list view

---
 templates/ajax/writings.html           | 3 +++
 testing/expected-results/var/Schriften | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/templates/ajax/writings.html b/templates/ajax/writings.html
index 89a7170ff..0bb57dae0 100644
--- a/templates/ajax/writings.html
+++ b/templates/ajax/writings.html
@@ -26,6 +26,9 @@ <h4 data-template="lang:translate">journals</h4>
             <h4 data-template="lang:translate">docType</h4>
             <select multiple="multiple" data-template="facets:select" name="docTypeSubClass"/>
             
+            <h4 data-template="lang:translate">facsimile</h4>
+            <select multiple="multiple" data-template="facets:select" name="facsimile"/>
+            
             <h4 data-template="lang:translate">docStatus</h4>
             <select multiple="multiple" data-template="facets:select" name="docStatus"/>
         </div>
diff --git a/testing/expected-results/var/Schriften b/testing/expected-results/var/Schriften
index 6823c8096..630419a64 100644
--- a/testing/expected-results/var/Schriften
+++ b/testing/expected-results/var/Schriften
@@ -260,6 +260,10 @@
             <select multiple="multiple" name="docTypeSubClass" data-api-url="http://localhost:8080/exist/apps/WeGA-WebApp/api/v1/facets/docTypeSubClass" data-doc-id="indices" data-doc-type="writings">
                                         <option value="">alle</option></select>
             
+            <h4>Faksimile</h4>
+            <select multiple="multiple" name="facsimile" data-api-url="http://localhost:8080/exist/apps/WeGA-WebApp/api/v1/facets/facsimile" data-doc-id="indices" data-doc-type="writings">
+                                        <option value="">alle</option></select>
+            
             <h4>Dokumentenstatus</h4>
             <select multiple="multiple" name="docStatus" data-api-url="http://localhost:8080/exist/apps/WeGA-WebApp/api/v1/facets/docStatus" data-doc-id="indices" data-doc-type="writings">
                                         <option value="">alle</option></select>

From 240625540ee65218fdc03bafe8b04a0f1a0f5706 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Wed, 16 Sep 2020 09:01:25 +0200
Subject: [PATCH 13/14] fix propagation of dates

---
 resources/js/init.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/resources/js/init.js b/resources/js/init.js
index bb236a5de..af584c0a0 100644
--- a/resources/js/init.js
+++ b/resources/js/init.js
@@ -51,6 +51,8 @@ $.fn.facets = function ()
         limit = 25,
         newParams;
     //console.log(curParams);
+    delete curParams.sliderDates.oldFromDate; // delete the property oldFromDate and oldToDate which we don't need for the facets and which is not a valid API parameter 
+    delete curParams.sliderDates.oldToDate;
     $(this).each( function(a, b) {
         $(b).select2({
             closeOnSelect: false,
@@ -72,6 +74,7 @@ $.fn.facets = function ()
                         //lang: getLanguage()
                         },
                         curParams.facets,
+                        curParams.sliderDates,
                         { limit: limit } // need to go after curParams.facets to overwrite the limit setting there 
                     )
                     return query;
@@ -720,8 +723,14 @@ function active_facets() {
         to=slider.attr('data-to-slider');
         min=slider.attr('data-min-slider');
         max=slider.attr('data-max-slider');
-        if(from > min) { params.sliderDates.fromDate = from }
-        if(to < max) { params.sliderDates.toDate = to }
+        if(from > min) { 
+            params.sliderDates.fromDate = from;
+            params.sliderDates.oldFromDate = min;
+        }
+        if(to < max) { 
+            params.sliderDates.toDate = to;
+            params.sliderDates.oldToDate = max;
+        }
     }
     /* get values from checkboxes for docTypes at search page 
      * as well as for other checkboxes on list pages like 'revealed' or 'undated'

From 449494f4cf4ec176eb29649e01bebd279c02c1cc Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Wed, 16 Sep 2020 09:09:28 +0200
Subject: [PATCH 14/14] output zero for unavailable options

---
 modules/facets.xqm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/facets.xqm b/modules/facets.xqm
index ae2508c1a..d1a77ce49 100644
--- a/modules/facets.xqm
+++ b/modules/facets.xqm
@@ -54,12 +54,16 @@ declare
                 for $i in $selected 
 (:                let $log := util:log-system-out($i):)
                 let $display-term := facets:display-term($facet, $i, $lang)
-                order by $display-term
+                let $freq := 
+                    if ($selectedObjs?*[?value = $i]?frequency castable as xs:int) 
+                    then $selectedObjs?*[?value = $i]?frequency
+                    else 0
+                    order by $display-term
                 return
                     element option {
                         attribute selected {'selected'},
                         attribute value {$i},
-                        $display-term || ' (' || $selectedObjs?*[?value = $i]?frequency || ')'
+                        $display-term || ' (' || $freq || ')'
                     }
             }
 };