From 7f17d2ab24dcc8a3466ffe1be94ef7e92974dca5 Mon Sep 17 00:00:00 2001
From: Mathias Goebel <goebel@sub.uni-goettingen.de>
Date: Wed, 14 Oct 2020 13:48:59 +0200
Subject: [PATCH 001/155] Bugfix/#49 pw protection

---
 .gitlab-ci.yml             | 2 +-
 CHANGELOG.md               | 6 ++++++
 exist-app/build.properties | 2 +-
 exist-app/post-install.xq  | 5 +++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15cf117..a695ea6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ stages:
 - chmod 700 ~/.ssh
 
 .env: &env
-- echo $SECRETS >> docker/ahikar.env
+- echo $SECRETS | sed "s#\s#\n#g" >> docker/ahikar.env
 - sh docker/set-env-for-docker-compose.sh
 
 # used for develop and master, see test for all other cases!
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01499f9..49cf6cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.13.0] - 2020-10-13
+
+### Added
+
+- exist application sets admin password from env var (optionally)
+
 ## [1.12.0] - 2020-10-01
 
 ### Added
diff --git a/exist-app/build.properties b/exist-app/build.properties
index 1daf5a4..b11b27f 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=1.11.0
+project.version=1.13.0
 project.title=TextAPI for Ahikar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index fda6e1b..9cb4d11 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -24,6 +24,11 @@ declare function local:move-and-rename($filename as xs:string) as item()* {
                 xmldb:move($data-file-path, $target-agg-collection, $filename)
 };
 
+(:  set admin password on deployment. Convert to string
+    so local development will not fail because of missing
+    env var. :)
+sm:passwd("admin", string(environment-variable("EXIST_ADMIN_PW"))),
+
 ( 
     (: register REST APIs :)
     for $uri at $pos in (collection($target)/base-uri())[ends-with(., ".xqm")]
-- 
GitLab


From 3ff40fb883596522281e53309dcb1ee6d3d7f716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 26 Oct 2020 19:55:12 +0100
Subject: [PATCH 002/155] fix: requestr not available for test suite

---
 exist-app/modules/annotations.xqm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index c53e5d7..50484e4 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -26,7 +26,14 @@ import module namespace rest="http://exquery.org/ns/restxq";
 import module namespace tapi="http://ahikar.sub.uni-goettingen.de/ns/tapi" at "tapi.xqm";
 
 declare variable $anno:ns := "http://ahikar.sub.uni-goettingen.de/ns/annotations";
-declare variable $anno:server := if(requestr:hostname() = "existdb") then doc("../expath-pkg.xml")/*/@name => replace("/$", "") else "http://localhost:8094/exist/restxq";
+declare variable $anno:server :=
+    if(try {
+    requestr:hostname() = "existdb"
+} catch * {
+    true()
+})
+    then doc("../expath-pkg.xml")/*/@name => replace("/$", "")
+    else "http://localhost:8094/exist/restxq";
 
 declare variable $anno:annotationElements := 
     (
-- 
GitLab


From 6672ec37a4ebf8675948999fbc90f326a11a8af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 26 Oct 2020 20:11:17 +0100
Subject: [PATCH 003/155] fix: add return type

---
 exist-app/modules/annotations.xqm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 50484e4..a767df5 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -952,7 +952,8 @@ $page as xs:string) as xs:integer {
 };
 
 
-declare function anno:get-document($uri as xs:string, $type as xs:string) {
+declare function anno:get-document($uri as xs:string, $type as xs:string)
+as document-node() {
     let $collection :=
         switch ($type)
             case "agg" return $commons:agg
-- 
GitLab


From 878cbfde785df4dafba561e25762c1e9444d2e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 26 Oct 2020 20:11:56 +0100
Subject: [PATCH 004/155] docs: add minor code doc

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

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index a767df5..5936a1f 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -43,7 +43,7 @@ declare variable $anno:annotationElements :=
 
 (: this variable holds a map with the complete project structure (excluding images) :)
 declare variable $anno:uris :=
-    let $main-collection := "3r132"
+    let $main-collection := "3r132" (: main textgrid edition object :)
     let $language-aggs := anno:get-uris($main-collection)
     return
         map { $main-collection:
-- 
GitLab


From 6fc2c1f43343f9ffca2b331ef7de3a70248479a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 26 Oct 2020 20:13:52 +0100
Subject: [PATCH 005/155] fix: REST path

---
 exist-app/modules/annotations.xqm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 5936a1f..5ab4451 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -234,7 +234,7 @@ declare function anno:get-creator($uri as xs:string) as xs:string {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/textapi/ahikar/{$collection}/{$document}/annotationPage.json")
+    %rest:path("/textapi/ahikar/{$collection}/{$document}/annotationPage.json")
     %output:method("json")
 function anno:annotationPage-for-collection-rest($collection as xs:string, 
 $document as xs:string) {
@@ -311,7 +311,7 @@ $document as xs:string, $server as xs:string) {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/textapi/ahikar/{$collection}/{$document}/annotationCollection.json")
+    %rest:path("/textapi/ahikar/{$collection}/{$document}/annotationCollection.json")
     %output:method("json")
 function anno:manifest-rest($collection as xs:string, 
 $document as xs:string) {
-- 
GitLab


From 7e633c8c2cf1f6d8613fe0b04f6b2c20ff9909d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 26 Oct 2020 20:16:53 +0100
Subject: [PATCH 006/155] fix: reuse IDs from HTML serialization

this will ensure that IDs are identical and we do not want to repeat our selfs
---
 exist-app/modules/annotations.xqm | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 5ab4451..dc9d84f 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -24,6 +24,8 @@ import module namespace functx = "http://www.functx.com";
 import module namespace requestr="http://exquery.org/ns/request";
 import module namespace rest="http://exquery.org/ns/restxq";
 import module namespace tapi="http://ahikar.sub.uni-goettingen.de/ns/tapi" at "tapi.xqm";
+import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "tapi-html.xqm";
+
 
 declare variable $anno:ns := "http://ahikar.sub.uni-goettingen.de/ns/annotations";
 declare variable $anno:server :=
@@ -492,7 +494,7 @@ declare function anno:get-annotations($documentURI as xs:string, $page as xs:str
             $pageChunk//*[name(.) = $name]
     
     for $annotation in $annotation-elements return
-        let $id := generate-id($annotation)
+        let $id := string( $annotation/@id )
         return
         map {
             "id": $anno:ns || "/" || $documentURI || "/annotation-" || $id,
@@ -511,26 +513,9 @@ declare function anno:get-annotations($documentURI as xs:string, $page as xs:str
  : @param $page The page to be returned as tei:pb/@n/string()
  :)
 declare function anno:get-page-fragment($documentURI as xs:string, $page as xs:string) {
-    let $node :=anno:get-document($documentURI, "data"),
-        $start-node := $node//tei:pb[@n = $page and @facs],
-        $end-node :=
-            let $followingPb := $node//tei:pb[@n = $page and @facs]/following::tei:pb[1][@facs]
-            return
-                if($followingPb)
-                then $followingPb
-                else $node//tei:pb[@n = $page and @facs]/following::tei:ab[last()],
-        $wrap-in-first-common-ancestor-only := false(),
-        $include-start-and-end-nodes := false(),
-        $empty-ancestor-elements-to-include := ("")
-        
+    let $nodeURI :=anno:get-document($documentURI, "data")/base-uri()
     return
-        fragment:get-fragment-from-doc( 
-            $node,
-            $start-node,
-            $end-node,
-            $wrap-in-first-common-ancestor-only,
-            $include-start-and-end-nodes,
-            $empty-ancestor-elements-to-include)
+        tapi-html:get-page-fragment($nodeURI, $page)
 };
 
 
-- 
GitLab


From 7eefb321dac7e398db0b461e0da5a4ceb10dab58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 26 Oct 2020 20:18:07 +0100
Subject: [PATCH 007/155] docs: add inline code doc

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

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index dc9d84f..42e88b7 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -494,7 +494,7 @@ declare function anno:get-annotations($documentURI as xs:string, $page as xs:str
             $pageChunk//*[name(.) = $name]
     
     for $annotation in $annotation-elements return
-        let $id := string( $annotation/@id )
+        let $id := string( $annotation/@id ) (: get the predefined ID from the in-memory TEI with IDs :)
         return
         map {
             "id": $anno:ns || "/" || $documentURI || "/annotation-" || $id,
-- 
GitLab


From 89dcfa1a6ee4275c228eeea6985334e47928f414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 26 Oct 2020 20:31:27 +0100
Subject: [PATCH 008/155] feature: move annotations to own REST paths

---
 exist-app/modules/annotations.xqm     | 34 +++++++++++----------------
 exist-app/modules/tapi-collection.xqm |  2 +-
 exist-app/modules/tapi-item.xqm       |  2 +-
 exist-app/modules/tapi-manifest.xqm   |  2 +-
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 42e88b7..82b5f40 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -80,7 +80,7 @@ declare variable $anno:uris :=
  : it has mainly been designed for Ahikar's main collection, 3r132.
  : 
  : For retrieving annotation information about other collections cf. the endpoint
- : /textapi/ahikar/{$collection}/{$document}/annotationCollection.json
+ : /textapi/ahikar/annotation/collection/{$collection}/{$document}/annotationCollection.json
  : 
  : @param $collection The URI of the collection, e.g. '3r132'
  : @return An Annotation Collecion for the given collection
@@ -88,7 +88,7 @@ declare variable $anno:uris :=
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/textapi/ahikar/{$collection}/annotationCollection.json")
+    %rest:path("/textapi/ahikar/annotation/collection/{$collection}/annotationCollection.json")
     %output:method("json")
 function anno:collection-rest($collection as xs:string) {
     if (anno:are-resources-available($collection)) then
@@ -115,8 +115,8 @@ declare function anno:make-annotationCollection($collection as xs:string, $docum
     at this point it is relevant if $document is actually a manifest or a collection.
     we have to create different paths containing $first and $last for the two of them,
     namely
-        $server || "/textapi/ahikar/" || $document || "/" || $first || "/annotationPage.json" for $document being a collection
-        $server || "/textapi/ahikar/" || $collection || "/" || $document || "-" || $first || "/annotationPage.json" for $document being a manifest :)
+        $server || "/textapi/ahikar/annotation/page/" || $document || "/" || $first || "/annotationPage.json" for $document being a collection
+        $server || "/textapi/ahikar/annotation/page/" || $collection || "/" || $document || "-" || $first || "/annotationPage.json" for $document being a manifest :)
     if ($document and anno:find-in-map($anno:uris, $document) instance of map()) then
         anno:get-information-for-collection-object($document, $server)
     
@@ -126,8 +126,8 @@ declare function anno:make-annotationCollection($collection as xs:string, $docum
         let $tei := anno:find-in-map($anno:uris, $document)
         let $pages := anno:get-pages-in-TEI($tei)
         let $title := anno:get-metadata-title($document)
-        let $first-entry := $server || "/api/textapi/ahikar/" || $collection || "/" || $document || "-" || $pages[1] || "/annotationPage.json"
-        let $last-entry := $server || "/api/textapi/ahikar/" || $collection || "/" || $document || "-" || $pages[last()] || "/annotationPage.json"
+        let $first-entry := $server || "/api/textapi/ahikar/annotation/page/" || $collection || "/" || $document || "/" || $pages[1] || "/annotationPage.json"
+        let $last-entry := $server || "/api/textapi/ahikar/annotation/page/" || $collection || "/" || $document || "/" || $pages[last()] || "/annotationPage.json"
     
         return
             anno:make-annotationCollection-map($document, $title, $first-entry, $last-entry)
@@ -153,8 +153,8 @@ declare function anno:get-information-for-collection-object($collectionURI as xs
     let $first := $child-keys[1]
     let $last := $child-keys[last()]
     let $title := anno:get-metadata-title($collectionURI)
-    let $first-entry := $server || "/api/textapi/ahikar/" || $collectionURI || "/" || $first || "/annotationPage.json"
-    let $last-entry := $server || "/api/textapi/ahikar/" || $collectionURI || "/" || $last || "/annotationPage.json"
+    let $first-entry := $server || "/api/textapi/ahikar/annotation/page/" || $collectionURI || "/" || $first || "/annotationPage.json"
+    let $last-entry  := $server || "/api/textapi/ahikar/annotation/page/" || $collectionURI || "/" || $last  || "/annotationPage.json"
 
     return
         anno:make-annotationCollection-map($collectionURI, $title, $first-entry, $last-entry)
@@ -236,7 +236,7 @@ declare function anno:get-creator($uri as xs:string) as xs:string {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/textapi/ahikar/{$collection}/{$document}/annotationPage.json")
+    %rest:path("/textapi/ahikar/annotation/page/{$collection}/{$document}/annotationPage.json")
     %output:method("json")
 function anno:annotationPage-for-collection-rest($collection as xs:string, 
 $document as xs:string) {
@@ -313,7 +313,7 @@ $document as xs:string, $server as xs:string) {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/textapi/ahikar/{$collection}/{$document}/annotationCollection.json")
+    %rest:path("/textapi/ahikar/annotation/collection/{$collection}/{$document}/annotationCollection.json")
     %output:method("json")
 function anno:manifest-rest($collection as xs:string, 
 $document as xs:string) {
@@ -344,7 +344,7 @@ $document as xs:string) {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/textapi/ahikar/{$collection}/{$document}-{$page}/annotationCollection.json")
+    %rest:path("/textapi/ahikar/annotation/collection/{$collection}/{$document}/{$page}/annotationCollection.json")
     %output:method("json")
 function anno:annotationCollection-for-manifest-rest($collection as xs:string, 
 $document as xs:string, $page as xs:string) {
@@ -387,7 +387,7 @@ $document as xs:string, $page as xs:string, $server as xs:string) {
                     "label":    "Ahikar annotations for textgrid:" || $document || ": " || $title || ", page " || $page,
                     "x-creator":  anno:get-creator($document),
                     "total":    anno:get-total-no-of-annotations($page),
-                    "first":    $server || "/api/textapi/ahikar/" || $collection || "/" || $document || "-" || $page || "/annotationPage.json"
+                    "first":    $server || "/api/textapi/ahikar/annotation/page/" || $collection || "/" || $document || "/" || $page || "/annotationPage.json"
                 }
         }
 };
@@ -412,7 +412,7 @@ $document as xs:string, $page as xs:string, $server as xs:string) {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/textapi/ahikar/{$collection}/{$document}-{$page}/annotationPage.json")
+    %rest:path("/textapi/ahikar/annotation/page/{$collection}/{$document}/{$page}/annotationPage.json")
     %output:method("json")
 function anno:annotationPage-for-manifest-rest($collection as xs:string, 
 $document as xs:string, $page as xs:string) {
@@ -705,14 +705,8 @@ $document as xs:string, $type as xs:string) {
 
 declare function anno:get-prev-or-next-annotationPage-url($collection as xs:string,
 $document as xs:string?, $page as xs:string?, $server as xs:string) {
-    let $pageSuffix :=
-        if ($page) then
-            "-" || $page
-        else
-            ()
-    return
         if ($document) then
-            $server || "/api/textapi/ahikar/" || $collection|| "/" || $document || $pageSuffix || "/annotationPage.json"
+            $server || "/api/textapi/ahikar/annotation/page/" || $collection || "/" || $document || "/" || $page || "/annotationPage.json"
         else
             ()
 };
diff --git a/exist-app/modules/tapi-collection.xqm b/exist-app/modules/tapi-collection.xqm
index e372b8e..e9a02e5 100644
--- a/exist-app/modules/tapi-collection.xqm
+++ b/exist-app/modules/tapi-collection.xqm
@@ -141,5 +141,5 @@ as xs:string {
 declare function tapi-coll:make-annotationCollection-uri($server as xs:string,
     $collection-uri as xs:string)
 as xs:string {
-    $server || "/api/textapi/ahikar/" || $collection-uri || "/annotationCollection.json"
+    $server || "/api/textapi/ahikar/annotation/collection/" || $collection-uri || "/annotationCollection.json"
 };
diff --git a/exist-app/modules/tapi-item.xqm b/exist-app/modules/tapi-item.xqm
index f38fb7e..b9f3db6 100644
--- a/exist-app/modules/tapi-item.xqm
+++ b/exist-app/modules/tapi-item.xqm
@@ -30,7 +30,7 @@ as element(object) {
         <image>
             <id>{tapi-item:make-facsimile-id($manifest-uri, $page, $server)}</id>
         </image>
-        <annotationCollection>{$server}/api/textapi/ahikar/{$collection-uri}/{$manifest-uri}-{$page}/annotationCollection.json</annotationCollection>
+        <annotationCollection>{$server}/api/textapi/ahikar/annotation/collection/{$collection-uri}/{$manifest-uri}/{$page}/annotationCollection.json</annotationCollection>
     </object>
 };
 
diff --git a/exist-app/modules/tapi-manifest.xqm b/exist-app/modules/tapi-manifest.xqm
index 6a3205a..7297c62 100644
--- a/exist-app/modules/tapi-manifest.xqm
+++ b/exist-app/modules/tapi-manifest.xqm
@@ -29,7 +29,7 @@ as element(object) {
             tapi-mani:make-current-location($manifest-uri)
         }
         <license>CC0-1.0</license>
-        <annotationCollection>{$server}/api/textapi/ahikar/{$collection-uri}/{$manifest-uri}/annotationCollection.json</annotationCollection>
+        <annotationCollection>{$server}/api/textapi/ahikar/annotation/collection/{$collection-uri}/{$manifest-uri}/annotationCollection.json</annotationCollection>
         {tapi-mani:make-sequences($collection-uri, $manifest-uri, $server)}
     </object>
 };
-- 
GitLab


From 59d0a423d0282ed9991f62c2a82180b41a63d205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 26 Oct 2020 21:04:38 +0100
Subject: [PATCH 009/155] feature: custom error on doc not found

---
 exist-app/modules/annotations.xqm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 82b5f40..467f7c2 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -939,6 +939,9 @@ as document-node() {
             case "data" return $commons:tg-collection || "/data/"
             case "meta" return $commons:meta
             default return error(QName($anno:ns, "ANNO02"), "Unknown type " || $type)
+    let $document-uri := $collection || $uri || ".xml"
     return
-        doc($collection || $uri || ".xml")
+        if(doc-available($document-uri))
+        then doc($document-uri)
+        else error(QName($anno:ns, "ANNO03"), "Document not found: " || $document-uri)
 };
\ No newline at end of file
-- 
GitLab


From fdd49371462dab6c8d28aefc868dc52598d20a6e Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 5 Nov 2020 11:43:34 +0100
Subject: [PATCH 010/155] ci: check if test API is available

---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90c956e..1c6b868 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,10 @@ test_exist_app:
     - ant -f exist-app/build.xml test
     - bash exist-app/test/bin/startup.sh | tee output.log &
     - while [ $(curl --head --silent http://localhost:8080 | grep -c "200 OK") == 0 ]; do sleep 1s; done
+    - header=$(curl --head -s http://localhost:8080/exist/restxq/trigger-tests)
+    - status=$(echo $header | head -n 1 | cut -d" " -f 2)
+    - echo "Current HTTP status is $status."
+    - if [[ "$status" == "200" ]]; then ; else exit 1; fi
     - curl http://localhost:8080/exist/restxq/trigger-tests
     - sleep 60
     - bash exist-app/test/bin/shutdown.sh
-- 
GitLab


From 05a5631f6b7e157733b89db85d27ebc2d94e99b2 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 5 Nov 2020 13:39:03 +0100
Subject: [PATCH 011/155] fix: remove faulty pw setting

---
 exist-app/post-install.xq | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index 9cb4d11..fda6e1b 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -24,11 +24,6 @@ declare function local:move-and-rename($filename as xs:string) as item()* {
                 xmldb:move($data-file-path, $target-agg-collection, $filename)
 };
 
-(:  set admin password on deployment. Convert to string
-    so local development will not fail because of missing
-    env var. :)
-sm:passwd("admin", string(environment-variable("EXIST_ADMIN_PW"))),
-
 ( 
     (: register REST APIs :)
     for $uri at $pos in (collection($target)/base-uri())[ends-with(., ".xqm")]
-- 
GitLab


From 96a28576305699e90e63e3e5ee4690749420cca5 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 5 Nov 2020 13:39:27 +0100
Subject: [PATCH 012/155] fix: remove surplus module imports

---
 exist-app/modules/testtrigger.xqm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 96fbbe5..70f2ddc 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -14,12 +14,10 @@ module namespace testtrigger="http://ahikar.sub.uni-goettingen.de/ns/testtrigger
 import module namespace rest="http://exquery.org/ns/restxq";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 
-import module namespace coll-tests="http://ahikar.sub.uni-goettingen.de/ns/coll-tests" at "../tests/collate-tests.xqm";
 import module namespace ct="http://ahikar.sub.uni-goettingen.de/ns/commons-tests" at "../tests/commons-tests.xqm";
 import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "../tests/tei2html-tests.xqm";
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "../tests/tei2html-textprocessing-tests.xqm";
 import module namespace ttt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" at "../tests/tapi-txt-tests.xqm";
-import module namespace ct="http://ahikar.sub.uni-goettingen.de/ns/commons-tests" at "../tests/commons-tests.xqm";
 import module namespace tct="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests" at "../tests/tapi-collection-tests.xqm";
 import module namespace thtmlt="http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests" at "../tests/tapi-html-tests.xqm";
 import module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" at "../tests/tapi-item-tests.xqm";
@@ -46,7 +44,6 @@ as item()? {
     let $tests := 
         (
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/coll-tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
-- 
GitLab


From 3706c9aea59896ca4f2827a20fc42b4e0b55ccb2 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 5 Nov 2020 13:40:57 +0100
Subject: [PATCH 013/155] ci: insert check if test trigger is available

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c6b868..57d33ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ test_exist_app:
     - header=$(curl --head -s http://localhost:8080/exist/restxq/trigger-tests)
     - status=$(echo $header | head -n 1 | cut -d" " -f 2)
     - echo "Current HTTP status is $status."
-    - if [[ "$status" == "200" ]]; then ; else exit 1; fi
+    - if [[ "$status" != "200" ]]; then exit 1; fi
     - curl http://localhost:8080/exist/restxq/trigger-tests
     - sleep 60
     - bash exist-app/test/bin/shutdown.sh
-- 
GitLab


From f0717b1e418d00a12a98ccbb48f30c651a98879f Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 5 Nov 2020 15:07:41 +0100
Subject: [PATCH 014/155] fix: add HEAD

---
 exist-app/modules/testtrigger.xqm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 70f2ddc..d8b8867 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -33,6 +33,7 @@ import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" a
  :)
 declare
   %rest:GET
+  %rest:HEAD
   %rest:path("/trigger-tests")
   %rest:query-param("token", "{$token}")
 function testtrigger:trigger($token)
-- 
GitLab


From 53aec7fb9332e87f5949fd36e9127e74b44afdde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Thu, 5 Nov 2020 15:22:17 +0100
Subject: [PATCH 015/155] fix: update pw on autodeploy stage

---
 exist-app/post-install.xq | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index 9cb4d11..b8e8e62 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -27,7 +27,16 @@ declare function local:move-and-rename($filename as xs:string) as item()* {
 (:  set admin password on deployment. Convert to string
     so local development will not fail because of missing
     env var. :)
-sm:passwd("admin", string(environment-variable("EXIST_ADMIN_PW"))),
+
+(
+    if(environment-variable("EXIST_ADMIN_PW_RIPEMD160"))
+    then
+        (update replace doc('/db/system/security/exist/accounts/admin.xml')//*:password/text() with text{ string(environment-variable("EXIST_ADMIN_PW_RIPEMD160")) },
+         update replace doc('/db/system/security/exist/accounts/admin.xml')//*:digestPassword/text() with text{ string(environment-variable("EXIST_ADMIN_PW_DIGEST")) })
+    else (: we do not have the env vars available, so we leave the configuration as it is :) 
+        true() 
+
+),
 
 ( 
     (: register REST APIs :)
-- 
GitLab


From ba6ddd76d1a745cb6d3fab4896ae889ef88ab20f Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 6 Nov 2020 09:48:31 +0100
Subject: [PATCH 016/155] fix: remove merge fragments

---
 exist-app/post-install.xq | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index e037250..b8e8e62 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -24,8 +24,6 @@ declare function local:move-and-rename($filename as xs:string) as item()* {
                 xmldb:move($data-file-path, $target-agg-collection, $filename)
 };
 
-<<<<<<< HEAD
-=======
 (:  set admin password on deployment. Convert to string
     so local development will not fail because of missing
     env var. :)
@@ -40,7 +38,6 @@ declare function local:move-and-rename($filename as xs:string) as item()* {
 
 ),
 
->>>>>>> develop
 ( 
     (: register REST APIs :)
     for $uri at $pos in (collection($target)/base-uri())[ends-with(., ".xqm")]
-- 
GitLab


From c21ca1229455f6a94caaa94798b570b848f9c832 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 6 Nov 2020 09:49:20 +0100
Subject: [PATCH 017/155] chore: update test result file name

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

diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index d8b8867..0624295 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -60,7 +60,7 @@ as item()? {
     
     let $testWrap := <tests time="{current-dateTime()}">{ $tests }</tests>
     
-    let $filename := $system-path || "test-results.xml"
+    let $filename := $system-path || "ahikar-test-results.xml"
     let $file := file:serialize($testWrap, $filename, ())
     
     return
-- 
GitLab


From 25e43b671135e7ce8a1adeafc9b4d03a5d4addfc Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 6 Nov 2020 10:00:36 +0100
Subject: [PATCH 018/155] ci: update file name; check if result XML exists

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57d33ad..3bdd583 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,12 +49,12 @@ test_exist_app:
     - bash exist-app/test/bin/shutdown.sh
     - failures=$(./get-unit-test-failures-and-errors.sh)
     - echo -e "\033[1;33mThere is/are currently $failures failures or errors.\033[0m"
-    - if [[ "$failures" -gt 0 ]]; then exit 1; else exit 0; fi
+    - if [[ "$failures" -gt 0 || ! -f "exist-app/test/ahikar-test-results.xml" ]]; then exit 1; else exit 0; fi
   artifacts:
     paths:
-      - exist-app/test/test-results.xml
+      - exist-app/test/ahikar-test-results.xml
     reports:
-      junit: exist-app/test/test-results.xml
+      junit: exist-app/test/ahikar-test-results.xml
 
 build_exist_app-all:
   image: docker.gitlab.gwdg.de/fontane-notizbuecher/build:latest
-- 
GitLab


From 07e20a4c5d825fa40032d91ff7188876fc338beb Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 6 Nov 2020 10:00:46 +0100
Subject: [PATCH 019/155] chore: update file name

---
 get-unit-test-failures-and-errors.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/get-unit-test-failures-and-errors.sh b/get-unit-test-failures-and-errors.sh
index ee76a04..60b48dc 100755
--- a/get-unit-test-failures-and-errors.sh
+++ b/get-unit-test-failures-and-errors.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-failures=$(xmllint --xpath '/tests/testsuites/testsuite/@failures' exist-app/test/test-results.xml | egrep -o "[0-9]+")
-errors=$(xmllint --xpath '/tests/testsuites/testsuite/@errors' exist-app/test/test-results.xml | egrep -o "[0-9]+")
+failures=$(xmllint --xpath '/tests/testsuites/testsuite/@failures' exist-app/test/ahikar-test-results.xml | egrep -o "[0-9]+")
+errors=$(xmllint --xpath '/tests/testsuites/testsuite/@errors' exist-app/test/ahikar-test-results.xml | egrep -o "[0-9]+")
 
 problem_sum=0
 
-- 
GitLab


From db29d94d1a535670322971e09785859212678d87 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 6 Nov 2020 10:09:43 +0100
Subject: [PATCH 020/155] docs: CHANGELOG, version number

---
 CHANGELOG.md               | 10 ++++++++++
 exist-app/build.properties |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49cf6cf..789e37d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.13.1] - 2020-10-06
+
+### Fixed
+
+- Unit tests are executed again.
+
+### Changed
+
+- The CI tests if 1. the unit test API is available and 2. the XML file resulting from the test exists.
+
 ## [1.13.0] - 2020-10-13
 
 ### Added
diff --git a/exist-app/build.properties b/exist-app/build.properties
index b11b27f..011fd63 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=1.13.0
+project.version=1.13.1
 project.title=TextAPI for Ahikar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
-- 
GitLab


From c22ad637bb8c2ab70ae9aab04cd952cf4b6d2e56 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 6 Nov 2020 10:42:38 +0100
Subject: [PATCH 021/155] feat: change endpoint of AnnotationAPI

---
 CHANGELOG.md                              |  6 +++++
 exist-app/build.properties                |  2 +-
 exist-app/modules/annotations.xqm         | 30 +++++++++++------------
 exist-app/modules/tapi-collection.xqm     |  2 +-
 exist-app/modules/tapi-item.xqm           |  2 +-
 exist-app/modules/tapi-manifest.xqm       |  4 +--
 exist-app/tests/tapi-collection-tests.xqm |  2 +-
 exist-app/tests/tapi-item-tests.xqm       |  3 ++-
 exist-app/tests/tapi-manifest-tests.xqm   |  7 +++---
 9 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49cf6cf..335ad7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0] - 2020-11-06
+
+### Changed
+
+- The AnnotationAPI is now served at `/api/annotations` instead of `/api/textapi`.
+
 ## [1.13.0] - 2020-10-13
 
 ### Added
diff --git a/exist-app/build.properties b/exist-app/build.properties
index b11b27f..6a89d1e 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=1.13.0
+project.version=2.0.0
 project.title=TextAPI for Ahikar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index c53e5d7..0ab0667 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -71,7 +71,7 @@ declare variable $anno:uris :=
  : it has mainly been designed for Ahikar's main collection, 3r132.
  : 
  : For retrieving annotation information about other collections cf. the endpoint
- : /textapi/ahikar/{$collection}/{$document}/annotationCollection.json
+ : /annotations/ahikar/{$collection}/{$document}/annotationCollection.json
  : 
  : @param $collection The URI of the collection, e.g. '3r132'
  : @return An Annotation Collecion for the given collection
@@ -79,7 +79,7 @@ declare variable $anno:uris :=
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/textapi/ahikar/{$collection}/annotationCollection.json")
+    %rest:path("/annotations/ahikar/{$collection}/annotationCollection.json")
     %output:method("json")
 function anno:collection-rest($collection as xs:string) {
     if (anno:are-resources-available($collection)) then
@@ -106,8 +106,8 @@ declare function anno:make-annotationCollection($collection as xs:string, $docum
     at this point it is relevant if $document is actually a manifest or a collection.
     we have to create different paths containing $first and $last for the two of them,
     namely
-        $server || "/textapi/ahikar/" || $document || "/" || $first || "/annotationPage.json" for $document being a collection
-        $server || "/textapi/ahikar/" || $collection || "/" || $document || "-" || $first || "/annotationPage.json" for $document being a manifest :)
+        $server || "/annotations/ahikar/" || $document || "/" || $first || "/annotationPage.json" for $document being a collection
+        $server || "/annotations/ahikar/" || $collection || "/" || $document || "-" || $first || "/annotationPage.json" for $document being a manifest :)
     if ($document and anno:find-in-map($anno:uris, $document) instance of map()) then
         anno:get-information-for-collection-object($document, $server)
     
@@ -117,8 +117,8 @@ declare function anno:make-annotationCollection($collection as xs:string, $docum
         let $tei := anno:find-in-map($anno:uris, $document)
         let $pages := anno:get-pages-in-TEI($tei)
         let $title := anno:get-metadata-title($document)
-        let $first-entry := $server || "/api/textapi/ahikar/" || $collection || "/" || $document || "-" || $pages[1] || "/annotationPage.json"
-        let $last-entry := $server || "/api/textapi/ahikar/" || $collection || "/" || $document || "-" || $pages[last()] || "/annotationPage.json"
+        let $first-entry := $server || "/api/annotations/ahikar/" || $collection || "/" || $document || "-" || $pages[1] || "/annotationPage.json"
+        let $last-entry := $server || "/api/annotations/ahikar/" || $collection || "/" || $document || "-" || $pages[last()] || "/annotationPage.json"
     
         return
             anno:make-annotationCollection-map($document, $title, $first-entry, $last-entry)
@@ -144,8 +144,8 @@ declare function anno:get-information-for-collection-object($collectionURI as xs
     let $first := $child-keys[1]
     let $last := $child-keys[last()]
     let $title := anno:get-metadata-title($collectionURI)
-    let $first-entry := $server || "/api/textapi/ahikar/" || $collectionURI || "/" || $first || "/annotationPage.json"
-    let $last-entry := $server || "/api/textapi/ahikar/" || $collectionURI || "/" || $last || "/annotationPage.json"
+    let $first-entry := $server || "/api/annotations/ahikar/" || $collectionURI || "/" || $first || "/annotationPage.json"
+    let $last-entry := $server || "/api/annotations/ahikar/" || $collectionURI || "/" || $last || "/annotationPage.json"
 
     return
         anno:make-annotationCollection-map($collectionURI, $title, $first-entry, $last-entry)
@@ -227,7 +227,7 @@ declare function anno:get-creator($uri as xs:string) as xs:string {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/textapi/ahikar/{$collection}/{$document}/annotationPage.json")
+    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/annotationPage.json")
     %output:method("json")
 function anno:annotationPage-for-collection-rest($collection as xs:string, 
 $document as xs:string) {
@@ -304,7 +304,7 @@ $document as xs:string, $server as xs:string) {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/textapi/ahikar/{$collection}/{$document}/annotationCollection.json")
+    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/annotationCollection.json")
     %output:method("json")
 function anno:manifest-rest($collection as xs:string, 
 $document as xs:string) {
@@ -335,7 +335,7 @@ $document as xs:string) {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/textapi/ahikar/{$collection}/{$document}-{$page}/annotationCollection.json")
+    %rest:path("/api/annotations/ahikar/{$collection}/{$document}-{$page}/annotationCollection.json")
     %output:method("json")
 function anno:annotationCollection-for-manifest-rest($collection as xs:string, 
 $document as xs:string, $page as xs:string) {
@@ -378,7 +378,7 @@ $document as xs:string, $page as xs:string, $server as xs:string) {
                     "label":    "Ahikar annotations for textgrid:" || $document || ": " || $title || ", page " || $page,
                     "x-creator":  anno:get-creator($document),
                     "total":    anno:get-total-no-of-annotations($page),
-                    "first":    $server || "/api/textapi/ahikar/" || $collection || "/" || $document || "-" || $page || "/annotationPage.json"
+                    "first":    $server || "/api/annotations/ahikar/" || $collection || "/" || $document || "-" || $page || "/annotationPage.json"
                 }
         }
 };
@@ -403,7 +403,7 @@ $document as xs:string, $page as xs:string, $server as xs:string) {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/textapi/ahikar/{$collection}/{$document}-{$page}/annotationPage.json")
+    %rest:path("/api/annotations/ahikar/{$collection}/{$document}-{$page}/annotationPage.json")
     %output:method("json")
 function anno:annotationPage-for-manifest-rest($collection as xs:string, 
 $document as xs:string, $page as xs:string) {
@@ -720,7 +720,7 @@ $document as xs:string?, $page as xs:string?, $server as xs:string) {
             ()
     return
         if ($document) then
-            $server || "/api/textapi/ahikar/" || $collection|| "/" || $document || $pageSuffix || "/annotationPage.json"
+            $server || "/api/annotations/ahikar/" || $collection|| "/" || $document || $pageSuffix || "/annotationPage.json"
         else
             ()
 };
@@ -954,4 +954,4 @@ declare function anno:get-document($uri as xs:string, $type as xs:string) {
             default return error(QName($anno:ns, "ANNO02"), "Unknown type " || $type)
     return
         doc($collection || $uri || ".xml")
-};
\ No newline at end of file
+};
diff --git a/exist-app/modules/tapi-collection.xqm b/exist-app/modules/tapi-collection.xqm
index e372b8e..b4ee2e8 100644
--- a/exist-app/modules/tapi-collection.xqm
+++ b/exist-app/modules/tapi-collection.xqm
@@ -141,5 +141,5 @@ as xs:string {
 declare function tapi-coll:make-annotationCollection-uri($server as xs:string,
     $collection-uri as xs:string)
 as xs:string {
-    $server || "/api/textapi/ahikar/" || $collection-uri || "/annotationCollection.json"
+    $server || "/api/annotations/ahikar/" || $collection-uri || "/annotationCollection.json"
 };
diff --git a/exist-app/modules/tapi-item.xqm b/exist-app/modules/tapi-item.xqm
index f38fb7e..cd1a52c 100644
--- a/exist-app/modules/tapi-item.xqm
+++ b/exist-app/modules/tapi-item.xqm
@@ -30,7 +30,7 @@ as element(object) {
         <image>
             <id>{tapi-item:make-facsimile-id($manifest-uri, $page, $server)}</id>
         </image>
-        <annotationCollection>{$server}/api/textapi/ahikar/{$collection-uri}/{$manifest-uri}-{$page}/annotationCollection.json</annotationCollection>
+        <annotationCollection>{$server}/api/annotations/ahikar/{$collection-uri}/{$manifest-uri}-{$page}/annotationCollection.json</annotationCollection>
     </object>
 };
 
diff --git a/exist-app/modules/tapi-manifest.xqm b/exist-app/modules/tapi-manifest.xqm
index 6a3205a..d6d5c8f 100644
--- a/exist-app/modules/tapi-manifest.xqm
+++ b/exist-app/modules/tapi-manifest.xqm
@@ -29,7 +29,7 @@ as element(object) {
             tapi-mani:make-current-location($manifest-uri)
         }
         <license>CC0-1.0</license>
-        <annotationCollection>{$server}/api/textapi/ahikar/{$collection-uri}/{$manifest-uri}/annotationCollection.json</annotationCollection>
+        <annotationCollection>{$server}/api/annotations/ahikar/{$collection-uri}/{$manifest-uri}/annotationCollection.json</annotationCollection>
         {tapi-mani:make-sequences($collection-uri, $manifest-uri, $server)}
     </object>
 };
@@ -139,4 +139,4 @@ element(x-location) {
     return
         <x-location>{$string}</x-location>
 
-};
\ No newline at end of file
+};
diff --git a/exist-app/tests/tapi-collection-tests.xqm b/exist-app/tests/tapi-collection-tests.xqm
index 594e835..82b61b2 100644
--- a/exist-app/tests/tapi-collection-tests.xqm
+++ b/exist-app/tests/tapi-collection-tests.xqm
@@ -198,7 +198,7 @@ function tct:make-sequence($collection-uri as xs:string) {
 };
 
 declare
-    %test:args("ahiqar_collection") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/ahiqar_collection/annotationCollection.json")
+    %test:args("ahiqar_collection") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/ahiqar_collection/annotationCollection.json")
 function tct:make-annotationCollection-uri($collection-uri as xs:string)
 as xs:string {
     tapi-coll:make-annotationCollection-uri($tc:server, $collection-uri)
diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index cba6349..21c8e71 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -57,6 +57,7 @@ declare
     %test:assertXPath("$result//*[local-name(.) = 'content'] = 'http://0.0.0.0:8080/exist/restxq/api/content/ahiqar_sample-82a.html' ")
     (: checks if images connected to underlying pages are identified :)
     %test:assertXPath("$result//*[local-name(.) = 'id'] = 'http://0.0.0.0:8080/exist/restxq/api/images/3r1nz' ")
+    %test:assertXPath("$result//*[local-name(.) = 'annotationCollection'] = 'http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/ahiqar_collection/ahiqar_agg-82a/annotationCollection.json' ")
 function titemt:get-json($collection as xs:string,
     $document as xs:string,
     $page as xs:string) 
@@ -71,4 +72,4 @@ declare
     %test:args("ahiqar_agg") %test:assertXPath("count($result[local-name(.) = 'lang']) = 2")
 function titemt:make-language-elements($manifest-uri as xs:string) {
     tapi-item:make-language-elements($manifest-uri)
-};
\ No newline at end of file
+};
diff --git a/exist-app/tests/tapi-manifest-tests.xqm b/exist-app/tests/tapi-manifest-tests.xqm
index 1142ebf..d2d828b 100644
--- a/exist-app/tests/tapi-manifest-tests.xqm
+++ b/exist-app/tests/tapi-manifest-tests.xqm
@@ -150,8 +150,10 @@ function tmt:get-valid-page-ids($manifest-uri as xs:string) {
 };
 
 declare
-    %test:args("ahiqar_collection", "ahiqar_agg") %test:assertXPath("$result//label = 'Beispieldatei zum Testen'")
-    %test:args("ahiqar_collection", "ahiqar_agg") %test:assertXPath("$result//id[matches(., '/api/textapi/ahikar/ahiqar_collection/ahiqar_agg/manifest.json')]")
+    %test:args("ahiqar_collection", "ahiqar_agg")
+    %test:assertXPath("$result//label = 'Beispieldatei zum Testen'")
+    %test:assertXPath("$result//id[matches(., '/api/textapi/ahikar/ahiqar_collection/ahiqar_agg/manifest.json')]")
+    %test:assertXPath("$result//annotationCollection[matches(., '/api/annotations/ahikar/ahiqar_collection/ahiqar_agg-82a/annotationCollection.json')] ")
 function tmt:get-json($collection-uri as xs:string,
     $manifest-uri as xs:string) {
     tapi-mani:get-json($collection-uri, $manifest-uri, $tc:server)
@@ -203,4 +205,3 @@ function tmt:get-json($collection-uri as xs:string,
     $manifest-uri as xs:string) {
     tapi-mani:get-json($collection-uri, $manifest-uri, $tc:server)
 };
-
-- 
GitLab


From 13f5a3fad4e344f8c3a0fdf68f557dfd0b72bde1 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 10 Nov 2020 13:48:03 +0100
Subject: [PATCH 022/155] feat: add TILE sample data

---
 exist-app/data/ahiqar_agg.xml       |  1 +
 exist-app/data/ahiqar_tile.xml      | 38 +++++++++++++++++++++++++++++
 exist-app/data/ahiqar_tile_meta.xml | 14 +++++++++++
 exist-app/post-install.xq           | 35 +++++++++++++++++---------
 4 files changed, 77 insertions(+), 11 deletions(-)
 create mode 100644 exist-app/data/ahiqar_tile.xml
 create mode 100644 exist-app/data/ahiqar_tile_meta.xml

diff --git a/exist-app/data/ahiqar_agg.xml b/exist-app/data/ahiqar_agg.xml
index 67a6389..6df113d 100644
--- a/exist-app/data/ahiqar_agg.xml
+++ b/exist-app/data/ahiqar_agg.xml
@@ -1,5 +1,6 @@
 <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
     <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:ahiqar_agg.0">
         <ore:aggregates rdf:resource="textgrid:ahiqar_sample"/>
+        <ore:aggregates rdf:resource="textgrid:ahiqar_tile"/>
     </rdf:Description>
 </rdf:RDF>
diff --git a/exist-app/data/ahiqar_tile.xml b/exist-app/data/ahiqar_tile.xml
new file mode 100644
index 0000000..c844199
--- /dev/null
+++ b/exist-app/data/ahiqar_tile.xml
@@ -0,0 +1,38 @@
+<TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:svg="http://www.w3.org/2000/svg" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:exif="http://www.w3.org/2003/12/exif/ns#">
+   <teiHeader>
+      <fileDesc>
+         <titleStmt>
+            <title>Text-Image-Link Object</title>
+         </titleStmt>
+         <publicationStmt>
+            <p/>
+         </publicationStmt>
+         <sourceDesc>
+            <p/>
+         </sourceDesc>
+      </fileDesc>
+   </teiHeader>
+   <facsimile>
+      <svg:svg>
+            <svg:g id="textgrid-layer-1">
+         <svg:image width="3512" height="2480" xlink:href="textgrid:3r1nz.0"/>
+         <svg:rect x="50.02847380410023%" y="0.4838709677419355%" width="49.829157175398635%" height="100.0%" transform="rotate(0.0, 74.94305239179954%, 50.483870967741936%)" id="shape-1" class="0,–,255#255#255"/>
+         <svg:rect x="0.05694760820045558%" y="0.20161290322580644%" width="51.11047835990888%" height="102.90322580645162%" transform="rotate(0.0, 25.612186788154897%, 51.653225806451616%)" id="shape-2" class="0,–,255#255#255"/>
+         <svg:text id="text-1"/>
+         <svg:text id="text-2"/>
+      </svg:g>
+      </svg:svg>
+   </facsimile>
+   <text>
+      <body>
+         <ab>
+            <tei:linkGrp xml:id="text-image-links-1" type="text-image-links" facs="#textgrid-layer-1">
+               <tei:link targets="#shape-1 textgrid:ahiqar_sample.3#a1"/>
+               <tei:link targets="#text-1 textgrid:ahiqar_sample.3#a1"/>
+               <tei:link targets="#shape-2 textgrid:ahiqar_sample.3#a2"/>
+               <tei:link targets="#text-2 textgrid:ahiqar_sample.3#a2"/>
+            </tei:linkGrp>
+         </ab>
+      </body>
+   </text>
+</TEI>
\ No newline at end of file
diff --git a/exist-app/data/ahiqar_tile_meta.xml b/exist-app/data/ahiqar_tile_meta.xml
new file mode 100644
index 0000000..bd7e7bb
--- /dev/null
+++ b/exist-app/data/ahiqar_tile_meta.xml
@@ -0,0 +1,14 @@
+<MetadataContainerType xmlns="http://textgrid.info/namespaces/metadata/core/2010" xmlns:ns2="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <object>
+        <generic>
+            <provided>
+                <title>Ahiqar TILE Sample</title>
+                <format>text/linkeditorlinkedfile</format>
+            </provided>
+            <generated>
+                <created>2020-11-09T09:03:45.740+01:00</created>
+                <lastModified>2020-11-09T09:07:14.863+01:00</lastModified>
+            </generated>
+        </generic>
+    </object>
+</MetadataContainerType>
\ No newline at end of file
diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index b8e8e62..084da56 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -1,4 +1,7 @@
 xquery version "3.1";
+
+import module namespace functx="http://www.functx.com";
+
 (: the target collection into which the app is deployed :)
 declare variable $target external;
 declare variable $ahikar-base := "/db/apps/ahikar";
@@ -9,18 +12,26 @@ declare function local:move-and-rename($filename as xs:string) as item()* {
     let $target-data-collection := $tg-base || "/data/"
     let $target-meta-collection := $tg-base || "/meta/"
     let $target-agg-collection := $tg-base || "/agg/"
+    let $target-tile-collection := $tg-base || "/tile/"
+    
+    let $file-type := functx:substring-after-last($filename, "_")
+        => substring-before(".xml")
+    
     return
-        if(matches($filename, "meta")) then
-            let $new-filename := substring-before($filename, "_meta") || ".xml"
-            return
-                ( 
-                    xmldb:move($data-file-path, $target-meta-collection, $filename),
-                    xmldb:rename($target-meta-collection, $filename, $new-filename)
-                )
-        else
-            if (matches($filename, "sample")) then
+        
+        switch ($file-type)
+            case "meta" return
+                let $new-filename := substring-before($filename, "_meta") || ".xml"
+                return
+                    ( 
+                        xmldb:move($data-file-path, $target-meta-collection, $filename),
+                        xmldb:rename($target-meta-collection, $filename, $new-filename)
+                    )
+            case "tile" return 
+                xmldb:move($data-file-path, $target-tile-collection, $filename)
+            case "sample" return
                 xmldb:move($data-file-path, $target-data-collection, $filename)
-            else
+            default return
                 xmldb:move($data-file-path, $target-agg-collection, $filename)
 };
 
@@ -71,7 +82,9 @@ return (sm:chown($path, "admin"), sm:chmod($path, "rwsrwxr-x"))),
         "ahiqar_images.xml",
         "ahiqar_images_meta.xml",
         "ahiqar_collection.xml",
-        "ahiqar_collection_meta.xml")
+        "ahiqar_collection_meta.xml",
+        "ahiqar_tile.xml",
+        "ahiqar_tile_meta.xml")
     return
         ( 
             for $file in $files return
-- 
GitLab


From 3f7b8e46f08dea11a22ac18a116050896ce1c6f3 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 10 Nov 2020 15:00:09 +0100
Subject: [PATCH 023/155] refactor: generic function for metadata retrieval

---
 exist-app/modules/commons.xqm             | 5 +++++
 exist-app/modules/tapi-collection.xqm     | 9 ++-------
 exist-app/modules/tapi-manifest.xqm       | 7 +------
 exist-app/tests/commons-tests.xqm         | 7 +++++++
 exist-app/tests/tapi-collection-tests.xqm | 8 +-------
 exist-app/tests/tapi-manifest-tests.xqm   | 7 -------
 6 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/exist-app/modules/commons.xqm b/exist-app/modules/commons.xqm
index 77c61d9..f0fc0dd 100644
--- a/exist-app/modules/commons.xqm
+++ b/exist-app/modules/commons.xqm
@@ -43,4 +43,9 @@ as document-node() {
 declare function commons:open-tei-xml($tei-xml-uri as xs:string)
 as document-node() {
     doc($commons:data || $tei-xml-uri || ".xml")
+};
+
+declare function commons:get-metadata-file($uri as xs:string)
+as document-node() {
+    doc($commons:meta || $uri || ".xml")
 };
\ No newline at end of file
diff --git a/exist-app/modules/tapi-collection.xqm b/exist-app/modules/tapi-collection.xqm
index b4ee2e8..8ca2ebe 100644
--- a/exist-app/modules/tapi-collection.xqm
+++ b/exist-app/modules/tapi-collection.xqm
@@ -30,7 +30,7 @@ import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons"
 declare function tapi-coll:get-json($collection-uri as xs:string,
     $server as xs:string)
 as item()+ {
-    let $metadata-file := tapi-coll:get-metadata-file($collection-uri)
+    let $metadata-file := commons:get-metadata-file($collection-uri)
     let $format-type := tapi-coll:get-format-type($metadata-file)
     let $sequence := tapi-coll:make-sequence($collection-uri, $server)
     let $annotationCollection-uri := tapi-coll:make-annotationCollection-uri($server, $collection-uri)
@@ -95,11 +95,6 @@ as xs:string {
     replace($uri, "textgrid:", "")
 };
 
-declare function tapi-coll:get-metadata-file($uri as xs:string)
-as document-node() {
-    doc($commons:meta || $uri || ".xml")
-};
-
 declare function tapi-coll:make-sequence($collection-uri as xs:string,
     $server as xs:string)
 as element(sequence)+ {
@@ -107,7 +102,7 @@ as element(sequence)+ {
     let $allowed-manifest-uris := tapi-coll:get-allowed-manifest-uris($aggregation/*)
     
     for $manifest-uri in $allowed-manifest-uris return
-        let $manifest-metadata :=  tapi-coll:get-metadata-file($manifest-uri)
+        let $manifest-metadata :=  commons:get-metadata-file($manifest-uri)
         let $id := tapi-coll:make-id($server, $collection-uri, $manifest-uri)
         let $type := tapi-coll:make-format-type($manifest-metadata)
         return
diff --git a/exist-app/modules/tapi-manifest.xqm b/exist-app/modules/tapi-manifest.xqm
index d6d5c8f..ea5fe07 100644
--- a/exist-app/modules/tapi-manifest.xqm
+++ b/exist-app/modules/tapi-manifest.xqm
@@ -59,16 +59,11 @@ as xs:string+ {
 
 declare function tapi-mani:get-manifest-title($manifest-uri as xs:string)
 as xs:string {
-    let $metadata-file := tapi-mani:get-metadata-file($manifest-uri)
+    let $metadata-file := commons:get-metadata-file($manifest-uri)
     return
         $metadata-file//tgmd:title/string()
 };
 
-declare function tapi-mani:get-metadata-file($manifest-uri as xs:string)
-as document-node() {
-    doc($commons:tg-collection || "/meta/" || $manifest-uri || ".xml")
-};
-
 
 declare function tapi-mani:make-editors($manifest-uri as xs:string)
 as element(x-editor)+ {
diff --git a/exist-app/tests/commons-tests.xqm b/exist-app/tests/commons-tests.xqm
index 1fd6839..46972cb 100644
--- a/exist-app/tests/commons-tests.xqm
+++ b/exist-app/tests/commons-tests.xqm
@@ -38,3 +38,10 @@ function ct:open-tei-xml($tei-xml-uri as xs:string)
 as document-node() {
     commons:open-tei-xml($tei-xml-uri)
 };
+
+declare
+    %test:args("ahiqar_sample") %test:assertXPath("$result//*[local-name(.) = 'title'] = 'Beispieldatei zum Testen'")
+function ct:get-metadata-file($uri as xs:string)
+as document-node() {
+    commons:get-metadata-file($uri)
+};
\ No newline at end of file
diff --git a/exist-app/tests/tapi-collection-tests.xqm b/exist-app/tests/tapi-collection-tests.xqm
index 82b61b2..7eea9c2 100644
--- a/exist-app/tests/tapi-collection-tests.xqm
+++ b/exist-app/tests/tapi-collection-tests.xqm
@@ -157,12 +157,6 @@ function tct:get-allowed-manifest-uris-sample-input() {
         tapi-coll:get-allowed-manifest-uris($collection-metadata)
 };
 
-declare
-    %test:args("ahiqar_collection") %test:assertXPath("$result[self::document-node()]")
-function tct:get-metadata-file($uri as xs:string) {
-    tapi-coll:get-metadata-file($uri)
-};
-
 
 declare
     %test:args("textgrid:1234") %test:assertEquals("1234")
@@ -182,7 +176,7 @@ function tct:make-format-type($tgmd-format as xs:string) {
 declare
     %test:assertEquals("manifest")
 function tct:get-format-type() {
-    let $metadata := tapi-coll:get-metadata-file("ahiqar_agg")
+    let $metadata := commons:get-metadata-file("ahiqar_agg")
     return
         tapi-coll:get-format-type($metadata)
 };
diff --git a/exist-app/tests/tapi-manifest-tests.xqm b/exist-app/tests/tapi-manifest-tests.xqm
index d2d828b..8a615da 100644
--- a/exist-app/tests/tapi-manifest-tests.xqm
+++ b/exist-app/tests/tapi-manifest-tests.xqm
@@ -129,13 +129,6 @@ function tmt:_test-teardown() {
     xmldb:remove($commons:data, $tmt:tei3-uri)
 };
 
-declare
-    %test:args("ahiqar_agg") %test:assertXPath("$result//* = 'textgrid:ahiqar_agg.0'")
-function tmt:get-metadata-file($manifest-uri) {
-    tapi-mani:get-metadata-file($manifest-uri)
-};
-
-
 declare
     %test:args("ahiqar_collection", "ahiqar_agg") %test:assertXPath("$result//id[matches(., '/api/textapi/ahikar/ahiqar_collection/ahiqar_agg-82a/latest/item.json')]")
 function tmt:make-sequences($collection-uri as xs:string,
-- 
GitLab


From 0f8ae8f54d1b21dca7a43ccd64cb226688c5d6d6 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 10 Nov 2020 15:00:31 +0100
Subject: [PATCH 024/155] feat: add basic structure for image module

---
 exist-app/modules/tapi-img.xqm     | 38 ++++++++++++++++++++++++++++++
 exist-app/tests/tapi-img-tests.xqm | 24 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 exist-app/modules/tapi-img.xqm
 create mode 100644 exist-app/tests/tapi-img-tests.xqm

diff --git a/exist-app/modules/tapi-img.xqm b/exist-app/modules/tapi-img.xqm
new file mode 100644
index 0000000..f4cd84c
--- /dev/null
+++ b/exist-app/modules/tapi-img.xqm
@@ -0,0 +1,38 @@
+xquery version "3.1";
+
+(: 
+ : 
+ :)
+
+module namespace tapi-img="http://ahikar.sub.uni-goettingen.de/ns/tapi/images";
+
+declare namespace tei="http://www.tei-c.org/ns/1.0";
+declare namespace ore="http://www.openarchives.org/ore/terms/";
+declare namespace rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
+
+import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
+import module namespace functx="http://www.functx.com";
+
+declare function tapi-img:has-manifest-tile($manifest-uri as xs:string)
+as xs:boolean {
+    let $manifest-doc := commons:get-aggregation($manifest-uri)
+    let $aggregated := $manifest-doc//ore:aggregates
+    let $is-tile :=
+        for $element in $aggregated return
+            let $stripped-uri := substring-after($element/@rdf:resource/string(), "textgrid:")
+            return
+                tapi-img:is-resource-tile($stripped-uri)
+    return
+        if (functx:is-value-in-sequence(true(), $is-tile)) then
+            true()
+        else
+            false()
+};
+
+declare function tapi-img:is-resource-tile($uri)
+as xs:boolean {
+    let $metadata := commons:get-metadata-file($uri)
+    return
+        $metadata//tgmd:format = "text/linkeditorlinkedfile"
+};
\ No newline at end of file
diff --git a/exist-app/tests/tapi-img-tests.xqm b/exist-app/tests/tapi-img-tests.xqm
new file mode 100644
index 0000000..4110882
--- /dev/null
+++ b/exist-app/tests/tapi-img-tests.xqm
@@ -0,0 +1,24 @@
+xquery version "3.1";
+
+module namespace timgt="http://ahikar.sub.uni-goettingen.de/ns/tapi/images/tests";
+
+declare namespace http = "http://expath.org/ns/http-client";
+declare namespace tei="http://www.tei-c.org/ns/1.0";
+
+import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
+import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
+import module namespace tapi-img="http://ahikar.sub.uni-goettingen.de/ns/tapi/images" at "../modules/tapi-img.xqm";
+
+declare
+    %test:args("ahiqar_agg")
+    %test:assertTrue
+function timgt:has-manifest-tile($manifest-uri) as xs:boolean {
+    tapi-img:has-manifest-tile($manifest-uri)
+};
+
+declare
+    %test:args("ahiqar_sample") %test:assertFalse
+    %test:args("ahiqar_tile") %test:assertTrue
+function timgt:is-resource-tile($uri) as xs:boolean {
+    tapi-img:is-resource-tile($uri)
+};
\ No newline at end of file
-- 
GitLab


From 0e431396f7f7be8ef993640c1b7ed36f3d374739 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 10 Nov 2020 15:34:19 +0100
Subject: [PATCH 025/155] feat: add global variable for TILE

---
 exist-app/modules/commons.xqm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/exist-app/modules/commons.xqm b/exist-app/modules/commons.xqm
index f0fc0dd..87b8898 100644
--- a/exist-app/modules/commons.xqm
+++ b/exist-app/modules/commons.xqm
@@ -11,6 +11,7 @@ declare variable $commons:tg-collection := "/db/apps/sade/textgrid";
 declare variable $commons:data := $commons:tg-collection || "/data/";
 declare variable $commons:meta := $commons:tg-collection || "/meta/";
 declare variable $commons:agg := $commons:tg-collection || "/agg/";
+declare variable $commons:tile := $commons:tg-collection || "/tile/";
 declare variable $commons:appHome := "/db/apps/ahikar";
 
 declare variable $commons:responseHeader200 :=
-- 
GitLab


From dbd071e02204982d1f2a9043fb6a148e218dff89 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 10 Nov 2020 15:34:55 +0100
Subject: [PATCH 026/155] feat: add functions for returnig a TILE object

---
 exist-app/modules/tapi-img.xqm     | 55 +++++++++++++++++++++---------
 exist-app/tests/tapi-img-tests.xqm | 30 +++++++++++++---
 2 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/exist-app/modules/tapi-img.xqm b/exist-app/modules/tapi-img.xqm
index f4cd84c..6bd5919 100644
--- a/exist-app/modules/tapi-img.xqm
+++ b/exist-app/modules/tapi-img.xqm
@@ -1,7 +1,11 @@
 xquery version "3.1";
 
 (: 
- : 
+ : This module handles the correct selection of an image path for an item.
+ :
+ : The Ahiqar project has both single- and double-sided images. While the former works
+ : without further ado, the latter needs a different URL in order to display to proper
+ : image section.
  :)
 
 module namespace tapi-img="http://ahikar.sub.uni-goettingen.de/ns/tapi/images";
@@ -12,27 +16,46 @@ declare namespace rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
-import module namespace functx="http://www.functx.com";
 
 declare function tapi-img:has-manifest-tile($manifest-uri as xs:string)
 as xs:boolean {
-    let $manifest-doc := commons:get-aggregation($manifest-uri)
-    let $aggregated := $manifest-doc//ore:aggregates
-    let $is-tile :=
-        for $element in $aggregated return
-            let $stripped-uri := substring-after($element/@rdf:resource/string(), "textgrid:")
-            return
-                tapi-img:is-resource-tile($stripped-uri)
-    return
-        if (functx:is-value-in-sequence(true(), $is-tile)) then
-            true()
-        else
-            false()
+    exists(tapi-img:get-tile-uris($manifest-uri))
 };
 
-declare function tapi-img:is-resource-tile($uri)
+declare function tapi-img:is-resource-tile($uri as xs:string)
 as xs:boolean {
     let $metadata := commons:get-metadata-file($uri)
     return
         $metadata//tgmd:format = "text/linkeditorlinkedfile"
-};
\ No newline at end of file
+};
+
+declare function tapi-img:is-tile-available($uri as xs:string)
+as xs:boolean {
+    exists(doc($commons:tile || $uri || ".xml"))
+};
+
+declare function tapi-img:get-tile-uris($manifest-uri as xs:string)
+as xs:string* {
+    let $manifest-doc := commons:get-aggregation($manifest-uri)
+    let $aggregated := $manifest-doc//ore:aggregates
+    for $element in $aggregated return
+        let $stripped-uri := substring-after($element/@rdf:resource/string(), "textgrid:")
+        return
+            if (tapi-img:is-resource-tile($stripped-uri)) then
+                $stripped-uri
+            else
+                ()
+};
+
+declare function tapi-img:get-tile($uri as xs:string)
+as document-node()? {
+    if (tapi-img:is-tile-available($uri)) then
+        tapi-img:open-tile($uri)
+    else
+        ()
+};
+
+declare function tapi-img:open-tile($uri as xs:string)
+as document-node() {
+    doc($commons:tile || $uri || ".xml")
+};
diff --git a/exist-app/tests/tapi-img-tests.xqm b/exist-app/tests/tapi-img-tests.xqm
index 4110882..6cd621a 100644
--- a/exist-app/tests/tapi-img-tests.xqm
+++ b/exist-app/tests/tapi-img-tests.xqm
@@ -1,24 +1,44 @@
 xquery version "3.1";
 
-module namespace timgt="http://ahikar.sub.uni-goettingen.de/ns/tapi/images/tests";
+module namespace t="http://ahikar.sub.uni-goettingen.de/ns/tapi/images/tests";
 
 declare namespace http = "http://expath.org/ns/http-client";
-declare namespace tei="http://www.tei-c.org/ns/1.0";
 
-import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace tapi-img="http://ahikar.sub.uni-goettingen.de/ns/tapi/images" at "../modules/tapi-img.xqm";
 
 declare
     %test:args("ahiqar_agg")
     %test:assertTrue
-function timgt:has-manifest-tile($manifest-uri) as xs:boolean {
+function t:has-manifest-tile($manifest-uri) as xs:boolean {
     tapi-img:has-manifest-tile($manifest-uri)
 };
 
 declare
     %test:args("ahiqar_sample") %test:assertFalse
     %test:args("ahiqar_tile") %test:assertTrue
-function timgt:is-resource-tile($uri) as xs:boolean {
+function t:is-resource-tile($uri) as xs:boolean {
     tapi-img:is-resource-tile($uri)
+};
+
+declare
+    %test:args("ahiqar_tile") %test:assertTrue
+    %test:args("ahiqar_tile-non-existent") %test:assertFalse
+function t:is-tile-available($tile-uri as xs:string)
+as xs:boolean {
+    tapi-img:is-tile-available($tile-uri)
+};
+
+declare
+    %test:args("ahiqar_agg") %test:assertEquals("ahiqar_tile")
+function t:get-tile-uris($manifest-uri as xs:string)
+as xs:string {
+    tapi-img:get-tile-uris($manifest-uri)
+};
+
+declare
+    %test:args("ahiqar_tile") %test:assertXPath("$result//*[local-name(.) = 'rect']")
+function t:get-tile($uri as xs:string)
+as document-node() {
+    tapi-img:get-tile($uri)
 };
\ No newline at end of file
-- 
GitLab


From dc97c5d3c7b6186cd393c648253d0b750a98e947 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 10 Nov 2020 15:35:19 +0100
Subject: [PATCH 027/155] chore: remove unused modules, add return value

---
 exist-app/tests/tapi-item-tests.xqm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index 21c8e71..40cf359 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -3,10 +3,7 @@ xquery version "3.1";
 module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests";
 
 declare namespace http = "http://expath.org/ns/http-client";
-declare namespace tei="http://www.tei-c.org/ns/1.0";
 
-import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
-import module namespace map="http://www.w3.org/2005/xpath-functions/map";
 import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace tapi-item="http://ahikar.sub.uni-goettingen.de/ns/tapi/item" at "../modules/tapi-item.xqm";
@@ -70,6 +67,7 @@ declare
     %test:args("ahiqar_agg") %test:assertXPath("count($result) = 5")
     %test:args("ahiqar_agg") %test:assertXPath("$result[local-name(.) = ('lang', 'langAlt')]")
     %test:args("ahiqar_agg") %test:assertXPath("count($result[local-name(.) = 'lang']) = 2")
-function titemt:make-language-elements($manifest-uri as xs:string) {
+function titemt:make-language-elements($manifest-uri as xs:string)
+as element()+ {
     tapi-item:make-language-elements($manifest-uri)
 };
-- 
GitLab


From 3fb8517b1453edc55735efc45650974f9c377dcf Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 10 Nov 2020 15:40:26 +0100
Subject: [PATCH 028/155] tests: update tests according to new edition content

---
 exist-app/tests/tapi-txt-tests.xqm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/exist-app/tests/tapi-txt-tests.xqm b/exist-app/tests/tapi-txt-tests.xqm
index eb82e33..c330807 100644
--- a/exist-app/tests/tapi-txt-tests.xqm
+++ b/exist-app/tests/tapi-txt-tests.xqm
@@ -466,8 +466,12 @@ function ttt:get-tei-xml-uri-from-edition($document as xs:string) {
 
 
 declare
-    %test:args("ahiqar_agg") %test:assertEquals("ahiqar_sample")
-function ttt:get-edition-aggregates-without-uri-namespace($document as xs:string) {
+    %test:args("ahiqar_agg") 
+    %test:assertXPath("count($result) = 2")
+    %test:assertXPath("$result = 'ahiqar_sample'")
+    %test:assertXPath("$result = 'ahiqar_tile'")
+function ttt:get-edition-aggregates-without-uri-namespace($document as xs:string)
+as xs:string+ {
     tapi-txt:get-edition-aggregates-without-uri-namespace($document)
 };
 
-- 
GitLab


From 9c1477b715061e37743f0c9c172fed964f0ac7e7 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 10 Nov 2020 15:41:27 +0100
Subject: [PATCH 029/155] tests: update test triggers

---
 exist-app/modules/testtrigger.xqm | 4 +++-
 exist-app/tests/tests-runner.xq   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 0624295..d3dd5aa 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -23,6 +23,7 @@ import module namespace thtmlt="http://ahikar.sub.uni-goettingen.de/ns/tapi/html
 import module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" at "../tests/tapi-item-tests.xqm";
 import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" at "../tests/tapi-manifest-tests.xqm";
 import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "../tests/tapi-tests.xqm";
+import module namespace timgt="http://ahikar.sub.uni-goettingen.de/ns/tapi/images/tests" at "../tests/tapi-img-tests.xqm";
 
 (:~
  : Triggers the tests for the Ahikar backend. Called by the CI.
@@ -52,7 +53,8 @@ as item()? {
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests"))
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/images/tests"))
         )
     
     let $fileSeparator := util:system-property("file.separator")
diff --git a/exist-app/tests/tests-runner.xq b/exist-app/tests/tests-runner.xq
index 60ab7ac..161c58e 100644
--- a/exist-app/tests/tests-runner.xq
+++ b/exist-app/tests/tests-runner.xq
@@ -15,6 +15,7 @@ import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifes
 import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "tapi-tests.xqm";
 import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "tei2html-tests.xqm";
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "tei2html-textprocessing-tests.xqm";
+import module namespace timgt="http://ahikar.sub.uni-goettingen.de/ns/tapi/images/tests" at "tapi-img-tests.xqm";
 
 
 let $test-results :=
@@ -27,7 +28,8 @@ let $test-results :=
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests"))
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/images/tests"))
     )
 
 for $result in $test-results return
-- 
GitLab


From fc82e165a7a9e26ad4692cbf66dbaf064cc3432c Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 11 Nov 2020 09:26:14 +0100
Subject: [PATCH 030/155] feat: consider TILE for endpoint creation

---
 exist-app/data/ahiqar_sample.xml    |  4 +-
 exist-app/modules/tapi-img.xqm      | 81 ++++++++++++++++++++++++++---
 exist-app/modules/tapi-item.xqm     | 26 ++++++---
 exist-app/tests/tapi-img-tests.xqm  | 68 +++++++++++++++++++++---
 exist-app/tests/tapi-item-tests.xqm | 61 ++++++++++++++++++----
 5 files changed, 205 insertions(+), 35 deletions(-)

diff --git a/exist-app/data/ahiqar_sample.xml b/exist-app/data/ahiqar_sample.xml
index 83e35c3..1431506 100644
--- a/exist-app/data/ahiqar_sample.xml
+++ b/exist-app/data/ahiqar_sample.xml
@@ -351,7 +351,7 @@ Ideas (or parts of ideas) that have bee marked with LC refer to the Leiden Conve
 
          <text xml:lang="karshuni" type="transcription">
             <body>
-               <pb facs="textgrid:3r1nz" n="82a"/>
+               <pb facs="textgrid:3r1nz" n="82a" xml:id="a1"/>
                <cb/>
                <!-- ### supplied text is text that modern editors have inserted.
                it is usually marked with square brackets (LC).
@@ -440,7 +440,7 @@ Ideas (or parts of ideas) that have bee marked with LC refer to the Leiden Conve
 
                <!-- random facsimile for invented empty page -->
                <pb facs="textgrid:3r1p0" n="82b"/>
-               <pb facs="textgrid:3r1nz" n="83a"/>
+               <pb facs="textgrid:3r1nz" n="83a" xml:id="a2"/>
                <ab>ܐܠܟܠܐܝܩ ܟܠܗܐ.<quote>
                             <seg xml:lang="ara">كان كذلك ، لذا لم يكن كذلك.</seg>
                         </quote>
diff --git a/exist-app/modules/tapi-img.xqm b/exist-app/modules/tapi-img.xqm
index 6bd5919..be5c807 100644
--- a/exist-app/modules/tapi-img.xqm
+++ b/exist-app/modules/tapi-img.xqm
@@ -13,13 +13,15 @@ module namespace tapi-img="http://ahikar.sub.uni-goettingen.de/ns/tapi/images";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace ore="http://www.openarchives.org/ore/terms/";
 declare namespace rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+declare namespace svg="http://www.w3.org/2000/svg";
 declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
+import module namespace functx="http://www.functx.com";
 
 declare function tapi-img:has-manifest-tile($manifest-uri as xs:string)
 as xs:boolean {
-    exists(tapi-img:get-tile-uris($manifest-uri))
+    exists(tapi-img:get-tile-uri($manifest-uri))
 };
 
 declare function tapi-img:is-resource-tile($uri as xs:string)
@@ -34,28 +36,91 @@ as xs:boolean {
     exists(doc($commons:tile || $uri || ".xml"))
 };
 
-declare function tapi-img:get-tile-uris($manifest-uri as xs:string)
+declare function tapi-img:get-tile-uri($manifest-uri as xs:string)
 as xs:string* {
     let $manifest-doc := commons:get-aggregation($manifest-uri)
     let $aggregated := $manifest-doc//ore:aggregates
     for $element in $aggregated return
         let $stripped-uri := substring-after($element/@rdf:resource/string(), "textgrid:")
         return
-            if (tapi-img:is-resource-tile($stripped-uri)) then
+            if (tapi-img:is-resource-tile($stripped-uri)
+            and tapi-img:is-tile-available($stripped-uri)) then
                 $stripped-uri
             else
                 ()
 };
 
-declare function tapi-img:get-tile($uri as xs:string)
+declare function tapi-img:get-tile($manifest-uri as xs:string)
 as document-node()? {
-    if (tapi-img:is-tile-available($uri)) then
-        tapi-img:open-tile($uri)
-    else
-        ()
+    tapi-img:get-tile-uri($manifest-uri)
+    => tapi-img:open-tile()
 };
 
 declare function tapi-img:open-tile($uri as xs:string)
 as document-node() {
     doc($commons:tile || $uri || ".xml")
 };
+
+declare function tapi-img:get-facsimile-uri-for-page($manifest-uri as xs:string,
+    $page as xs:string)
+as xs:string {
+    let $tei-xml := commons:get-tei-xml-for-manifest($manifest-uri)
+    return
+        $tei-xml//tei:pb[@n = $page]/@facs
+        => substring-after("textgrid:")
+};
+
+declare function tapi-img:get-xml-id-for-page($manifest-uri as xs:string,
+    $page as xs:string)
+as xs:string {
+    let $tei-xml := commons:get-tei-xml-for-manifest($manifest-uri)
+    return
+        $tei-xml//tei:pb[@n = $page]/@xml:id/string()
+};
+
+declare function tapi-img:get-shape-id($manifest-uri as xs:string,
+    $page-id as xs:string)
+as xs:string {
+    let $tile := tapi-img:get-tile($manifest-uri)
+    let $link-element := $tile//tei:link[ends-with(@targets, $page-id)]
+    return
+        (:@targets has the following form:
+        #shape-1 textgrid:ahiqar_sample.3#a1 :)
+        tokenize($link-element/@targets, " ")[1]
+        => replace("#", "")
+};
+
+declare function tapi-img:get-svg-rect($tile as document-node(),
+    $shape-id as xs:string)
+as element(svg:rect) {
+    $tile//svg:rect[@id = $shape-id]
+};
+
+declare function tapi-img:get-svg-section-dimensions-as-string($svg as element(svg:rect))
+as xs:string {
+    let $x-offset := local:truncate($svg/@x)
+    let $y-offset := local:truncate($svg/@y)
+    let $width := local:truncate($svg/@width)
+    let $height := local:truncate($svg/@height)
+    return
+        string-join(($x-offset, $y-offset, $width, $height), ",")
+};
+
+declare function local:truncate($number-as-string as attribute())
+as xs:string {
+    if (matches($number-as-string, "\.")) then
+        functx:get-matches($number-as-string, "\d+\.\d{1}")
+    else
+        $number-as-string/string()
+};
+
+declare function tapi-img:get-relevant-image-section($manifest-uri as xs:string,
+    $page-uri as xs:string)
+as xs:string {
+    let $page-id := tapi-img:get-xml-id-for-page($manifest-uri, $page-uri)
+    let $shape-id := tapi-img:get-shape-id($manifest-uri, $page-id)
+    let $tile := tapi-img:get-tile($manifest-uri)
+    let $svg := tapi-img:get-svg-rect($tile, $shape-id)
+    return
+        tapi-img:get-svg-section-dimensions-as-string($svg)
+};
diff --git a/exist-app/modules/tapi-item.xqm b/exist-app/modules/tapi-item.xqm
index cd1a52c..7869d51 100644
--- a/exist-app/modules/tapi-item.xqm
+++ b/exist-app/modules/tapi-item.xqm
@@ -11,6 +11,7 @@ module namespace tapi-item="http://ahikar.sub.uni-goettingen.de/ns/tapi/item";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
+import module namespace tapi-img="http://ahikar.sub.uni-goettingen.de/ns/tapi/images" at "tapi-img.xqm";
 
 
 declare function tapi-item:get-json($collection-uri as xs:string,
@@ -35,7 +36,7 @@ as element(object) {
 };
 
 
-declare function tapi-item:make-title($manifest-uri)
+declare function tapi-item:make-title($manifest-uri as xs:string)
 as xs:string {
     let $tei-xml := commons:get-tei-xml-for-manifest($manifest-uri)
     return
@@ -72,17 +73,26 @@ declare function tapi-item:make-facsimile-id($manifest-uri as xs:string,
     $page as xs:string,
     $server as xs:string)
 as xs:string {
-    let $image-uri := tapi-item:get-facsimile-uri-for-page($manifest-uri, $page)
+    let $facsimile-uri := tapi-img:get-facsimile-uri-for-page($manifest-uri, $page)
     return
-        $server || "/api/images/" || $image-uri
+        if (tapi-img:has-manifest-tile($manifest-uri)) then
+            tapi-item:make-url-for-double-page-image($facsimile-uri, $manifest-uri, $page, $server)
+        else
+            tapi-item:make-url-for-single-page-image($facsimile-uri, $server)
 };
 
+declare function tapi-item:make-url-for-single-page-image($facsimile-uri as xs:string,
+    $server as xs:string)
+as xs:string {
+    $server || "/api/images/" || $facsimile-uri
+};
 
-declare function tapi-item:get-facsimile-uri-for-page($manifest-uri as xs:string,
-    $page as xs:string)
+declare function tapi-item:make-url-for-double-page-image($facsimile-uri as xs:string,
+    $manifest-uri as xs:string,
+    $page as xs:string,
+    $server as xs:string)
 as xs:string {
-    let $tei-xml := commons:get-tei-xml-for-manifest($manifest-uri)
+    let $image-section := tapi-img:get-relevant-image-section($manifest-uri, $page)
     return
-        $tei-xml//tei:pb[@n = $page]/@facs
-        => substring-after("textgrid:")
+        $server || "/api/images/" || $facsimile-uri || "/" || $image-section
 };
diff --git a/exist-app/tests/tapi-img-tests.xqm b/exist-app/tests/tapi-img-tests.xqm
index 6cd621a..afab48c 100644
--- a/exist-app/tests/tapi-img-tests.xqm
+++ b/exist-app/tests/tapi-img-tests.xqm
@@ -31,14 +31,70 @@ as xs:boolean {
 
 declare
     %test:args("ahiqar_agg") %test:assertEquals("ahiqar_tile")
-function t:get-tile-uris($manifest-uri as xs:string)
+function t:get-tile-uri($manifest-uri as xs:string)
 as xs:string {
-    tapi-img:get-tile-uris($manifest-uri)
+    tapi-img:get-tile-uri($manifest-uri)
 };
 
+
 declare
-    %test:args("ahiqar_tile") %test:assertXPath("$result//*[local-name(.) = 'rect']")
-function t:get-tile($uri as xs:string)
+    %test:args("ahiqar_agg") %test:assertXPath("$result//*[local-name(.) = 'rect']")
+function t:get-tile($manifest-uri as xs:string)
 as document-node() {
-    tapi-img:get-tile($uri)
-};
\ No newline at end of file
+    tapi-img:get-tile($manifest-uri)
+};
+
+
+declare
+    %test:args("ahiqar_agg", "82a") %test:assertEquals("3r1nz")
+    %test:args("ahiqar_agg_wo_tile", "82b") %test:assertEquals("3r1p0")
+function t:get-facsimile-uri-for-page($manifest-uri as xs:string,
+    $page as xs:string)
+as xs:string {
+    tapi-img:get-facsimile-uri-for-page($manifest-uri, $page)
+};
+
+declare
+    %test:args("ahiqar_agg", "82a") %test:assertEquals("a1")
+function t:get-xml-id-for-page($manifest-uri as xs:string,
+    $page as xs:string)
+as xs:string {
+    tapi-img:get-xml-id-for-page($manifest-uri, $page)
+};
+
+declare
+    %test:args("ahiqar_agg", "a1") %test:assertEquals("shape-1")
+function t:get-shape-id($manifest-uri as xs:string,
+    $page-id as xs:string)
+as xs:string {
+    tapi-img:get-shape-id($manifest-uri, $page-id)
+};
+
+declare
+    %test:args("shape-1") %test:assertXPath("$result[@id = 'shape-1']")
+function t:get-svg-rect($shape-id as xs:string)
+as element() {
+    let $tile := tapi-img:get-tile("ahiqar_agg")
+    return
+        tapi-img:get-svg-rect($tile, $shape-id)
+};
+
+declare
+    %test:assertEquals("50.0,0.4,49.8,100.0")
+function t:get-svg-section-dimensions-as-string()
+as xs:string {
+    let $manifest-uri := "ahiqar_agg"
+    let $shape-id := "shape-1"
+    let $tile := tapi-img:get-tile($manifest-uri)
+    let $svg := tapi-img:get-svg-rect($tile, $shape-id)
+    return
+        tapi-img:get-svg-section-dimensions-as-string($svg)
+};
+
+declare
+    %test:args("ahiqar_agg", "82a") %test:assertEquals("50.0,0.4,49.8,100.0")
+function t:get-relevant-image-section($manifest-uri as xs:string,
+    $page-uri as xs:string)
+as xs:string {
+    tapi-img:get-relevant-image-section($manifest-uri, $page-uri)
+};
diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index 40cf359..1041259 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -4,17 +4,16 @@ module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests"
 
 declare namespace http = "http://expath.org/ns/http-client";
 
+import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
 import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace tapi-item="http://ahikar.sub.uni-goettingen.de/ns/tapi/item" at "../modules/tapi-item.xqm";
 
 
 declare
-    %test:args("ahiqar_agg", "82a") %test:assertEquals("3r1nz")
-function titemt:get-facsimile-uri-for-page($manifest-uri as xs:string,
-    $page as xs:string)
-as xs:string {
-    tapi-item:get-facsimile-uri-for-page($manifest-uri, $page)
+    %test:setUp
+function titemt:_test-setup() {
+    local:create-and-store-test-data()
 };
 
 declare
@@ -25,7 +24,8 @@ as xs:string {
 };
 
 declare
-    %test:args("ahiqar_agg", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz")
+    %test:args("ahiqar_agg", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz/50.0,0.4,49.8,100.0")
+    %test:args("ahiqar_agg_wo_tile", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz")
 function titemt:make-facsimile-id($manifest-uri as xs:string,
     $page as xs:string)
 as xs:string {
@@ -42,7 +42,7 @@ as xs:string {
 
 
 declare
-    %test:args("ahiqar_collection", "ahiqar_agg", "82a")
+    %test:args("ahiqar_collection", "ahiqar_agg_wo_tile", "82a")
     (: checks if the correct file has been opened :)
     %test:assertXPath("$result//*[local-name(.) = 'title'] = 'The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh,
                king of Assyria and Nineveh' ")
@@ -51,10 +51,10 @@ declare
     %test:assertXPath("$result//*[local-name(.) = 'langAlt'] = 'karshuni' ")
     %test:assertXPath("$result//*[local-name(.) = 'x-langString'][matches(., 'Classical Syriac')]")
     (: checks if underlying pages are identified :)
-    %test:assertXPath("$result//*[local-name(.) = 'content'] = 'http://0.0.0.0:8080/exist/restxq/api/content/ahiqar_sample-82a.html' ")
+    %test:assertXPath("$result//*[local-name(.) = 'content'] = 'http://0.0.0.0:8080/exist/restxq/api/content/ahiqar_sample_2-82a.html' ")
     (: checks if images connected to underlying pages are identified :)
     %test:assertXPath("$result//*[local-name(.) = 'id'] = 'http://0.0.0.0:8080/exist/restxq/api/images/3r1nz' ")
-    %test:assertXPath("$result//*[local-name(.) = 'annotationCollection'] = 'http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/ahiqar_collection/ahiqar_agg-82a/annotationCollection.json' ")
+    %test:assertXPath("$result//*[local-name(.) = 'annotationCollection'] = 'http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/ahiqar_collection/ahiqar_agg_wo_tile-82a/annotationCollection.json' ")
 function titemt:get-json($collection as xs:string,
     $document as xs:string,
     $page as xs:string) 
@@ -67,7 +67,46 @@ declare
     %test:args("ahiqar_agg") %test:assertXPath("count($result) = 5")
     %test:args("ahiqar_agg") %test:assertXPath("$result[local-name(.) = ('lang', 'langAlt')]")
     %test:args("ahiqar_agg") %test:assertXPath("count($result[local-name(.) = 'lang']) = 2")
-function titemt:make-language-elements($manifest-uri as xs:string)
-as element()+ {
+function titemt:make-language-elements($manifest-uri as xs:string) {
     tapi-item:make-language-elements($manifest-uri)
 };
+
+
+declare
+    %test:args("3r1nz") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz")
+function titemt:make-url-for-single-page-image($facsimile-uri as xs:string)
+as xs:string {
+    tapi-item:make-url-for-single-page-image($facsimile-uri, $tc:server)
+};
+
+declare
+    %test:args("3r1nz", "ahiqar_agg", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz/50.0,0.4,49.8,100.0")
+function titemt:make-url-for-double-page-image($facsimile-uri as xs:string,
+    $manifest-uri as xs:string,
+    $page as xs:string)
+as xs:string {
+    tapi-item:make-url-for-double-page-image($facsimile-uri, $manifest-uri, $page, $tc:server)
+};
+
+
+declare function local:create-and-store-test-data()
+as xs:string+ {
+    let $agg-wo-tile :=
+        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:ahiqar_agg.0">
+                <ore:aggregates rdf:resource="textgrid:ahiqar_sample_2"/>
+            </rdf:Description>
+        </rdf:RDF>
+    let $agg-wo-tile-meta := commons:get-metadata-file("ahiqar_agg")
+        
+    let $sample-xml-2 := commons:open-tei-xml("ahiqar_sample")
+    let $sample-xml-2-meta := commons:get-metadata-file("ahiqar_sample")
+        
+    return
+        (
+            xmldb:store("/db/apps/sade/textgrid/agg", "ahiqar_agg_wo_tile.xml", $agg-wo-tile),
+            xmldb:store("/db/apps/sade/textgrid/data", "ahiqar_sample_2.xml", $sample-xml-2),
+            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_sample_2.xml", $sample-xml-2-meta),
+            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_agg_wo_tile.xml", $agg-wo-tile-meta)
+        )
+};
-- 
GitLab


From da88e3da9f01779e35707a59e2d264f1f962bdd7 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 11 Nov 2020 09:52:19 +0100
Subject: [PATCH 031/155] feat: introduce new endpoint for double pages

---
 exist-app/modules/tapi.xqm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/exist-app/modules/tapi.xqm b/exist-app/modules/tapi.xqm
index e9805bb..f1227ce 100644
--- a/exist-app/modules/tapi.xqm
+++ b/exist-app/modules/tapi.xqm
@@ -198,6 +198,37 @@ as item()+ {
     )[2] => xs:base64Binary()
 };
 
+(:~
+ : Returns an image section belonging to a given URI as defined by the $image-section
+ : paramater.
+ : This function doesn't work locally unless you have all necessary login
+ : information filled in at ahikar.env.
+ : 
+ : Since the images of the Ahikar project aren't publicly available, this
+ : function cannot be tested by unit tests.
+ :
+ : @param $uri The unprefixed TextGrid URI of an image, e.g. '3r1pr'
+ : @param $image-section Indicated the image section in percentage to be retured as defined by
+ : the IIIF Image API
+ : @return The image as binary
+ :)
+declare
+    %rest:GET
+    %rest:HEAD
+    %rest:path("/images/{$uri}/{$image-section}")
+    %rest:produces("image/jpeg")
+    %output:method("binary")
+function tapi:endpoint-image($uri as xs:string,
+    $image-section as xs:string)
+as item()+ {
+    $commons:responseHeader200,
+    hc:send-request( 
+        <hc:request method="GET"
+        href="https://textgridlab.org/1.0/digilib/rest/IIIF/textgrid:{$uri};sid={environment-variable('TEXTGRID.SESSION')}/pct:{$image-section}/,2000/0/native.jpg"
+        />
+    )[2] => xs:base64Binary()
+};
+
 
 (:~
  : Endpoint to deliver a single plain text version of the
-- 
GitLab


From b7745bca11d0ef4131a8c3195101e4d2ab089436 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 11 Nov 2020 14:01:22 +0100
Subject: [PATCH 032/155] feat: re-establish old files for collation

---
 exist-app/modules/collate.xqm     | 231 ++++++++++++++++
 exist-app/modules/testtrigger.xqm |   2 +
 exist-app/tests/collate-tests.xqm | 424 ++++++++++++++++++++++++++++++
 exist-app/tests/tests-runner.xq   |   4 +-
 4 files changed, 660 insertions(+), 1 deletion(-)
 create mode 100644 exist-app/modules/collate.xqm
 create mode 100644 exist-app/tests/collate-tests.xqm

diff --git a/exist-app/modules/collate.xqm b/exist-app/modules/collate.xqm
new file mode 100644
index 0000000..635010e
--- /dev/null
+++ b/exist-app/modules/collate.xqm
@@ -0,0 +1,231 @@
+xquery version "3.1";
+
+(:~
+ : This module extracts the chunks marked as important for the collation from
+ : the TEI files and uses them as an input for the plain text creation. These
+ : serve as a basis for the collation with CollateX in the project's CI/CD
+ : pipelines.
+ :)
+
+module namespace coll="http://ahikar.sub.uni-goettingen.de/ns/collate";
+
+declare namespace tei="http://www.tei-c.org/ns/1.0";
+declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
+
+import module namespace fragment="https://wiki.tei-c.org/index.php?title=Milestone-chunk.xquery" at "fragment.xqm";
+
+declare variable $coll:textgrid := "/db/apps/sade/textgrid";
+declare variable $coll:data := $coll:textgrid || "/data";
+declare variable $coll:txt := $coll:textgrid || "/txt";
+
+
+declare function coll:main() 
+as xs:string+ {
+    coll:create-txt-collection-if-not-available(),
+    for $text in coll:get-transcriptions-and-transliterations() return
+        let $relevant-text := coll:get-relevant-text($text)
+        let $file-name := coll:make-file-name($text)
+        return
+            xmldb:store($coll:txt, $file-name, $relevant-text, "text/plain")
+};
+
+declare function coll:create-txt-collection-if-not-available()
+as xs:string? {
+    if (xmldb:collection-available($coll:txt)) then
+        ()
+    else
+        xmldb:create-collection($coll:textgrid, "txt")
+};
+
+declare function coll:get-transcriptions-and-transliterations()
+as element(tei:text)+ {
+    collection($coll:data)//tei:text[@type = ("transcription", "transliteration")]
+        [coll:has-text-milestone(.)]
+};
+
+declare function coll:has-text-milestone($text as element(tei:text))
+as xs:boolean {
+    if ($text//tei:milestone) then
+        true()
+    else
+        false()
+};
+
+(:~
+ : An example for the file name is 
+ : syriac-Brit_Lib_Add_7200-3r131-transcription.txt
+ :)
+declare function coll:make-file-name($text as element(tei:text))
+as xs:string {
+    let $lang-prefix := coll:get-language-prefix($text)
+    let $title-from-metadata := coll:create-metadata-title-for-file-name($text)
+    let $uri-plus-text-type := coll:make-file-name-suffix($text)
+    return
+        $lang-prefix || "-" || $title-from-metadata || "-" || $uri-plus-text-type
+};
+
+declare function coll:get-language-prefix($text as element(tei:text))
+as xs:string? {
+    switch ($text/@type)
+        case "transcription" return
+            switch ($text/@xml:lang)
+                case "karshuni" return "karshuni"
+                case "ara" return "arabic"
+                case "syc" return "syriac"
+                default return ()
+                
+        (: although the transliteration may have another language than
+        the transcription, the latter remains decisive for the prefix :)
+        case "transliteration" return
+            switch ($text/root()//tei:text[@type = "transcription"]/@xml:lang)
+                case "ara" return "arabic"
+                case "karshuni" return "karshuni"
+                case "syc" return "syriac"
+                default return ()
+        default return ()
+};
+
+declare function coll:create-metadata-title-for-file-name($text as element(tei:text))
+as xs:string {
+    let $base-uri := coll:get-base-uri($text)
+    let $metadata := doc($base-uri => replace("/data/", "/meta/"))
+    return
+        $metadata//tgmd:title
+        => replace("[^a-zA-Z0-9]", "_")
+        => replace("[_]+", "_")
+};
+
+declare function coll:get-base-uri($text as element(tei:text))
+as xs:string{
+    base-uri($text)
+};
+
+declare function coll:make-file-name-suffix($text as element(tei:text))
+as xs:string {
+    let $base-uri := coll:get-base-uri($text)
+    let $file-name := coll:get-file-name($base-uri)
+    let $type := $text/@type
+    return
+        $file-name || "-" || $type || ".txt"
+};
+
+declare function coll:get-file-name($base-uri as xs:string)
+as xs:string {
+    tokenize($base-uri, "/")[last()]
+    => substring-before(".xml")
+};
+
+declare function coll:get-relevant-text($text as element(tei:text))
+as xs:string {
+    let $milestones := coll:get-milestones-in-text($text)
+    let $chunks := coll:get-chunks($milestones)
+    let $texts := coll:get-relevant-text-from-chunks($chunks)
+    return
+        string-join($texts, " ")
+};
+
+declare function coll:get-milestones-in-text($text as element(tei:text))
+as element(tei:milestone)+ {
+    $text//tei:milestone
+};
+
+declare function coll:get-chunks($milestones as element(tei:milestone)+)
+as element(tei:TEI)+ {
+    for $milestone in $milestones return
+        coll:get-chunk($milestone)
+};
+
+declare function coll:get-chunk($milestone as element(tei:milestone))
+as element(tei:TEI) {
+    let $root := $milestone/root()
+    let $end-of-chunk := coll:get-end-of-chunk($milestone)
+    return
+        fragment:get-fragment-from-doc(
+            $root,
+            $milestone,
+            $end-of-chunk,
+            false(),
+            true(),
+            (""))
+};
+
+declare function coll:get-end-of-chunk($milestone as element(tei:milestone))
+as node() {
+    if (coll:has-following-milestone($milestone)) then
+        coll:get-next-milestone($milestone)
+    else
+        $milestone/ancestor::tei:text[1]/tei:body/child::*[last()]
+};
+
+declare function coll:has-following-milestone($milestone as element(tei:milestone))
+as xs:boolean {
+    if ($milestone/following::tei:milestone[ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]]) then
+        true()
+    else
+        false()
+};
+
+declare function coll:get-next-milestone($milestone as element(tei:milestone))
+as element(tei:milestone)? {
+    $milestone/following::tei:milestone[ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]][1]
+};
+
+declare function coll:get-relevant-text-from-chunks($chunks as element(tei:TEI)+)
+as xs:string {
+    let $texts :=
+        for $chunk in $chunks return
+            coll:make-plain-text-from-chunk($chunk)
+    return
+        string-join($texts, " ")
+        => normalize-space()
+};
+
+declare function coll:make-plain-text-from-chunk($chunk as element(tei:TEI))
+as xs:string {
+    let $texts := coll:get-relevant-text-nodes($chunk)
+    let $prepared-texts :=
+        for $text in $texts return
+            coll:prepare-plain-text-creation($text)
+    return
+        coll:format-and-normalize-string($prepared-texts)
+};
+
+(:~ 
+ : The following nodes shouldn't be considered for the plain text creation:
+ : * sic (wrong text)
+ : * surplus (surplus text)
+ : * supplied (supplied by modern editors)
+ : * colophons
+ : * glyphs
+ : * unclear (text unclear)
+ : * catchwords (they simply serve to bind the books correctly and reduplicate text)
+ : * note (they have been added later by another scribe)
+ :)
+declare function coll:get-relevant-text-nodes($chunk as element(tei:TEI))
+as text()+ {
+    (($chunk//text()
+        [not(parent::tei:sic)]
+        [not(parent::tei:surplus)])
+        [not(parent::tei:supplied)])
+        [not(parent::tei:*[@type = "colophon"])]
+        [not(parent::tei:g)]
+        [not(parent::tei:unclear)]
+        [not(parent::tei:catchwords)]
+        [not(parent::tei:note)]
+};
+
+declare function coll:prepare-plain-text-creation($text as text())
+as xs:string {
+    if ($text/preceding-sibling::*[1][self::tei:lb[@break = "no"]]) then
+        "@" || $text
+    else
+        $text
+};
+
+declare function coll:format-and-normalize-string($strings as xs:string+)
+as xs:string {
+    string-join($strings, " ")
+    => replace(" @", "")
+    => replace("[\p{P}\n+]", "")
+    => replace("\s+", " ")
+};
diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 0624295..10e7ee7 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -14,6 +14,7 @@ module namespace testtrigger="http://ahikar.sub.uni-goettingen.de/ns/testtrigger
 import module namespace rest="http://exquery.org/ns/restxq";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 
+import module namespace coll-tests="http://ahikar.sub.uni-goettingen.de/ns/coll-tests" at "../tests/collate-tests.xqm";
 import module namespace ct="http://ahikar.sub.uni-goettingen.de/ns/commons-tests" at "../tests/commons-tests.xqm";
 import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "../tests/tei2html-tests.xqm";
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "../tests/tei2html-textprocessing-tests.xqm";
@@ -45,6 +46,7 @@ as item()? {
     let $tests := 
         (
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/coll-tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
diff --git a/exist-app/tests/collate-tests.xqm b/exist-app/tests/collate-tests.xqm
new file mode 100644
index 0000000..b29b316
--- /dev/null
+++ b/exist-app/tests/collate-tests.xqm
@@ -0,0 +1,424 @@
+xquery version "3.1";
+
+module namespace coll-tests="http://ahikar.sub.uni-goettingen.de/ns/coll-tests";
+
+declare namespace tei="http://www.tei-c.org/ns/1.0";
+
+import module namespace coll="http://ahikar.sub.uni-goettingen.de/ns/collate" at "../modules/collate.xqm";
+import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
+
+declare variable $coll-tests:sample-file := local:open-file("ahiqar_sample");
+declare variable $coll-tests:sample-transliteration := $coll-tests:sample-file//tei:text[@type = "transliteration"];
+declare variable $coll-tests:sample-transcription := $coll-tests:sample-file//tei:text[@type = "transcription"];
+
+declare
+    %test:args("ahiqar_sample") %test:assertExists
+    %test:args("1234") %test:assertError("org.exist.xquery.XPathException")
+function coll-tests:open-file($uri as xs:string) as document-node() {
+    local:open-file($uri)
+};
+
+declare
+    %test:assertXPath("count($result) = 2")
+function coll-tests:get-milestones-in-text()
+as element(tei:milestone)* {
+    coll:get-milestones-in-text($coll-tests:sample-transliteration)
+};
+
+declare
+    %test:assertExists
+function coll-tests:get-next-milestone-succecss()
+as element(tei:milestone)? {
+    let $milestone := $coll-tests:sample-transliteration//tei:milestone[1]
+    return
+        coll:get-next-milestone($milestone)
+};
+
+declare
+    %test:assertEmpty
+function coll-tests:get-next-milestone-fail()
+as element(tei:milestone)? {
+    let $milestone := $coll-tests:sample-transliteration//tei:milestone[2]
+    return
+        coll:get-next-milestone($milestone)
+};
+
+declare
+    %test:assertExists
+    %test:assertXPath("$result//*[local-name(.) = 'ab']")
+function coll-tests:get-chunk()
+as element(tei:TEI) {
+    let $milestone := $coll-tests:sample-transliteration//tei:milestone[1]
+    return
+        coll:get-chunk($milestone)
+};
+
+
+declare
+     %test:assertEquals("some text that should be used display some text without a space")
+function coll-tests:make-plain-text-from-chunk()
+as xs:string {
+    let $chunk := 
+        <TEI xmlns="http://www.tei-c.org/ns/1.0">
+            <text>
+                <group>
+                    <text xml:lang="ara">
+                        <body xml:lang="ara">
+                            <ab>some <persName>text</persName>          that should 
+                            
+                            
+                            
+                            be used</ab>
+                            <ab>
+                                <choice>
+                                    <sic>no display</sic>
+                                    <corr>display</corr>
+                                </choice>
+                                <surplus>no display</surplus>
+                                <supplied>no display</supplied>
+                                <ab type="colophon">no display</ab>
+                                <g>[</g>
+                                <unclear>no display</unclear>
+                                <catchwords>no displayno display</catchwords>
+                                <note>no display</note>
+                            </ab>
+                            <ab>some text with</ab>
+                            <ab><lb break="no"/>out a space</ab>
+                        </body>
+                    </text>
+                </group>
+            </text>
+        </TEI>
+    return
+        coll:make-plain-text-from-chunk($chunk)
+};
+
+
+declare
+    %test:assertEquals("some text with")
+function coll-tests:prepare-plain-text-creation-no-lb()
+as xs:string {
+    let $chunk :=
+        <TEI xmlns="http://www.tei-c.org/ns/1.0">
+            <text>
+                <group>
+                    <text xml:lang="ara">
+                        <body xml:lang="ara">
+                            <ab>some text with</ab>
+                        </body>
+                    </text>
+                </group>
+            </text>
+        </TEI>
+    let $text := $chunk//tei:ab/text()
+    return
+        coll:prepare-plain-text-creation($text)
+};
+
+declare
+    %test:assertEquals("@out a space.")
+function coll-tests:prepare-plain-text-creation-lb()
+as xs:string {
+    let $chunk :=
+        <TEI xmlns="http://www.tei-c.org/ns/1.0">
+            <text>
+                <group>
+                    <text xml:lang="ara">
+                        <body xml:lang="ara">
+                            <ab><lb break="no"/>out a space.</ab>
+                        </body>
+                    </text>
+                </group>
+            </text>
+        </TEI>
+    let $text := $chunk//tei:ab/text()
+    return
+        coll:prepare-plain-text-creation($text)
+};
+
+declare
+    %test:assertXPath("count($result) = 6")
+function coll-tests:get-relevant-text-nodes()
+as text()+ {
+    let $chunk := 
+        <TEI xmlns="http://www.tei-c.org/ns/1.0">
+            <text>
+                <group>
+                    <text xml:lang="ara">
+                        <body xml:lang="ara">
+                            <ab>some <persName>text</persName>          that should 
+                            
+                            
+                            
+                            be used</ab>
+                            <ab>
+                                <choice>
+                                    <sic>no display</sic>
+                                    <corr>display</corr>
+                                </choice>
+                                <surplus>no display</surplus>
+                                <supplied>no display</supplied>
+                                <ab type="colophon">no display</ab>
+                                <g>[</g>
+                                <unclear>no display</unclear>
+                                <catchwords>no displayno display</catchwords>
+                                <note>no display</note>
+                            </ab>
+                            <ab>some text with</ab>
+                            <ab><lb break="no"/>out a space</ab>
+                        </body>
+                    </text>
+                </group>
+            </text>
+        </TEI>
+    return
+        coll:get-relevant-text-nodes($chunk)
+};
+
+declare
+    %test:args(" @test") %test:assertEquals("test")
+    %test:args("interpunction.") %test:assertEquals("interpunction")
+    %test:args("white               spaces") %test:assertEquals("white spaces")
+    %test:args("some
+    
+    new lines") %test:assertEquals("some new lines")
+function coll-tests:format-and-normalize-string($string as xs:string)
+as xs:string {
+    coll:format-and-normalize-string($string)
+};
+
+declare
+    %test:assertTrue
+function coll-tests:create-txt-collection-if-not-available() {
+    let $create-collection := coll:create-txt-collection-if-not-available()
+    return
+        if (xmldb:collection-available("/db/apps/sade/textgrid/txt/")) then
+            true()
+        else
+            false()
+};
+
+declare
+    %test:assertXPath("count($result) gt 0")
+function coll-tests:get-transcriptions-and-transliterations()
+as element(tei:text)+ {
+    coll:get-transcriptions-and-transliterations()
+};
+
+declare
+    %test:args("ara") %test:assertEquals("arabic")
+    %test:args("karshuni") %test:assertEquals("karshuni")
+    %test:args("syc") %test:assertEquals("syriac")
+function coll-tests:get-language-prefix-transcriptions($lang as xs:string)
+as xs:string {
+    let $text := 
+        <text xmlns="http://www.tei-c.org/ns/1.0" type="transcription"
+        xml:lang="{$lang}" />
+    return
+        coll:get-language-prefix($text)
+};
+
+declare
+    %test:args("ara", "ara") %test:assertEquals("arabic")
+    %test:args("ara", "karshuni") %test:assertEquals("karshuni")
+    %test:args("ara", "syc") %test:assertEquals("syriac")
+    %test:args("karshuni", "ara") %test:assertEquals("arabic")
+    %test:args("karshuni", "karshuni") %test:assertEquals("karshuni")
+    %test:args("karshuni", "syc") %test:assertEquals("syriac")
+    %test:args("syriac", "ara") %test:assertEquals("arabic")
+    %test:args("syriac", "karshuni") %test:assertEquals("karshuni")
+    %test:args("syriac", "syc") %test:assertEquals("syriac")
+function coll-tests:get-language-prefix-transliteration($lang-transliteration as xs:string,
+$lang-transcription as xs:string)
+as xs:string {
+    let $TEI :=
+        <TEI xmlns="http://www.tei-c.org/ns/1.0">
+            <text type="transliteration" xml:lang="{$lang-transliteration}" />
+            <text type="transcription" xml:lang="{$lang-transcription}" />
+        </TEI>
+    let $text := $TEI/tei:text[1]
+    return
+        coll:get-language-prefix($text)
+};
+
+declare
+    %test:assertEquals("/db/apps/sade/textgrid/data/ahiqar_sample.xml")
+function coll-tests:get-base-uri()
+as xs:string {
+    coll:get-base-uri($coll-tests:sample-transcription)
+};
+
+declare
+    %test:assertEquals("Beispieldatei_zum_Testen")
+function coll-tests:create-metadata-title-for-file-name()
+as xs:string {
+    coll:create-metadata-title-for-file-name($coll-tests:sample-transcription)
+};
+
+declare
+    %test:assertEquals("karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription.txt")
+function coll-tests:make-file-name()
+as xs:string {
+    coll:make-file-name($coll-tests:sample-transcription)
+};
+
+declare
+    %test:assertEquals("ahiqar_sample-transcription.txt")
+function coll-tests:make-file-name-suffix()
+as xs:string {
+    coll:make-file-name-suffix($coll-tests:sample-transcription)
+};
+
+declare
+    %test:args("/db/apps/sade/textgrid/data/ahiqar_sample.xml") %test:assertEquals("ahiqar_sample")
+function coll-tests:get-file-name($base-uri as xs:string)
+as xs:string {
+    coll:get-file-name($base-uri)
+};
+
+declare
+    %test:assertEquals("text of the first narrative section some sayings")
+function coll-tests:get-relevant-text() {
+    let $TEI :=
+        <TEI xmlns="http://www.tei-c.org/ns/1.0">
+            <text>
+                <body>
+                    <ab>some ignored text</ab>
+                    <milestone unit="first_narrative_section"/>
+                    <ab>text of the first narrative section</ab>
+                    <milestone unit="saying"/>
+                    <ab>some sayings</ab>
+                </body>
+            </text>
+        </TEI>
+    return
+        coll:get-relevant-text($TEI/tei:text)
+};
+
+declare
+    %test:assertXPath("count($result) = 2")
+function coll-tests:get-chunks() {
+    let $milestones := coll:get-milestones-in-text($coll-tests:sample-transliteration)
+    return
+        coll:get-chunks($milestones)
+};
+
+declare
+    %test:assertXPath("$result[self::*[local-name(.) = 'milestone']]")
+function coll-tests:get-end-of-chunk-milestone() {
+    let $milestone := coll:get-milestones-in-text($coll-tests:sample-transliteration)[1]
+    return
+        coll:get-end-of-chunk($milestone)
+};
+
+declare
+    %test:assertXPath("$result[self::*[local-name(.) = 'ab']]")
+function coll-tests:get-end-of-chunk-end-of-text() {
+    let $milestone := coll:get-milestones-in-text($coll-tests:sample-transliteration)[2]
+    return
+        coll:get-end-of-chunk($milestone)
+};
+
+
+declare
+    %test:assertXPath("$result[self::*/string() = 'the end text']")
+function coll-tests:get-end-of-chunk-end-of-text-2() {
+    let $TEI :=
+        <TEI xmlns="http://www.tei-c.org/ns/1.0">
+            <text>
+                <group>
+                    <text type="transliteration">
+                        <body>
+                            <ab>some text<tei:milestone unit="sayings"/> more text</ab>
+                            <ab>the end text</ab>
+                        </body>
+                    </text>
+                    <text type="transcription">
+                        <body>
+                            <ab>some text2<tei:milestone unit="sayings"/> more text</ab>
+                            <ab>another end text</ab>
+                        </body>
+                    </text>
+                </group>
+            </text>
+        </TEI>
+    let $milestone := $TEI//tei:text[@type = "transliteration"]//tei:milestone
+    
+    return
+        coll:get-end-of-chunk($milestone)
+};
+
+declare
+    %test:assertTrue
+function coll-tests:has-following-milestone-true()
+as xs:boolean {
+    let $milestone := coll:get-milestones-in-text($coll-tests:sample-transliteration)[1]
+    return
+        coll:has-following-milestone($milestone)
+};
+
+declare
+    %test:assertFalse
+function coll-tests:has-following-milestone-false()
+as xs:boolean {
+    let $milestone := coll:get-milestones-in-text($coll-tests:sample-transliteration)[2]
+    return
+        coll:has-following-milestone($milestone)
+};
+
+declare
+    %test:assertEquals("chunk1 relevant text more relevant text chunk2 relevant text more relevant text")
+function coll-tests:get-relevant-text-from-chunks()
+as xs:string {
+    let $chunk1 :=
+        <TEI xmlns="http://www.tei-c.org/ns/1.0">
+            <text>
+                <body>
+                    <ab>chunk1: relevant text</ab>
+                    <ab>more relevant text <unclear>irrelevant</unclear>.</ab>
+                </body>
+            </text>
+        </TEI>
+    let $chunk2 :=
+        <TEI xmlns="http://www.tei-c.org/ns/1.0">
+            <text>
+                <body>
+                    <ab>chunk2: relevant text</ab>
+                    <ab>more relevant text <surplus>irrelevant</surplus></ab>
+                </body>
+            </text>
+        </TEI>
+    return
+        coll:get-relevant-text-from-chunks(($chunk1, $chunk2))
+};
+
+declare
+    %test:assertTrue
+function coll-tests:has-text-milestone-succcess() {
+    let $text:= 
+        <text xmlns="http://www.tei-c.org/ns/1.0">
+            <body>
+                <ab>some text <milestone unit="parables"/></ab>
+            </body>
+        </text>
+    return
+        coll:has-text-milestone($text)
+};
+
+declare
+    %test:assertFalse
+function coll-tests:has-text-milestones-fail() {
+    let $text:= 
+        <text xmlns="http://www.tei-c.org/ns/1.0">
+            <body>
+                <ab>some text</ab>
+            </body>
+        </text>
+    return
+        coll:has-text-milestone($text)  
+};
+
+declare function local:open-file($uri as xs:string)
+as document-node() {
+    doc($coll:data || "/" || $uri || ".xml")
+};
diff --git a/exist-app/tests/tests-runner.xq b/exist-app/tests/tests-runner.xq
index 60ab7ac..3e8d253 100644
--- a/exist-app/tests/tests-runner.xq
+++ b/exist-app/tests/tests-runner.xq
@@ -15,6 +15,7 @@ import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifes
 import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "tapi-tests.xqm";
 import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "tei2html-tests.xqm";
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "tei2html-textprocessing-tests.xqm";
+import module namespace coll-tests="http://ahikar.sub.uni-goettingen.de/ns/coll-tests" at "collate-tests.xqm";
 
 
 let $test-results :=
@@ -27,7 +28,8 @@ let $test-results :=
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests"))
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/coll-tests"))
     )
 
 for $result in $test-results return
-- 
GitLab


From 9b2a3e8387bc4b568390b6138cb46d9067998729 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 11 Nov 2020 14:45:25 +0100
Subject: [PATCH 033/155] feat: add file names according to milestone type

---
 exist-app/modules/collate.xqm     | 37 +++++++++++++++++--------------
 exist-app/tests/collate-tests.xqm |  8 +++----
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/exist-app/modules/collate.xqm b/exist-app/modules/collate.xqm
index 635010e..b0dbd2a 100644
--- a/exist-app/modules/collate.xqm
+++ b/exist-app/modules/collate.xqm
@@ -17,16 +17,23 @@ import module namespace fragment="https://wiki.tei-c.org/index.php?title=Milesto
 declare variable $coll:textgrid := "/db/apps/sade/textgrid";
 declare variable $coll:data := $coll:textgrid || "/data";
 declare variable $coll:txt := $coll:textgrid || "/txt";
+declare variable $coll:milestone-types :=
+    ("first_narrative_section",
+    "sayings",
+    "second_narrative_section",
+    "parables",
+    "third_narrative_section");
 
 
 declare function coll:main() 
 as xs:string+ {
     coll:create-txt-collection-if-not-available(),
     for $text in coll:get-transcriptions-and-transliterations() return
-        let $relevant-text := coll:get-relevant-text($text)
-        let $file-name := coll:make-file-name($text)
-        return
-            xmldb:store($coll:txt, $file-name, $relevant-text, "text/plain")
+        for $milestone-type in $coll:milestone-types return
+            let $relevant-text := coll:get-relevant-text($text)
+            let $file-name := coll:make-file-name($text, $milestone-type)
+            return
+                xmldb:store($coll:txt, $file-name, $relevant-text, "text/plain")
 };
 
 declare function coll:create-txt-collection-if-not-available()
@@ -45,23 +52,21 @@ as element(tei:text)+ {
 
 declare function coll:has-text-milestone($text as element(tei:text))
 as xs:boolean {
-    if ($text//tei:milestone) then
-        true()
-    else
-        false()
+    exists($text//tei:milestone)
 };
 
 (:~
  : An example for the file name is 
  : syriac-Brit_Lib_Add_7200-3r131-transcription.txt
  :)
-declare function coll:make-file-name($text as element(tei:text))
+declare function coll:make-file-name($text as element(tei:text),
+    $milestone-type as xs:string)
 as xs:string {
     let $lang-prefix := coll:get-language-prefix($text)
     let $title-from-metadata := coll:create-metadata-title-for-file-name($text)
-    let $uri-plus-text-type := coll:make-file-name-suffix($text)
+    let $uri-text-type-milestone := coll:make-file-name-suffix($text, $milestone-type)
     return
-        $lang-prefix || "-" || $title-from-metadata || "-" || $uri-plus-text-type
+        $lang-prefix || "-" || $title-from-metadata || "-" || $uri-text-type-milestone
 };
 
 declare function coll:get-language-prefix($text as element(tei:text))
@@ -100,13 +105,14 @@ as xs:string{
     base-uri($text)
 };
 
-declare function coll:make-file-name-suffix($text as element(tei:text))
+declare function coll:make-file-name-suffix($text as element(tei:text),
+    $milestone-type as xs:string)
 as xs:string {
     let $base-uri := coll:get-base-uri($text)
     let $file-name := coll:get-file-name($base-uri)
     let $type := $text/@type
     return
-        $file-name || "-" || $type || ".txt"
+        $file-name || "-" || $type || "-" || $milestone-type || ".txt"
 };
 
 declare function coll:get-file-name($base-uri as xs:string)
@@ -159,10 +165,7 @@ as node() {
 
 declare function coll:has-following-milestone($milestone as element(tei:milestone))
 as xs:boolean {
-    if ($milestone/following::tei:milestone[ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]]) then
-        true()
-    else
-        false()
+    exists($milestone/following::tei:milestone[ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]])
 };
 
 declare function coll:get-next-milestone($milestone as element(tei:milestone))
diff --git a/exist-app/tests/collate-tests.xqm b/exist-app/tests/collate-tests.xqm
index b29b316..ed38111 100644
--- a/exist-app/tests/collate-tests.xqm
+++ b/exist-app/tests/collate-tests.xqm
@@ -256,17 +256,17 @@ as xs:string {
 };
 
 declare
-    %test:assertEquals("karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription.txt")
+    %test:assertEquals("karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-first_narrative_section.txt")
 function coll-tests:make-file-name()
 as xs:string {
-    coll:make-file-name($coll-tests:sample-transcription)
+    coll:make-file-name($coll-tests:sample-transcription, "first_narrative_section")
 };
 
 declare
-    %test:assertEquals("ahiqar_sample-transcription.txt")
+    %test:assertEquals("ahiqar_sample-transcription-first_narrative_section.txt")
 function coll-tests:make-file-name-suffix()
 as xs:string {
-    coll:make-file-name-suffix($coll-tests:sample-transcription)
+    coll:make-file-name-suffix($coll-tests:sample-transcription, "first_narrative_section")
 };
 
 declare
-- 
GitLab


From 32954ba8fbe8192d804f211a619a9c9458c89cc3 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 11 Nov 2020 15:02:01 +0100
Subject: [PATCH 034/155] feat: only consider milestones that exist

---
 exist-app/modules/collate.xqm     | 7 ++++++-
 exist-app/tests/collate-tests.xqm | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/exist-app/modules/collate.xqm b/exist-app/modules/collate.xqm
index b0dbd2a..1e6fdfe 100644
--- a/exist-app/modules/collate.xqm
+++ b/exist-app/modules/collate.xqm
@@ -29,13 +29,18 @@ declare function coll:main()
 as xs:string+ {
     coll:create-txt-collection-if-not-available(),
     for $text in coll:get-transcriptions-and-transliterations() return
-        for $milestone-type in $coll:milestone-types return
+        for $milestone-type in coll:get-milestone-types-per-text($text) return
             let $relevant-text := coll:get-relevant-text($text)
             let $file-name := coll:make-file-name($text, $milestone-type)
             return
                 xmldb:store($coll:txt, $file-name, $relevant-text, "text/plain")
 };
 
+declare function coll:get-milestone-types-per-text($text as element(tei:text))
+as xs:string+ {
+    $text//tei:milestone/@unit[./string() = $coll:milestone-types]/string()
+};
+
 declare function coll:create-txt-collection-if-not-available()
 as xs:string? {
     if (xmldb:collection-available($coll:txt)) then
diff --git a/exist-app/tests/collate-tests.xqm b/exist-app/tests/collate-tests.xqm
index ed38111..956755b 100644
--- a/exist-app/tests/collate-tests.xqm
+++ b/exist-app/tests/collate-tests.xqm
@@ -418,6 +418,15 @@ function coll-tests:has-text-milestones-fail() {
         coll:has-text-milestone($text)  
 };
 
+
+declare
+    %test:assertXPath("$result = 'first_narrative_section'")
+    %test:assertXPath("$result = 'second_narrative_section'")
+function coll-tests:get-milestone-types-per-text()
+as xs:string+ {
+    coll:get-milestone-types-per-text($coll-tests:sample-transliteration)
+};
+
 declare function local:open-file($uri as xs:string)
 as document-node() {
     doc($coll:data || "/" || $uri || ".xml")
-- 
GitLab


From 6a0a8befce297e49e64993ba642a2fa237d76948 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 11 Nov 2020 15:23:22 +0100
Subject: [PATCH 035/155] feat: save text of milestone chunks in separate files

---
 exist-app/modules/collate.xqm     | 29 +++++++++----------------
 exist-app/tests/collate-tests.xqm | 36 ++++++++++---------------------
 2 files changed, 21 insertions(+), 44 deletions(-)

diff --git a/exist-app/modules/collate.xqm b/exist-app/modules/collate.xqm
index 1e6fdfe..7bb520d 100644
--- a/exist-app/modules/collate.xqm
+++ b/exist-app/modules/collate.xqm
@@ -30,7 +30,7 @@ as xs:string+ {
     coll:create-txt-collection-if-not-available(),
     for $text in coll:get-transcriptions-and-transliterations() return
         for $milestone-type in coll:get-milestone-types-per-text($text) return
-            let $relevant-text := coll:get-relevant-text($text)
+            let $relevant-text := coll:get-relevant-text($text, $milestone-type)
             let $file-name := coll:make-file-name($text, $milestone-type)
             return
                 xmldb:store($coll:txt, $file-name, $relevant-text, "text/plain")
@@ -126,29 +126,20 @@ as xs:string {
     => substring-before(".xml")
 };
 
-declare function coll:get-relevant-text($text as element(tei:text))
+declare function coll:get-relevant-text($text as element(tei:text),
+    $milestone-type as xs:string)
 as xs:string {
-    let $milestones := coll:get-milestones-in-text($text)
-    let $chunks := coll:get-chunks($milestones)
-    let $texts := coll:get-relevant-text-from-chunks($chunks)
+    let $chunk := coll:get-chunk($text, $milestone-type)
+    let $bla := console:log($chunk)
     return
-        string-join($texts, " ")
-};
-
-declare function coll:get-milestones-in-text($text as element(tei:text))
-as element(tei:milestone)+ {
-    $text//tei:milestone
+        coll:get-relevant-text-from-chunks($chunk)
 };
 
-declare function coll:get-chunks($milestones as element(tei:milestone)+)
-as element(tei:TEI)+ {
-    for $milestone in $milestones return
-        coll:get-chunk($milestone)
-};
-
-declare function coll:get-chunk($milestone as element(tei:milestone))
+declare function coll:get-chunk($text as element(tei:text),
+    $milestone-type as xs:string)
 as element(tei:TEI) {
-    let $root := $milestone/root()
+    let $root := $text/root()
+    let $milestone := $text//tei:milestone[@unit = $milestone-type]
     let $end-of-chunk := coll:get-end-of-chunk($milestone)
     return
         fragment:get-fragment-from-doc(
diff --git a/exist-app/tests/collate-tests.xqm b/exist-app/tests/collate-tests.xqm
index 956755b..891ceef 100644
--- a/exist-app/tests/collate-tests.xqm
+++ b/exist-app/tests/collate-tests.xqm
@@ -18,13 +18,6 @@ function coll-tests:open-file($uri as xs:string) as document-node() {
     local:open-file($uri)
 };
 
-declare
-    %test:assertXPath("count($result) = 2")
-function coll-tests:get-milestones-in-text()
-as element(tei:milestone)* {
-    coll:get-milestones-in-text($coll-tests:sample-transliteration)
-};
-
 declare
     %test:assertExists
 function coll-tests:get-next-milestone-succecss()
@@ -48,9 +41,9 @@ declare
     %test:assertXPath("$result//*[local-name(.) = 'ab']")
 function coll-tests:get-chunk()
 as element(tei:TEI) {
-    let $milestone := $coll-tests:sample-transliteration//tei:milestone[1]
+    let $milestone-type := "first_narrative_section"
     return
-        coll:get-chunk($milestone)
+        coll:get-chunk($coll-tests:sample-transliteration, $milestone-type)
 };
 
 
@@ -277,8 +270,9 @@ as xs:string {
 };
 
 declare
-    %test:assertEquals("text of the first narrative section some sayings")
-function coll-tests:get-relevant-text() {
+    %test:args("first_narrative_section") %test:assertEquals("text of the first narrative section")
+    %test:args("sayings") %test:assertEquals("some sayings")
+function coll-tests:get-relevant-text($milestone-type as xs:string) {
     let $TEI :=
         <TEI xmlns="http://www.tei-c.org/ns/1.0">
             <text>
@@ -286,27 +280,19 @@ function coll-tests:get-relevant-text() {
                     <ab>some ignored text</ab>
                     <milestone unit="first_narrative_section"/>
                     <ab>text of the first narrative section</ab>
-                    <milestone unit="saying"/>
+                    <milestone unit="sayings"/>
                     <ab>some sayings</ab>
                 </body>
             </text>
         </TEI>
     return
-        coll:get-relevant-text($TEI/tei:text)
-};
-
-declare
-    %test:assertXPath("count($result) = 2")
-function coll-tests:get-chunks() {
-    let $milestones := coll:get-milestones-in-text($coll-tests:sample-transliteration)
-    return
-        coll:get-chunks($milestones)
+        coll:get-relevant-text($TEI/tei:text, $milestone-type)
 };
 
 declare
     %test:assertXPath("$result[self::*[local-name(.) = 'milestone']]")
 function coll-tests:get-end-of-chunk-milestone() {
-    let $milestone := coll:get-milestones-in-text($coll-tests:sample-transliteration)[1]
+    let $milestone := $coll-tests:sample-transliteration//tei:milestone[1]
     return
         coll:get-end-of-chunk($milestone)
 };
@@ -314,7 +300,7 @@ function coll-tests:get-end-of-chunk-milestone() {
 declare
     %test:assertXPath("$result[self::*[local-name(.) = 'ab']]")
 function coll-tests:get-end-of-chunk-end-of-text() {
-    let $milestone := coll:get-milestones-in-text($coll-tests:sample-transliteration)[2]
+    let $milestone := $coll-tests:sample-transliteration//tei:milestone[2]
     return
         coll:get-end-of-chunk($milestone)
 };
@@ -352,7 +338,7 @@ declare
     %test:assertTrue
 function coll-tests:has-following-milestone-true()
 as xs:boolean {
-    let $milestone := coll:get-milestones-in-text($coll-tests:sample-transliteration)[1]
+    let $milestone := $coll-tests:sample-transliteration//tei:milestone[1]
     return
         coll:has-following-milestone($milestone)
 };
@@ -361,7 +347,7 @@ declare
     %test:assertFalse
 function coll-tests:has-following-milestone-false()
 as xs:boolean {
-    let $milestone := coll:get-milestones-in-text($coll-tests:sample-transliteration)[2]
+    let $milestone := $coll-tests:sample-transliteration//tei:milestone[2]
     return
         coll:has-following-milestone($milestone)
 };
-- 
GitLab


From cc49dc4f7304f6650a340209302933af922e33ec Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 11 Nov 2020 15:29:07 +0100
Subject: [PATCH 036/155] fix: remove logging

---
 exist-app/modules/collate.xqm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/exist-app/modules/collate.xqm b/exist-app/modules/collate.xqm
index 7bb520d..35b67eb 100644
--- a/exist-app/modules/collate.xqm
+++ b/exist-app/modules/collate.xqm
@@ -130,7 +130,6 @@ declare function coll:get-relevant-text($text as element(tei:text),
     $milestone-type as xs:string)
 as xs:string {
     let $chunk := coll:get-chunk($text, $milestone-type)
-    let $bla := console:log($chunk)
     return
         coll:get-relevant-text-from-chunks($chunk)
 };
-- 
GitLab


From abcecd575fa7e6c3c9f862bda6318e13e79d68d4 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 08:10:39 +0100
Subject: [PATCH 037/155] fix: ensure files contain text

---
 exist-app/modules/collate.xqm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/exist-app/modules/collate.xqm b/exist-app/modules/collate.xqm
index 35b67eb..29fd73e 100644
--- a/exist-app/modules/collate.xqm
+++ b/exist-app/modules/collate.xqm
@@ -31,9 +31,11 @@ as xs:string+ {
     for $text in coll:get-transcriptions-and-transliterations() return
         for $milestone-type in coll:get-milestone-types-per-text($text) return
             let $relevant-text := coll:get-relevant-text($text, $milestone-type)
-            let $file-name := coll:make-file-name($text, $milestone-type)
             return
-                xmldb:store($coll:txt, $file-name, $relevant-text, "text/plain")
+                if (matches($relevant-text, "\w")) then
+                    xmldb:store($coll:txt, coll:make-file-name($text, $milestone-type), $relevant-text, "text/plain")
+                else
+                    ()
 };
 
 declare function coll:get-milestone-types-per-text($text as element(tei:text))
@@ -57,7 +59,7 @@ as element(tei:text)+ {
 
 declare function coll:has-text-milestone($text as element(tei:text))
 as xs:boolean {
-    exists($text//tei:milestone)
+    exists($text//tei:milestone[@unit = $coll:milestone-types])
 };
 
 (:~
-- 
GitLab


From da6f26d6b944822ec14f4dfb0d260a781e872ccb Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 08:35:08 +0100
Subject: [PATCH 038/155] feat: switch to collation module

---
 exist-app/modules/tapi.xqm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/exist-app/modules/tapi.xqm b/exist-app/modules/tapi.xqm
index e9805bb..c996c91 100644
--- a/exist-app/modules/tapi.xqm
+++ b/exist-app/modules/tapi.xqm
@@ -27,6 +27,7 @@ import module namespace requestr="http://exquery.org/ns/request";
 import module namespace rest="http://exquery.org/ns/restxq";
 import module namespace tei2html="http://ahikar.sub.uni-goettingen.de/ns/tei2html" at "tei2html.xqm";
 import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "tapi-html.xqm";
+import module namespace coll="http://ahikar.sub.uni-goettingen.de/ns/collate" at "collate.xqm";
 
 declare variable $tapi:server :=
     if(requestr:hostname() = "existdb") then
@@ -240,7 +241,7 @@ declare
     %rest:path("/content/ahikar-plain-text.zip")
     %output:method("binary")
 function tapi:endpoint-zip() as item()+ {
-    let $prepare := tapi-txt:main()
+    let $prepare := coll:main()
     return
         $commons:responseHeader200,
         tapi-txt:compress-to-zip()
-- 
GitLab


From d317f8dead7756c42255201303061f5c90378b2b Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 08:53:39 +0100
Subject: [PATCH 039/155] refactor: integrate collation module in tapi-txt

---
 exist-app/modules/tapi-txt.xqm     | 74 +++++++++++++++---------------
 exist-app/modules/tapi.xqm         |  3 +-
 exist-app/modules/testtrigger.xqm  |  4 +-
 exist-app/tests/tapi-txt-tests.xqm | 60 ++++++++++--------------
 exist-app/tests/tests-runner.xq    |  6 +--
 5 files changed, 65 insertions(+), 82 deletions(-)

diff --git a/exist-app/modules/tapi-txt.xqm b/exist-app/modules/tapi-txt.xqm
index 6dd2652..8d0f337 100644
--- a/exist-app/modules/tapi-txt.xqm
+++ b/exist-app/modules/tapi-txt.xqm
@@ -20,16 +20,32 @@ import module namespace fragment="https://wiki.tei-c.org/index.php?title=Milesto
 declare variable $tapi-txt:textgrid := "/db/apps/sade/textgrid";
 declare variable $tapi-txt:data := $tapi-txt:textgrid || "/data";
 declare variable $tapi-txt:txt := $tapi-txt:textgrid || "/txt";
+declare variable $tapi-txt:milestone-types :=
+    ("first_narrative_section",
+    "sayings",
+    "second_narrative_section",
+    "parables",
+    "parables_1",
+    "parables_2",
+    "third_narrative_section");
 
 
 declare function tapi-txt:main() 
 as xs:string+ {
     tapi-txt:create-txt-collection-if-not-available(),
     for $text in tapi-txt:get-transcriptions-and-transliterations() return
-        let $relevant-text := tapi-txt:get-relevant-text($text)
-        let $file-name := tapi-txt:make-file-name($text)
-        return
-            xmldb:store($tapi-txt:txt, $file-name, $relevant-text, "text/plain")
+        for $milestone-type in tapi-txt:get-milestone-types-per-text($text) return
+            let $relevant-text := tapi-txt:get-relevant-text($text, $milestone-type)
+            return
+                if (matches($relevant-text, "\w")) then
+                    xmldb:store($tapi-txt:txt, tapi-txt:make-file-name($text, $milestone-type), $relevant-text, "text/plain")
+                else
+                    ()
+};
+
+declare function tapi-txt:get-milestone-types-per-text($text as element(tei:text))
+as xs:string+ {
+    $text//tei:milestone/@unit[./string() = $tapi-txt:milestone-types]/string()
 };
 
 declare function tapi-txt:create-txt-collection-if-not-available()
@@ -48,23 +64,21 @@ as element(tei:text)+ {
 
 declare function tapi-txt:has-text-milestone($text as element(tei:text))
 as xs:boolean {
-    if ($text//tei:milestone) then
-        true()
-    else
-        false()
+    exists($text//tei:milestone[@unit = $tapi-txt:milestone-types])
 };
 
 (:~
  : An example for the file name is 
  : syriac-Brit_Lib_Add_7200-3r131-transcription.txt
  :)
-declare function tapi-txt:make-file-name($text as element(tei:text))
+declare function tapi-txt:make-file-name($text as element(tei:text),
+    $milestone-type as xs:string)
 as xs:string {
     let $lang-prefix := tapi-txt:get-language-prefix($text)
     let $title-from-metadata := tapi-txt:create-metadata-title-for-file-name($text)
-    let $uri-plus-text-type := tapi-txt:make-file-name-suffix($text)
+    let $uri-text-type-milestone := tapi-txt:make-file-name-suffix($text, $milestone-type)
     return
-        $lang-prefix || "-" || $title-from-metadata || "-" || $uri-plus-text-type
+        $lang-prefix || "-" || $title-from-metadata || "-" || $uri-text-type-milestone
 };
 
 declare function tapi-txt:get-language-prefix($text as element(tei:text))
@@ -103,13 +117,14 @@ as xs:string{
     base-uri($text)
 };
 
-declare function tapi-txt:make-file-name-suffix($text as element(tei:text))
+declare function tapi-txt:make-file-name-suffix($text as element(tei:text),
+    $milestone-type as xs:string)
 as xs:string {
     let $base-uri := tapi-txt:get-base-uri($text)
     let $file-name := tapi-txt:get-file-name($base-uri)
     let $type := $text/@type
     return
-        $file-name || "-" || $type || ".txt"
+        $file-name || "-" || $type || "-" || $milestone-type || ".txt"
 };
 
 declare function tapi-txt:get-file-name($base-uri as xs:string)
@@ -118,29 +133,19 @@ as xs:string {
     => substring-before(".xml")
 };
 
-declare function tapi-txt:get-relevant-text($text as element(tei:text))
+declare function tapi-txt:get-relevant-text($text as element(tei:text),
+    $milestone-type as xs:string)
 as xs:string {
-    let $milestones := tapi-txt:get-milestones-in-text($text)
-    let $chunks := tapi-txt:get-chunks($milestones)
-    let $texts := tapi-txt:get-relevant-text-from-chunks($chunks)
+    let $chunk := tapi-txt:get-chunk($text, $milestone-type)
     return
-        string-join($texts, " ")
+        tapi-txt:get-relevant-text-from-chunks($chunk)
 };
 
-declare function tapi-txt:get-milestones-in-text($text as element(tei:text))
-as element(tei:milestone)+ {
-    $text//tei:milestone
-};
-
-declare function tapi-txt:get-chunks($milestones as element(tei:milestone)+)
-as element(tei:TEI)+ {
-    for $milestone in $milestones return
-        tapi-txt:get-chunk($milestone)
-};
-
-declare function tapi-txt:get-chunk($milestone as element(tei:milestone))
+declare function tapi-txt:get-chunk($text as element(tei:text),
+    $milestone-type as xs:string)
 as element(tei:TEI) {
-    let $root := $milestone/root()
+    let $root := $text/root()
+    let $milestone := $text//tei:milestone[@unit = $milestone-type]
     let $end-of-chunk := tapi-txt:get-end-of-chunk($milestone)
     return
         fragment:get-fragment-from-doc(
@@ -162,10 +167,7 @@ as node() {
 
 declare function tapi-txt:has-following-milestone($milestone as element(tei:milestone))
 as xs:boolean {
-    if ($milestone/following::tei:milestone[ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]]) then
-        true()
-    else
-        false()
+    exists($milestone/following::tei:milestone[ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]])
 };
 
 declare function tapi-txt:get-next-milestone($milestone as element(tei:milestone))
@@ -313,4 +315,4 @@ as element(tei:text) {
 declare function tapi-txt:compress-to-zip()
 as xs:base64Binary* {
     compression:zip(xs:anyURI($commons:tg-collection || "/txt/"), false())
-};
\ No newline at end of file
+};
diff --git a/exist-app/modules/tapi.xqm b/exist-app/modules/tapi.xqm
index c996c91..e9805bb 100644
--- a/exist-app/modules/tapi.xqm
+++ b/exist-app/modules/tapi.xqm
@@ -27,7 +27,6 @@ import module namespace requestr="http://exquery.org/ns/request";
 import module namespace rest="http://exquery.org/ns/restxq";
 import module namespace tei2html="http://ahikar.sub.uni-goettingen.de/ns/tei2html" at "tei2html.xqm";
 import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "tapi-html.xqm";
-import module namespace coll="http://ahikar.sub.uni-goettingen.de/ns/collate" at "collate.xqm";
 
 declare variable $tapi:server :=
     if(requestr:hostname() = "existdb") then
@@ -241,7 +240,7 @@ declare
     %rest:path("/content/ahikar-plain-text.zip")
     %output:method("binary")
 function tapi:endpoint-zip() as item()+ {
-    let $prepare := coll:main()
+    let $prepare := tapi-txt:main()
     return
         $commons:responseHeader200,
         tapi-txt:compress-to-zip()
diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 10e7ee7..bd6aee1 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -14,7 +14,6 @@ module namespace testtrigger="http://ahikar.sub.uni-goettingen.de/ns/testtrigger
 import module namespace rest="http://exquery.org/ns/restxq";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 
-import module namespace coll-tests="http://ahikar.sub.uni-goettingen.de/ns/coll-tests" at "../tests/collate-tests.xqm";
 import module namespace ct="http://ahikar.sub.uni-goettingen.de/ns/commons-tests" at "../tests/commons-tests.xqm";
 import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "../tests/tei2html-tests.xqm";
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "../tests/tei2html-textprocessing-tests.xqm";
@@ -46,7 +45,6 @@ as item()? {
     let $tests := 
         (
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/coll-tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
@@ -67,4 +65,4 @@ as item()? {
     
     return
         util:log-system-out("Tests complete. See " || $filename)
-};
\ No newline at end of file
+};
diff --git a/exist-app/tests/tapi-txt-tests.xqm b/exist-app/tests/tapi-txt-tests.xqm
index eb82e33..c3e30e7 100644
--- a/exist-app/tests/tapi-txt-tests.xqm
+++ b/exist-app/tests/tapi-txt-tests.xqm
@@ -11,14 +11,6 @@ declare variable $ttt:sample-file := local:open-file("ahiqar_sample");
 declare variable $ttt:sample-transliteration := $ttt:sample-file//tei:text[@type = "transliteration"];
 declare variable $ttt:sample-transcription := $ttt:sample-file//tei:text[@type = "transcription"];
 
-declare
-    %test:setUp
-function ttt:_test-setup()
-as xs:string+ {
-    tapi-txt:main()
-};
-
-
 declare
     %test:args("ahiqar_sample") %test:assertExists
     %test:args("1234") %test:assertError("org.exist.xquery.XPathException")
@@ -26,13 +18,6 @@ function ttt:open-file($uri as xs:string) as document-node() {
     local:open-file($uri)
 };
 
-declare
-    %test:assertXPath("count($result) = 2")
-function ttt:get-milestones-in-text()
-as element(tei:milestone)* {
-    tapi-txt:get-milestones-in-text($ttt:sample-transliteration)
-};
-
 declare
     %test:assertExists
 function ttt:get-next-milestone-succecss()
@@ -56,9 +41,9 @@ declare
     %test:assertXPath("$result//*[local-name(.) = 'ab']")
 function ttt:get-chunk()
 as element(tei:TEI) {
-    let $milestone := $ttt:sample-transliteration//tei:milestone[1]
+    let $milestone-type := "first_narrative_section"
     return
-        tapi-txt:get-chunk($milestone)
+        tapi-txt:get-chunk($ttt:sample-transliteration, $milestone-type)
 };
 
 
@@ -264,17 +249,17 @@ as xs:string {
 };
 
 declare
-    %test:assertEquals("karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription.txt")
+    %test:assertEquals("karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-first_narrative_section.txt")
 function ttt:make-file-name()
 as xs:string {
-    tapi-txt:make-file-name($ttt:sample-transcription)
+    tapi-txt:make-file-name($ttt:sample-transcription, "first_narrative_section")
 };
 
 declare
-    %test:assertEquals("ahiqar_sample-transcription.txt")
+    %test:assertEquals("ahiqar_sample-transcription-first_narrative_section.txt")
 function ttt:make-file-name-suffix()
 as xs:string {
-    tapi-txt:make-file-name-suffix($ttt:sample-transcription)
+    tapi-txt:make-file-name-suffix($ttt:sample-transcription, "first_narrative_section")
 };
 
 declare
@@ -285,8 +270,9 @@ as xs:string {
 };
 
 declare
-    %test:assertEquals("text of the first narrative section some sayings")
-function ttt:get-relevant-text() {
+    %test:args("first_narrative_section") %test:assertEquals("text of the first narrative section")
+    %test:args("sayings") %test:assertEquals("some sayings")
+function ttt:get-relevant-text($milestone-type as xs:string) {
     let $TEI :=
         <TEI xmlns="http://www.tei-c.org/ns/1.0">
             <text>
@@ -294,27 +280,19 @@ function ttt:get-relevant-text() {
                     <ab>some ignored text</ab>
                     <milestone unit="first_narrative_section"/>
                     <ab>text of the first narrative section</ab>
-                    <milestone unit="saying"/>
+                    <milestone unit="sayings"/>
                     <ab>some sayings</ab>
                 </body>
             </text>
         </TEI>
     return
-        tapi-txt:get-relevant-text($TEI/tei:text)
-};
-
-declare
-    %test:assertXPath("count($result) = 2")
-function ttt:get-chunks() {
-    let $milestones := tapi-txt:get-milestones-in-text($ttt:sample-transliteration)
-    return
-        tapi-txt:get-chunks($milestones)
+        tapi-txt:get-relevant-text($TEI/tei:text, $milestone-type)
 };
 
 declare
     %test:assertXPath("$result[self::*[local-name(.) = 'milestone']]")
 function ttt:get-end-of-chunk-milestone() {
-    let $milestone := tapi-txt:get-milestones-in-text($ttt:sample-transliteration)[1]
+    let $milestone := $ttt:sample-transliteration//tei:milestone[1]
     return
         tapi-txt:get-end-of-chunk($milestone)
 };
@@ -322,7 +300,7 @@ function ttt:get-end-of-chunk-milestone() {
 declare
     %test:assertXPath("$result[self::*[local-name(.) = 'ab']]")
 function ttt:get-end-of-chunk-end-of-text() {
-    let $milestone := tapi-txt:get-milestones-in-text($ttt:sample-transliteration)[2]
+    let $milestone := $ttt:sample-transliteration//tei:milestone[2]
     return
         tapi-txt:get-end-of-chunk($milestone)
 };
@@ -360,7 +338,7 @@ declare
     %test:assertTrue
 function ttt:has-following-milestone-true()
 as xs:boolean {
-    let $milestone := tapi-txt:get-milestones-in-text($ttt:sample-transliteration)[1]
+    let $milestone := $ttt:sample-transliteration//tei:milestone[1]
     return
         tapi-txt:has-following-milestone($milestone)
 };
@@ -369,7 +347,7 @@ declare
     %test:assertFalse
 function ttt:has-following-milestone-false()
 as xs:boolean {
-    let $milestone := tapi-txt:get-milestones-in-text($ttt:sample-transliteration)[2]
+    let $milestone := $ttt:sample-transliteration//tei:milestone[2]
     return
         tapi-txt:has-following-milestone($milestone)
 };
@@ -432,6 +410,14 @@ as document-node() {
 };
 
 
+declare
+    %test:assertXPath("$result = 'first_narrative_section'")
+    %test:assertXPath("$result = 'second_narrative_section'")
+function ttt:get-milestone-types-per-text()
+as xs:string+ {
+    tapi-txt:get-milestone-types-per-text($ttt:sample-transliteration)
+};
+
 declare
     %test:args("ahiqar_sample", "transcription")
     %test:assertXPath("$result[local-name(.) = 'text' and @type = 'transcription']")
diff --git a/exist-app/tests/tests-runner.xq b/exist-app/tests/tests-runner.xq
index 3e8d253..ee71734 100644
--- a/exist-app/tests/tests-runner.xq
+++ b/exist-app/tests/tests-runner.xq
@@ -15,7 +15,6 @@ import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifes
 import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "tapi-tests.xqm";
 import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "tei2html-tests.xqm";
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "tei2html-textprocessing-tests.xqm";
-import module namespace coll-tests="http://ahikar.sub.uni-goettingen.de/ns/coll-tests" at "collate-tests.xqm";
 
 
 let $test-results :=
@@ -28,8 +27,7 @@ let $test-results :=
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/coll-tests"))
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests"))
     )
 
 for $result in $test-results return
@@ -37,4 +35,4 @@ for $result in $test-results return
     and $result//@errors = 0) then
         "Everything okay: " || $result//@package
     else
-        $result
\ No newline at end of file
+        $result
-- 
GitLab


From 6ec4a516b752bcdfb2eeaa86c8234384631aa45a Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 09:15:51 +0100
Subject: [PATCH 040/155] tests: make compression test more robust

---
 exist-app/tests/tapi-txt-tests.xqm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/exist-app/tests/tapi-txt-tests.xqm b/exist-app/tests/tapi-txt-tests.xqm
index c3e30e7..455b2aa 100644
--- a/exist-app/tests/tapi-txt-tests.xqm
+++ b/exist-app/tests/tapi-txt-tests.xqm
@@ -4,6 +4,7 @@ module namespace ttt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests";
 
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 
+import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
 import module namespace tapi-txt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt" at "../modules/tapi-txt.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 
@@ -185,7 +186,7 @@ declare
 function ttt:create-txt-collection-if-not-available() {
     let $create-collection := tapi-txt:create-txt-collection-if-not-available()
     return
-        if (xmldb:collection-available("/db/apps/sade/textgrid/txt/")) then
+        if (xmldb:collection-available($commons:tg-collection || "/txt/")) then
             true()
         else
             false()
@@ -483,5 +484,12 @@ declare
     %test:assertExists
 function ttt:compress-text()
 as xs:base64Binary {
-    tapi-txt:compress-to-zip()
+    if (xmldb:collection-available($commons:tg-collection || "/txt")) then
+        tapi-txt:compress-to-zip()
+    else
+        (
+            let $prepare := tapi-txt:main()
+            return
+                tapi-txt:compress-to-zip()
+        )
 };
-- 
GitLab


From 18f9d5c3e9208023cd838d303b5d825ad5a4bf66 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 09:57:29 +0100
Subject: [PATCH 041/155] fix: consider several milestone declarations of same
 unit

---
 exist-app/modules/tapi-txt.xqm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/exist-app/modules/tapi-txt.xqm b/exist-app/modules/tapi-txt.xqm
index 8d0f337..f89a4b1 100644
--- a/exist-app/modules/tapi-txt.xqm
+++ b/exist-app/modules/tapi-txt.xqm
@@ -145,7 +145,11 @@ declare function tapi-txt:get-chunk($text as element(tei:text),
     $milestone-type as xs:string)
 as element(tei:TEI) {
     let $root := $text/root()
-    let $milestone := $text//tei:milestone[@unit = $milestone-type]
+    (: the positional predicate must only be provided as long as there are 
+    several milestones of the same unit in a text.
+    as soon as we have found a solution for this, this predicate should be
+    removed. :)
+    let $milestone := $text//tei:milestone[@unit = $milestone-type][1]
     let $end-of-chunk := tapi-txt:get-end-of-chunk($milestone)
     return
         fragment:get-fragment-from-doc(
-- 
GitLab


From 443fa0f520164d27aeb4acd403ef8e58cfab5795 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 09:57:39 +0100
Subject: [PATCH 042/155] chore: remove unused module

---
 exist-app/modules/collate.xqm     | 231 ----------------
 exist-app/tests/collate-tests.xqm | 419 ------------------------------
 2 files changed, 650 deletions(-)
 delete mode 100644 exist-app/modules/collate.xqm
 delete mode 100644 exist-app/tests/collate-tests.xqm

diff --git a/exist-app/modules/collate.xqm b/exist-app/modules/collate.xqm
deleted file mode 100644
index 29fd73e..0000000
--- a/exist-app/modules/collate.xqm
+++ /dev/null
@@ -1,231 +0,0 @@
-xquery version "3.1";
-
-(:~
- : This module extracts the chunks marked as important for the collation from
- : the TEI files and uses them as an input for the plain text creation. These
- : serve as a basis for the collation with CollateX in the project's CI/CD
- : pipelines.
- :)
-
-module namespace coll="http://ahikar.sub.uni-goettingen.de/ns/collate";
-
-declare namespace tei="http://www.tei-c.org/ns/1.0";
-declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
-
-import module namespace fragment="https://wiki.tei-c.org/index.php?title=Milestone-chunk.xquery" at "fragment.xqm";
-
-declare variable $coll:textgrid := "/db/apps/sade/textgrid";
-declare variable $coll:data := $coll:textgrid || "/data";
-declare variable $coll:txt := $coll:textgrid || "/txt";
-declare variable $coll:milestone-types :=
-    ("first_narrative_section",
-    "sayings",
-    "second_narrative_section",
-    "parables",
-    "third_narrative_section");
-
-
-declare function coll:main() 
-as xs:string+ {
-    coll:create-txt-collection-if-not-available(),
-    for $text in coll:get-transcriptions-and-transliterations() return
-        for $milestone-type in coll:get-milestone-types-per-text($text) return
-            let $relevant-text := coll:get-relevant-text($text, $milestone-type)
-            return
-                if (matches($relevant-text, "\w")) then
-                    xmldb:store($coll:txt, coll:make-file-name($text, $milestone-type), $relevant-text, "text/plain")
-                else
-                    ()
-};
-
-declare function coll:get-milestone-types-per-text($text as element(tei:text))
-as xs:string+ {
-    $text//tei:milestone/@unit[./string() = $coll:milestone-types]/string()
-};
-
-declare function coll:create-txt-collection-if-not-available()
-as xs:string? {
-    if (xmldb:collection-available($coll:txt)) then
-        ()
-    else
-        xmldb:create-collection($coll:textgrid, "txt")
-};
-
-declare function coll:get-transcriptions-and-transliterations()
-as element(tei:text)+ {
-    collection($coll:data)//tei:text[@type = ("transcription", "transliteration")]
-        [coll:has-text-milestone(.)]
-};
-
-declare function coll:has-text-milestone($text as element(tei:text))
-as xs:boolean {
-    exists($text//tei:milestone[@unit = $coll:milestone-types])
-};
-
-(:~
- : An example for the file name is 
- : syriac-Brit_Lib_Add_7200-3r131-transcription.txt
- :)
-declare function coll:make-file-name($text as element(tei:text),
-    $milestone-type as xs:string)
-as xs:string {
-    let $lang-prefix := coll:get-language-prefix($text)
-    let $title-from-metadata := coll:create-metadata-title-for-file-name($text)
-    let $uri-text-type-milestone := coll:make-file-name-suffix($text, $milestone-type)
-    return
-        $lang-prefix || "-" || $title-from-metadata || "-" || $uri-text-type-milestone
-};
-
-declare function coll:get-language-prefix($text as element(tei:text))
-as xs:string? {
-    switch ($text/@type)
-        case "transcription" return
-            switch ($text/@xml:lang)
-                case "karshuni" return "karshuni"
-                case "ara" return "arabic"
-                case "syc" return "syriac"
-                default return ()
-                
-        (: although the transliteration may have another language than
-        the transcription, the latter remains decisive for the prefix :)
-        case "transliteration" return
-            switch ($text/root()//tei:text[@type = "transcription"]/@xml:lang)
-                case "ara" return "arabic"
-                case "karshuni" return "karshuni"
-                case "syc" return "syriac"
-                default return ()
-        default return ()
-};
-
-declare function coll:create-metadata-title-for-file-name($text as element(tei:text))
-as xs:string {
-    let $base-uri := coll:get-base-uri($text)
-    let $metadata := doc($base-uri => replace("/data/", "/meta/"))
-    return
-        $metadata//tgmd:title
-        => replace("[^a-zA-Z0-9]", "_")
-        => replace("[_]+", "_")
-};
-
-declare function coll:get-base-uri($text as element(tei:text))
-as xs:string{
-    base-uri($text)
-};
-
-declare function coll:make-file-name-suffix($text as element(tei:text),
-    $milestone-type as xs:string)
-as xs:string {
-    let $base-uri := coll:get-base-uri($text)
-    let $file-name := coll:get-file-name($base-uri)
-    let $type := $text/@type
-    return
-        $file-name || "-" || $type || "-" || $milestone-type || ".txt"
-};
-
-declare function coll:get-file-name($base-uri as xs:string)
-as xs:string {
-    tokenize($base-uri, "/")[last()]
-    => substring-before(".xml")
-};
-
-declare function coll:get-relevant-text($text as element(tei:text),
-    $milestone-type as xs:string)
-as xs:string {
-    let $chunk := coll:get-chunk($text, $milestone-type)
-    return
-        coll:get-relevant-text-from-chunks($chunk)
-};
-
-declare function coll:get-chunk($text as element(tei:text),
-    $milestone-type as xs:string)
-as element(tei:TEI) {
-    let $root := $text/root()
-    let $milestone := $text//tei:milestone[@unit = $milestone-type]
-    let $end-of-chunk := coll:get-end-of-chunk($milestone)
-    return
-        fragment:get-fragment-from-doc(
-            $root,
-            $milestone,
-            $end-of-chunk,
-            false(),
-            true(),
-            (""))
-};
-
-declare function coll:get-end-of-chunk($milestone as element(tei:milestone))
-as node() {
-    if (coll:has-following-milestone($milestone)) then
-        coll:get-next-milestone($milestone)
-    else
-        $milestone/ancestor::tei:text[1]/tei:body/child::*[last()]
-};
-
-declare function coll:has-following-milestone($milestone as element(tei:milestone))
-as xs:boolean {
-    exists($milestone/following::tei:milestone[ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]])
-};
-
-declare function coll:get-next-milestone($milestone as element(tei:milestone))
-as element(tei:milestone)? {
-    $milestone/following::tei:milestone[ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]][1]
-};
-
-declare function coll:get-relevant-text-from-chunks($chunks as element(tei:TEI)+)
-as xs:string {
-    let $texts :=
-        for $chunk in $chunks return
-            coll:make-plain-text-from-chunk($chunk)
-    return
-        string-join($texts, " ")
-        => normalize-space()
-};
-
-declare function coll:make-plain-text-from-chunk($chunk as element(tei:TEI))
-as xs:string {
-    let $texts := coll:get-relevant-text-nodes($chunk)
-    let $prepared-texts :=
-        for $text in $texts return
-            coll:prepare-plain-text-creation($text)
-    return
-        coll:format-and-normalize-string($prepared-texts)
-};
-
-(:~ 
- : The following nodes shouldn't be considered for the plain text creation:
- : * sic (wrong text)
- : * surplus (surplus text)
- : * supplied (supplied by modern editors)
- : * colophons
- : * glyphs
- : * unclear (text unclear)
- : * catchwords (they simply serve to bind the books correctly and reduplicate text)
- : * note (they have been added later by another scribe)
- :)
-declare function coll:get-relevant-text-nodes($chunk as element(tei:TEI))
-as text()+ {
-    (($chunk//text()
-        [not(parent::tei:sic)]
-        [not(parent::tei:surplus)])
-        [not(parent::tei:supplied)])
-        [not(parent::tei:*[@type = "colophon"])]
-        [not(parent::tei:g)]
-        [not(parent::tei:unclear)]
-        [not(parent::tei:catchwords)]
-        [not(parent::tei:note)]
-};
-
-declare function coll:prepare-plain-text-creation($text as text())
-as xs:string {
-    if ($text/preceding-sibling::*[1][self::tei:lb[@break = "no"]]) then
-        "@" || $text
-    else
-        $text
-};
-
-declare function coll:format-and-normalize-string($strings as xs:string+)
-as xs:string {
-    string-join($strings, " ")
-    => replace(" @", "")
-    => replace("[\p{P}\n+]", "")
-    => replace("\s+", " ")
-};
diff --git a/exist-app/tests/collate-tests.xqm b/exist-app/tests/collate-tests.xqm
deleted file mode 100644
index 891ceef..0000000
--- a/exist-app/tests/collate-tests.xqm
+++ /dev/null
@@ -1,419 +0,0 @@
-xquery version "3.1";
-
-module namespace coll-tests="http://ahikar.sub.uni-goettingen.de/ns/coll-tests";
-
-declare namespace tei="http://www.tei-c.org/ns/1.0";
-
-import module namespace coll="http://ahikar.sub.uni-goettingen.de/ns/collate" at "../modules/collate.xqm";
-import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
-
-declare variable $coll-tests:sample-file := local:open-file("ahiqar_sample");
-declare variable $coll-tests:sample-transliteration := $coll-tests:sample-file//tei:text[@type = "transliteration"];
-declare variable $coll-tests:sample-transcription := $coll-tests:sample-file//tei:text[@type = "transcription"];
-
-declare
-    %test:args("ahiqar_sample") %test:assertExists
-    %test:args("1234") %test:assertError("org.exist.xquery.XPathException")
-function coll-tests:open-file($uri as xs:string) as document-node() {
-    local:open-file($uri)
-};
-
-declare
-    %test:assertExists
-function coll-tests:get-next-milestone-succecss()
-as element(tei:milestone)? {
-    let $milestone := $coll-tests:sample-transliteration//tei:milestone[1]
-    return
-        coll:get-next-milestone($milestone)
-};
-
-declare
-    %test:assertEmpty
-function coll-tests:get-next-milestone-fail()
-as element(tei:milestone)? {
-    let $milestone := $coll-tests:sample-transliteration//tei:milestone[2]
-    return
-        coll:get-next-milestone($milestone)
-};
-
-declare
-    %test:assertExists
-    %test:assertXPath("$result//*[local-name(.) = 'ab']")
-function coll-tests:get-chunk()
-as element(tei:TEI) {
-    let $milestone-type := "first_narrative_section"
-    return
-        coll:get-chunk($coll-tests:sample-transliteration, $milestone-type)
-};
-
-
-declare
-     %test:assertEquals("some text that should be used display some text without a space")
-function coll-tests:make-plain-text-from-chunk()
-as xs:string {
-    let $chunk := 
-        <TEI xmlns="http://www.tei-c.org/ns/1.0">
-            <text>
-                <group>
-                    <text xml:lang="ara">
-                        <body xml:lang="ara">
-                            <ab>some <persName>text</persName>          that should 
-                            
-                            
-                            
-                            be used</ab>
-                            <ab>
-                                <choice>
-                                    <sic>no display</sic>
-                                    <corr>display</corr>
-                                </choice>
-                                <surplus>no display</surplus>
-                                <supplied>no display</supplied>
-                                <ab type="colophon">no display</ab>
-                                <g>[</g>
-                                <unclear>no display</unclear>
-                                <catchwords>no displayno display</catchwords>
-                                <note>no display</note>
-                            </ab>
-                            <ab>some text with</ab>
-                            <ab><lb break="no"/>out a space</ab>
-                        </body>
-                    </text>
-                </group>
-            </text>
-        </TEI>
-    return
-        coll:make-plain-text-from-chunk($chunk)
-};
-
-
-declare
-    %test:assertEquals("some text with")
-function coll-tests:prepare-plain-text-creation-no-lb()
-as xs:string {
-    let $chunk :=
-        <TEI xmlns="http://www.tei-c.org/ns/1.0">
-            <text>
-                <group>
-                    <text xml:lang="ara">
-                        <body xml:lang="ara">
-                            <ab>some text with</ab>
-                        </body>
-                    </text>
-                </group>
-            </text>
-        </TEI>
-    let $text := $chunk//tei:ab/text()
-    return
-        coll:prepare-plain-text-creation($text)
-};
-
-declare
-    %test:assertEquals("@out a space.")
-function coll-tests:prepare-plain-text-creation-lb()
-as xs:string {
-    let $chunk :=
-        <TEI xmlns="http://www.tei-c.org/ns/1.0">
-            <text>
-                <group>
-                    <text xml:lang="ara">
-                        <body xml:lang="ara">
-                            <ab><lb break="no"/>out a space.</ab>
-                        </body>
-                    </text>
-                </group>
-            </text>
-        </TEI>
-    let $text := $chunk//tei:ab/text()
-    return
-        coll:prepare-plain-text-creation($text)
-};
-
-declare
-    %test:assertXPath("count($result) = 6")
-function coll-tests:get-relevant-text-nodes()
-as text()+ {
-    let $chunk := 
-        <TEI xmlns="http://www.tei-c.org/ns/1.0">
-            <text>
-                <group>
-                    <text xml:lang="ara">
-                        <body xml:lang="ara">
-                            <ab>some <persName>text</persName>          that should 
-                            
-                            
-                            
-                            be used</ab>
-                            <ab>
-                                <choice>
-                                    <sic>no display</sic>
-                                    <corr>display</corr>
-                                </choice>
-                                <surplus>no display</surplus>
-                                <supplied>no display</supplied>
-                                <ab type="colophon">no display</ab>
-                                <g>[</g>
-                                <unclear>no display</unclear>
-                                <catchwords>no displayno display</catchwords>
-                                <note>no display</note>
-                            </ab>
-                            <ab>some text with</ab>
-                            <ab><lb break="no"/>out a space</ab>
-                        </body>
-                    </text>
-                </group>
-            </text>
-        </TEI>
-    return
-        coll:get-relevant-text-nodes($chunk)
-};
-
-declare
-    %test:args(" @test") %test:assertEquals("test")
-    %test:args("interpunction.") %test:assertEquals("interpunction")
-    %test:args("white               spaces") %test:assertEquals("white spaces")
-    %test:args("some
-    
-    new lines") %test:assertEquals("some new lines")
-function coll-tests:format-and-normalize-string($string as xs:string)
-as xs:string {
-    coll:format-and-normalize-string($string)
-};
-
-declare
-    %test:assertTrue
-function coll-tests:create-txt-collection-if-not-available() {
-    let $create-collection := coll:create-txt-collection-if-not-available()
-    return
-        if (xmldb:collection-available("/db/apps/sade/textgrid/txt/")) then
-            true()
-        else
-            false()
-};
-
-declare
-    %test:assertXPath("count($result) gt 0")
-function coll-tests:get-transcriptions-and-transliterations()
-as element(tei:text)+ {
-    coll:get-transcriptions-and-transliterations()
-};
-
-declare
-    %test:args("ara") %test:assertEquals("arabic")
-    %test:args("karshuni") %test:assertEquals("karshuni")
-    %test:args("syc") %test:assertEquals("syriac")
-function coll-tests:get-language-prefix-transcriptions($lang as xs:string)
-as xs:string {
-    let $text := 
-        <text xmlns="http://www.tei-c.org/ns/1.0" type="transcription"
-        xml:lang="{$lang}" />
-    return
-        coll:get-language-prefix($text)
-};
-
-declare
-    %test:args("ara", "ara") %test:assertEquals("arabic")
-    %test:args("ara", "karshuni") %test:assertEquals("karshuni")
-    %test:args("ara", "syc") %test:assertEquals("syriac")
-    %test:args("karshuni", "ara") %test:assertEquals("arabic")
-    %test:args("karshuni", "karshuni") %test:assertEquals("karshuni")
-    %test:args("karshuni", "syc") %test:assertEquals("syriac")
-    %test:args("syriac", "ara") %test:assertEquals("arabic")
-    %test:args("syriac", "karshuni") %test:assertEquals("karshuni")
-    %test:args("syriac", "syc") %test:assertEquals("syriac")
-function coll-tests:get-language-prefix-transliteration($lang-transliteration as xs:string,
-$lang-transcription as xs:string)
-as xs:string {
-    let $TEI :=
-        <TEI xmlns="http://www.tei-c.org/ns/1.0">
-            <text type="transliteration" xml:lang="{$lang-transliteration}" />
-            <text type="transcription" xml:lang="{$lang-transcription}" />
-        </TEI>
-    let $text := $TEI/tei:text[1]
-    return
-        coll:get-language-prefix($text)
-};
-
-declare
-    %test:assertEquals("/db/apps/sade/textgrid/data/ahiqar_sample.xml")
-function coll-tests:get-base-uri()
-as xs:string {
-    coll:get-base-uri($coll-tests:sample-transcription)
-};
-
-declare
-    %test:assertEquals("Beispieldatei_zum_Testen")
-function coll-tests:create-metadata-title-for-file-name()
-as xs:string {
-    coll:create-metadata-title-for-file-name($coll-tests:sample-transcription)
-};
-
-declare
-    %test:assertEquals("karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-first_narrative_section.txt")
-function coll-tests:make-file-name()
-as xs:string {
-    coll:make-file-name($coll-tests:sample-transcription, "first_narrative_section")
-};
-
-declare
-    %test:assertEquals("ahiqar_sample-transcription-first_narrative_section.txt")
-function coll-tests:make-file-name-suffix()
-as xs:string {
-    coll:make-file-name-suffix($coll-tests:sample-transcription, "first_narrative_section")
-};
-
-declare
-    %test:args("/db/apps/sade/textgrid/data/ahiqar_sample.xml") %test:assertEquals("ahiqar_sample")
-function coll-tests:get-file-name($base-uri as xs:string)
-as xs:string {
-    coll:get-file-name($base-uri)
-};
-
-declare
-    %test:args("first_narrative_section") %test:assertEquals("text of the first narrative section")
-    %test:args("sayings") %test:assertEquals("some sayings")
-function coll-tests:get-relevant-text($milestone-type as xs:string) {
-    let $TEI :=
-        <TEI xmlns="http://www.tei-c.org/ns/1.0">
-            <text>
-                <body>
-                    <ab>some ignored text</ab>
-                    <milestone unit="first_narrative_section"/>
-                    <ab>text of the first narrative section</ab>
-                    <milestone unit="sayings"/>
-                    <ab>some sayings</ab>
-                </body>
-            </text>
-        </TEI>
-    return
-        coll:get-relevant-text($TEI/tei:text, $milestone-type)
-};
-
-declare
-    %test:assertXPath("$result[self::*[local-name(.) = 'milestone']]")
-function coll-tests:get-end-of-chunk-milestone() {
-    let $milestone := $coll-tests:sample-transliteration//tei:milestone[1]
-    return
-        coll:get-end-of-chunk($milestone)
-};
-
-declare
-    %test:assertXPath("$result[self::*[local-name(.) = 'ab']]")
-function coll-tests:get-end-of-chunk-end-of-text() {
-    let $milestone := $coll-tests:sample-transliteration//tei:milestone[2]
-    return
-        coll:get-end-of-chunk($milestone)
-};
-
-
-declare
-    %test:assertXPath("$result[self::*/string() = 'the end text']")
-function coll-tests:get-end-of-chunk-end-of-text-2() {
-    let $TEI :=
-        <TEI xmlns="http://www.tei-c.org/ns/1.0">
-            <text>
-                <group>
-                    <text type="transliteration">
-                        <body>
-                            <ab>some text<tei:milestone unit="sayings"/> more text</ab>
-                            <ab>the end text</ab>
-                        </body>
-                    </text>
-                    <text type="transcription">
-                        <body>
-                            <ab>some text2<tei:milestone unit="sayings"/> more text</ab>
-                            <ab>another end text</ab>
-                        </body>
-                    </text>
-                </group>
-            </text>
-        </TEI>
-    let $milestone := $TEI//tei:text[@type = "transliteration"]//tei:milestone
-    
-    return
-        coll:get-end-of-chunk($milestone)
-};
-
-declare
-    %test:assertTrue
-function coll-tests:has-following-milestone-true()
-as xs:boolean {
-    let $milestone := $coll-tests:sample-transliteration//tei:milestone[1]
-    return
-        coll:has-following-milestone($milestone)
-};
-
-declare
-    %test:assertFalse
-function coll-tests:has-following-milestone-false()
-as xs:boolean {
-    let $milestone := $coll-tests:sample-transliteration//tei:milestone[2]
-    return
-        coll:has-following-milestone($milestone)
-};
-
-declare
-    %test:assertEquals("chunk1 relevant text more relevant text chunk2 relevant text more relevant text")
-function coll-tests:get-relevant-text-from-chunks()
-as xs:string {
-    let $chunk1 :=
-        <TEI xmlns="http://www.tei-c.org/ns/1.0">
-            <text>
-                <body>
-                    <ab>chunk1: relevant text</ab>
-                    <ab>more relevant text <unclear>irrelevant</unclear>.</ab>
-                </body>
-            </text>
-        </TEI>
-    let $chunk2 :=
-        <TEI xmlns="http://www.tei-c.org/ns/1.0">
-            <text>
-                <body>
-                    <ab>chunk2: relevant text</ab>
-                    <ab>more relevant text <surplus>irrelevant</surplus></ab>
-                </body>
-            </text>
-        </TEI>
-    return
-        coll:get-relevant-text-from-chunks(($chunk1, $chunk2))
-};
-
-declare
-    %test:assertTrue
-function coll-tests:has-text-milestone-succcess() {
-    let $text:= 
-        <text xmlns="http://www.tei-c.org/ns/1.0">
-            <body>
-                <ab>some text <milestone unit="parables"/></ab>
-            </body>
-        </text>
-    return
-        coll:has-text-milestone($text)
-};
-
-declare
-    %test:assertFalse
-function coll-tests:has-text-milestones-fail() {
-    let $text:= 
-        <text xmlns="http://www.tei-c.org/ns/1.0">
-            <body>
-                <ab>some text</ab>
-            </body>
-        </text>
-    return
-        coll:has-text-milestone($text)  
-};
-
-
-declare
-    %test:assertXPath("$result = 'first_narrative_section'")
-    %test:assertXPath("$result = 'second_narrative_section'")
-function coll-tests:get-milestone-types-per-text()
-as xs:string+ {
-    coll:get-milestone-types-per-text($coll-tests:sample-transliteration)
-};
-
-declare function local:open-file($uri as xs:string)
-as document-node() {
-    doc($coll:data || "/" || $uri || ".xml")
-};
-- 
GitLab


From 99e89d3c4499d05dde6b4eaa6c38e2b23b05b5ce Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 09:59:59 +0100
Subject: [PATCH 043/155] chore: bump version number, update changelog

---
 CHANGELOG.md               | 7 +++++++
 exist-app/build.properties | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39f29b3..d0e576d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.1] - 2020-1-12
+
+## Changed
+
+- When extracting the relevant plain text sections, the semantic divisions of the texts are now considered.
+Each semantic division, which is indicated in the texts by a tei:milestone, is now stored in a separate file.
+
 ## [2.0.0] - 2020-11-06
 
 ### Changed
diff --git a/exist-app/build.properties b/exist-app/build.properties
index 6a89d1e..3049be6 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=2.0.0
+project.version=2.1.0
 project.title=TextAPI for Ahikar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
-- 
GitLab


From b6295984355a07b1ff036e6b78e21305e9d49c62 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 11:59:33 +0100
Subject: [PATCH 044/155] chore: bump version number

---
 exist-app/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exist-app/build.properties b/exist-app/build.properties
index 6a89d1e..e1228fd 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=2.0.0
+project.version=2.2.0
 project.title=TextAPI for Ahikar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
-- 
GitLab


From f319e3e0ba12fcde7aa6b3d89793b7c177c826b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 13:33:46 +0100
Subject: [PATCH 045/155] update: CHANGELOG and bumb version

---
 CHANGELOG.md               | 11 +++++++++++
 exist-app/build.properties |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39f29b3..c6cebb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.0] - 2020-11-12
+
+### Changed
+
+- prepared for changed endpoints at Text-API (document-page to document/page)
+
+### Fixed
+
+- wrong Annotation IDs
+
+
 ## [2.0.0] - 2020-11-06
 
 ### Changed
diff --git a/exist-app/build.properties b/exist-app/build.properties
index 6a89d1e..3049be6 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=2.0.0
+project.version=2.1.0
 project.title=TextAPI for Ahikar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
-- 
GitLab


From c4c0d18c5cb826c027d34a5f3fa0be558a80cf02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 14:14:43 +0100
Subject: [PATCH 046/155] fix: syntax

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

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index a5cb88d..3b06551 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -114,7 +114,7 @@ declare function anno:make-annotationCollection($collection as xs:string, $docum
     (: if $document is a collection then its value in $anno:uris is a map containing the aggregated manifests.
     at this point it is relevant if $document is actually a manifest or a collection.
     we have to create different paths containing $first and $last for the two of them,
-    namely :)
+    namely
         $server || "/annotations/ahikar/" || $document || "/" || $first || "/annotationPage.json" for $document being a collection
         $server || "/annotations/ahikar/" || $collection || "/" || $document || "/" || $first || "/annotationPage.json" for $document being a manifest :)
     if ($document and anno:find-in-map($anno:uris, $document) instance of map()) then
-- 
GitLab


From 571336dfa870d0e1975305a5ba3e552e7e956569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 14:18:37 +0100
Subject: [PATCH 047/155] fix: syntax

---
 exist-app/modules/annotations.xqm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 3b06551..082207a 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -705,12 +705,20 @@ $document as xs:string, $type as xs:string) {
 
 declare function anno:get-prev-or-next-annotationPage-url($collection as xs:string,
 $document as xs:string?, $page as xs:string?, $server as xs:string) {
+    let $pageSuffix :=
+        if ($page) then
+            "/" || $page
+        else
+            ()
+    return
         if ($document) then
-            $server || "/api/annotations/ahikar/" || $collection|| "/" || $document || "/" || $pageSuffix || "/annotationPage.json"
+            $server || "/api/annotations/ahikar/" || $collection|| "/" || $document || $pageSuffix || "/annotationPage.json"
         else
             ()
 };
 
+};
+
 (:~
  : Returns a sequence of URIs that are part of a given aggregation.
  : 
-- 
GitLab


From 0359c721dee07de633ecc29fc7edef230f9428d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Thu, 12 Nov 2020 14:19:01 +0100
Subject: [PATCH 048/155] fix: syntax

---
 exist-app/modules/annotations.xqm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 082207a..a1731f7 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -717,7 +717,6 @@ $document as xs:string?, $page as xs:string?, $server as xs:string) {
             ()
 };
 
-};
 
 (:~
  : Returns a sequence of URIs that are part of a given aggregation.
-- 
GitLab


From 85b56c81692597580abcb64ece272b6d7ed1989f Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 08:11:16 +0100
Subject: [PATCH 049/155] style: update code formatting

---
 exist-app/modules/annotations.xqm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index a1731f7..e28daa6 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -948,7 +948,8 @@ as document-node() {
             default return error(QName($anno:ns, "ANNO02"), "Unknown type " || $type)
     let $document-uri := $collection || $uri || ".xml"
     return
-        if(doc-available($document-uri))
-        then doc($document-uri)
-        else error(QName($anno:ns, "ANNO03"), "Document not found: " || $document-uri)
+        if(doc-available($document-uri)) then
+            doc($document-uri)
+        else
+            error(QName($anno:ns, "ANNO03"), "Document not found: " || $document-uri)
 };
-- 
GitLab


From 0877872b3ccdd5e8086db38fc07b0b7da75ba1ea Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 08:14:22 +0100
Subject: [PATCH 050/155] fix: update REST path for items

---
 exist-app/modules/tapi-item.xqm     | 2 +-
 exist-app/tests/tapi-item-tests.xqm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/exist-app/modules/tapi-item.xqm b/exist-app/modules/tapi-item.xqm
index cd1a52c..fe38d60 100644
--- a/exist-app/modules/tapi-item.xqm
+++ b/exist-app/modules/tapi-item.xqm
@@ -30,7 +30,7 @@ as element(object) {
         <image>
             <id>{tapi-item:make-facsimile-id($manifest-uri, $page, $server)}</id>
         </image>
-        <annotationCollection>{$server}/api/annotations/ahikar/{$collection-uri}/{$manifest-uri}-{$page}/annotationCollection.json</annotationCollection>
+        <annotationCollection>{$server}/api/annotations/ahikar/{$collection-uri}/{$manifest-uri}/{$page}/annotationCollection.json</annotationCollection>
     </object>
 };
 
diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index 21c8e71..554ec43 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -57,7 +57,7 @@ declare
     %test:assertXPath("$result//*[local-name(.) = 'content'] = 'http://0.0.0.0:8080/exist/restxq/api/content/ahiqar_sample-82a.html' ")
     (: checks if images connected to underlying pages are identified :)
     %test:assertXPath("$result//*[local-name(.) = 'id'] = 'http://0.0.0.0:8080/exist/restxq/api/images/3r1nz' ")
-    %test:assertXPath("$result//*[local-name(.) = 'annotationCollection'] = 'http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/ahiqar_collection/ahiqar_agg-82a/annotationCollection.json' ")
+    %test:assertXPath("$result//*[local-name(.) = 'annotationCollection'] = 'http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/ahiqar_collection/ahiqar_agg/82a/annotationCollection.json' ")
 function titemt:get-json($collection as xs:string,
     $document as xs:string,
     $page as xs:string) 
-- 
GitLab


From 0e91a86e941d3dd054a781e9e3615a5024bdf786 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 08:16:17 +0100
Subject: [PATCH 051/155] tests: add missing param types and return values,
 remove unused modules

---
 exist-app/modules/tapi-item.xqm     | 2 +-
 exist-app/tests/tapi-item-tests.xqm | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/exist-app/modules/tapi-item.xqm b/exist-app/modules/tapi-item.xqm
index fe38d60..480c0ca 100644
--- a/exist-app/modules/tapi-item.xqm
+++ b/exist-app/modules/tapi-item.xqm
@@ -35,7 +35,7 @@ as element(object) {
 };
 
 
-declare function tapi-item:make-title($manifest-uri)
+declare function tapi-item:make-title($manifest-uri as xs:string)
 as xs:string {
     let $tei-xml := commons:get-tei-xml-for-manifest($manifest-uri)
     return
diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index 554ec43..a11acf7 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -5,8 +5,6 @@ module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests"
 declare namespace http = "http://expath.org/ns/http-client";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 
-import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
-import module namespace map="http://www.w3.org/2005/xpath-functions/map";
 import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace tapi-item="http://ahikar.sub.uni-goettingen.de/ns/tapi/item" at "../modules/tapi-item.xqm";
@@ -70,6 +68,7 @@ declare
     %test:args("ahiqar_agg") %test:assertXPath("count($result) = 5")
     %test:args("ahiqar_agg") %test:assertXPath("$result[local-name(.) = ('lang', 'langAlt')]")
     %test:args("ahiqar_agg") %test:assertXPath("count($result[local-name(.) = 'lang']) = 2")
-function titemt:make-language-elements($manifest-uri as xs:string) {
+function titemt:make-language-elements($manifest-uri as xs:string)
+as element()+ {
     tapi-item:make-language-elements($manifest-uri)
 };
-- 
GitLab


From 299b0624b0ede8a2f839aa5fdec49e5f56118d65 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 08:51:36 +0100
Subject: [PATCH 052/155] refactor: rename variable

---
 exist-app/modules/annotations.xqm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index e28daa6..dc35fab 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -45,10 +45,10 @@ declare variable $anno:annotationElements :=
 
 (: this variable holds a map with the complete project structure (excluding images) :)
 declare variable $anno:uris :=
-    let $main-collection := "3r132" (: main textgrid edition object :)
-    let $language-aggs := anno:get-uris($main-collection)
+    let $main-edition-object := "3r132"
+    let $language-aggs := anno:get-uris($main-edition-object)
     return
-        map { $main-collection:
+        map { $main-edition-object:
                 (: level 1: language aggregations :)
                 map:merge(for $lang in $language-aggs return
                 map:entry($lang, 
-- 
GitLab


From 944e6806e85f82840524e4d12d43e99c63a4eab1 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 09:54:01 +0100
Subject: [PATCH 053/155] chore: tidy up repo.xml

---
 exist-app/repo.xml | 64 +---------------------------------------------
 1 file changed, 1 insertion(+), 63 deletions(-)

diff --git a/exist-app/repo.xml b/exist-app/repo.xml
index 81dfad6..6dc29f7 100644
--- a/exist-app/repo.xml
+++ b/exist-app/repo.xml
@@ -9,68 +9,6 @@
     <target>ahikar</target>
     <permissions user="ahikar" group="ahikar" mode="rw-rw-r--"/>
     <prepare/>
-    <finish>post-install.xq</finish>
-
-    <changelog>
-      <change version="0.4.0">
-        <ul xmlns="http://www.w3.org/1999/xhtml">
-          <li class="feat">Features
-            <ul>
-              <li>add sample text for the viewer</li>
-              <li>only consider pagebreaks with a facsimile in serialization</li>
-            </ul>
-          </li>
-        </ul>
-      </change>
-      <change version="0.2.0">
-        <ul xmlns="http://www.w3.org/1999/xhtml">
-          <li class="feat">Features
-            <ul>
-              <li>add image endpoint</li>
-              <li>refine Text-API structure</li>
-              <li>add function documentation</li>
-            </ul>
-          </li>
-          <li class="bugs">Bugfixes
-            <ul>
-              <li/>
-            </ul>
-          </li>
-        </ul>
-      </change>
-      <change version="0.1.0">
-        <ul xmlns="http://www.w3.org/1999/xhtml">
-          <li class="feat">Features
-            <ul>
-              <li>plain text generation</li>
-              <li>plain text download</li>
-              <li>deployment via API</li>
-              <li>renamed application to match development tracks (git flow)</li>
-            </ul>
-          </li>
-          <li class="bugs">Bugfixes
-            <ul>
-              <li/>
-            </ul>
-          </li>
-        </ul>
-      </change>
-      <change version="0.0.0">
-        <ul xmlns="http://www.w3.org/1999/xhtml">
-          <li class="feat">Features
-            <ul>
-              <li>Application setup</li>
-              <li>Docker implementation incl. httpd reverse proxy</li>
-            </ul>
-          </li>
-          <li class="bugs">Bugfixes
-            <ul>
-              <li/>
-            </ul>
-          </li>
-        </ul>
-      </change>
-     </changelog>
-  
+    <finish>post-install.xq</finish>  
 <deployed>2020-06-04T05:35:59.135Z</deployed>
 </meta>
-- 
GitLab


From 181c2af393ca4176b64be153732e8af374e8af39 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 09:55:53 +0100
Subject: [PATCH 054/155] tests: add basic test set up

---
 exist-app/modules/testtrigger.xqm    |  4 +++-
 exist-app/tests/annotation-tests.xqm | 18 ++++++++++++++++++
 exist-app/tests/tests-runner.xq      |  4 +++-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 exist-app/tests/annotation-tests.xqm

diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 0624295..2609b0f 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -23,6 +23,7 @@ import module namespace thtmlt="http://ahikar.sub.uni-goettingen.de/ns/tapi/html
 import module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" at "../tests/tapi-item-tests.xqm";
 import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" at "../tests/tapi-manifest-tests.xqm";
 import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "../tests/tapi-tests.xqm";
+import module namespace at="http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" at "../tests/annotation-tests.xqm";
 
 (:~
  : Triggers the tests for the Ahikar backend. Called by the CI.
@@ -52,7 +53,8 @@ as item()? {
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests")),
             test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests"))
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests"))
         )
     
     let $fileSeparator := util:system-property("file.separator")
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
new file mode 100644
index 0000000..dd3830c
--- /dev/null
+++ b/exist-app/tests/annotation-tests.xqm
@@ -0,0 +1,18 @@
+xquery version "3.1";
+
+module namespace at="http://ahikar.sub.uni-goettingen.de/ns/annotations/tests";
+
+declare namespace http = "http://expath.org/ns/http-client";
+declare namespace tei="http://www.tei-c.org/ns/1.0";
+
+import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
+import module neEsamespace map="http://www.w3.org/2005/xpath-functions/map";
+import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
+import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
+import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/annotations.xqm";
+
+declare
+    %test:assertTrue
+function at:fail() {
+    false()
+};
\ No newline at end of file
diff --git a/exist-app/tests/tests-runner.xq b/exist-app/tests/tests-runner.xq
index 60ab7ac..b608b0e 100644
--- a/exist-app/tests/tests-runner.xq
+++ b/exist-app/tests/tests-runner.xq
@@ -15,6 +15,7 @@ import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifes
 import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "tapi-tests.xqm";
 import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "tei2html-tests.xqm";
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "tei2html-textprocessing-tests.xqm";
+import module namespace at="http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" at "../tests/annotation-tests.xqm";
 
 
 let $test-results :=
@@ -27,7 +28,8 @@ let $test-results :=
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests"))
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests"))
     )
 
 for $result in $test-results return
-- 
GitLab


From 36e0f88aa079e4fa5c712a1a99101cae16fe0745 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 10:01:35 +0100
Subject: [PATCH 055/155] refactor: move existing test to apt module

---
 exist-app/tests/annotation-tests.xqm | 126 ++++++++++++++++++++++++--
 exist-app/tests/tapi-tests.xqm       | 129 ---------------------------
 2 files changed, 121 insertions(+), 134 deletions(-)

diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index dd3830c..31df25d 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -6,13 +6,129 @@ declare namespace http = "http://expath.org/ns/http-client";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
-import module neEsamespace map="http://www.w3.org/2005/xpath-functions/map";
+import module namespace map="http://www.w3.org/2005/xpath-functions/map";
 import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/annotations.xqm";
 
 declare
-    %test:assertTrue
-function at:fail() {
-    false()
-};
\ No newline at end of file
+    %test:args("ahiqar_sample", "data")
+    %test:assertXPath("$result//*[local-name(.) = 'TEI']")
+function at:anno-get-document($uri as xs:string, $type as xs:string) as document-node() {
+    anno:get-document($uri, $type)
+};
+
+
+(:declare:)
+(:    %test:args("3r679", "114r"):)
+(:    %test:assertEquals("0"):)
+(:function at:anno-determine-start-index-for-page($uri as xs:string, $page as xs:string) {:)
+(:    anno:determine-start-index-for-page($uri, $page):)
+(:};:)
+(::)
+(::)
+(:declare:)
+(:    %test:args("3r131"):)
+(:    %test:assertEquals("16"):)
+(:function at:anno-determine-start-index($uri as xs:string) {:)
+(:    anno:determine-start-index($uri):)
+(:};:)
+(::)
+(:declare:)
+(:    %test:args("3r131"):)
+(:    %test:assertEquals("3r679"):)
+(:function at:anno-get-parent-aggregation($uri as xs:string) {:)
+(:    anno:get-parent-aggregation($uri):)
+(:};:)
+(::)
+(::)
+(:declare:)
+(:    %test:args("3r131"):)
+(:    %test:assertEquals("114r", "114v"):)
+(:function at:anno-get-pages-in-TEI($uri as xs:string) {:)
+(:    anno:get-pages-in-TEI($uri):)
+(:};:)
+(::)
+(::)
+(:declare:)
+(:    %test:args("3r679"):)
+(:    %test:assertTrue:)
+(:function at:anno-is-resource-edition($uri as xs:string) {:)
+(:    anno:is-resource-edition($uri):)
+(:};:)
+(::)
+(::)
+(:declare:)
+(:    %test:args("3r131"):)
+(:    %test:assertTrue:)
+(:function at:anno-is-resource-xml($uri as xs:string) {:)
+(:    anno:is-resource-xml($uri):)
+(:};:)
+
+
+(:declare:)
+(:    %test:assertEquals("A place's name."):)
+(:function at:anno-get-bodyValue() {:)
+(:    let $annotation := doc("/db/test-records/sample-tei.xml")//tei:placeName:)
+(:    return:)
+(:        anno:get-bodyValue($annotation):)
+(:};:)
+(::)
+(::)
+(:declare:)
+(:    %test:args("asdf"):)
+(:    %test:assertFalse:)
+(:(:    %test:args("3r131"):):)
+(:(:    %test:assertTrue:):)
+(:function at:anno-are-resources-available($resources as xs:string+) {:)
+(:    anno:are-resources-available($resources):)
+(:};:)
+
+
+(:declare:)
+(:    %test:args("3r131"):)
+(:    %test:assertEquals("Simon Birol, Aly Elrefaei"):)
+(:function at:anno-get-creator($uri as xs:string) {:)
+(:    anno:get-creator($uri):)
+(:};:)
+(::)
+(::)
+(:declare:)
+(:    %test:args("3r131"):)
+(:    %test:assertEquals("Brit. Lib. Add. 7200"):)
+(:function at:anno-get-metadata-title($uri as xs:string) {:)
+(:    anno:get-metadata-title($uri):)
+(:};:)
+(::)
+(::)
+(:declare:)
+(:    %test:args("3r679"):)
+(:    %test:assertEquals("3r676", "3r672"):)
+(:function at:anno-get-prev-xml-uris($uri as xs:string) {:)
+(:    anno:get-prev-xml-uris($uri):)
+(:};:)
+(::)
+(::)
+(:declare:)
+(:    %test:args("3r679"):)
+(:    %test:assertEquals("3r676", "3r672"):)
+(:function at:anno-get-xmls-prev-in-collection($uri as xs:string) {:)
+(:    anno:get-xmls-prev-in-collection($uri):)
+(:};:)
+
+
+(:declare:)
+(:    %test:args("3r679", "114r", "next"):)
+(:    %test:assertEquals("114v"):)
+(:function at:anno-get-prev-or-next-page($documentURI as xs:string,:)
+(:$page as xs:string, $type as xs:string) {:)
+(:    anno:get-prev-or-next-page($documentURI, $page, $type):)
+(:};:)
+(::)
+(::)
+(:declare:)
+(:    %test:args("3r9ps"):)
+(:    %test:assertEquals("3r177", "3r178", "3r7vw", "3r7p1", "3r7p9", "3r7sk", "3r7tp", "3r7vd", "3r179", "3r7n0", "3r9vn", "3r9wf", "3rb3z", "3rbm9", "3rbmc", "3rx14", "3vp38"):)
+(:function at:anno-get-uris($documentURI) {:)
+(:    anno:get-uris($documentURI):)
+(:};:)
diff --git a/exist-app/tests/tapi-tests.xqm b/exist-app/tests/tapi-tests.xqm
index 646cb6f..5916370 100644
--- a/exist-app/tests/tapi-tests.xqm
+++ b/exist-app/tests/tapi-tests.xqm
@@ -241,132 +241,3 @@ function tt:endpoint-item() as item() {
         => util:base64-decode()
         => parse-json()
 };
-
-
-(:  
- : *****************
- : * AnnotationAPI * 
- : *****************
- :)
-
-declare
-    %test:args("ahiqar_sample", "data")
-    %test:assertXPath("$result//*[local-name(.) = 'TEI']")
-function tt:anno-get-document($uri as xs:string, $type as xs:string) as document-node() {
-    anno:get-document($uri, $type)
-};
-
-
-(:declare:)
-(:    %test:args("3r679", "114r"):)
-(:    %test:assertEquals("0"):)
-(:function tt:anno-determine-start-index-for-page($uri as xs:string, $page as xs:string) {:)
-(:    anno:determine-start-index-for-page($uri, $page):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertEquals("16"):)
-(:function tt:anno-determine-start-index($uri as xs:string) {:)
-(:    anno:determine-start-index($uri):)
-(:};:)
-(::)
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertEquals("3r679"):)
-(:function tt:anno-get-parent-aggregation($uri as xs:string) {:)
-(:    anno:get-parent-aggregation($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertEquals("114r", "114v"):)
-(:function tt:anno-get-pages-in-TEI($uri as xs:string) {:)
-(:    anno:get-pages-in-TEI($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r679"):)
-(:    %test:assertTrue:)
-(:function tt:anno-is-resource-edition($uri as xs:string) {:)
-(:    anno:is-resource-edition($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertTrue:)
-(:function tt:anno-is-resource-xml($uri as xs:string) {:)
-(:    anno:is-resource-xml($uri):)
-(:};:)
-
-
-declare
-    %test:assertEquals("A place's name.")
-function tt:anno-get-bodyValue() {
-    let $annotation := doc("/db/test-records/sample-tei.xml")//tei:placeName
-    return
-        anno:get-bodyValue($annotation)
-};
-
-
-declare
-    %test:args("asdf")
-    %test:assertFalse
-(:    %test:args("3r131"):)
-(:    %test:assertTrue:)
-function tt:anno-are-resources-available($resources as xs:string+) {
-    anno:are-resources-available($resources)
-};
-
-
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertEquals("Simon Birol, Aly Elrefaei"):)
-(:function tt:anno-get-creator($uri as xs:string) {:)
-(:    anno:get-creator($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertEquals("Brit. Lib. Add. 7200"):)
-(:function tt:anno-get-metadata-title($uri as xs:string) {:)
-(:    anno:get-metadata-title($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r679"):)
-(:    %test:assertEquals("3r676", "3r672"):)
-(:function tt:anno-get-prev-xml-uris($uri as xs:string) {:)
-(:    anno:get-prev-xml-uris($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r679"):)
-(:    %test:assertEquals("3r676", "3r672"):)
-(:function tt:anno-get-xmls-prev-in-collection($uri as xs:string) {:)
-(:    anno:get-xmls-prev-in-collection($uri):)
-(:};:)
-
-
-(:declare:)
-(:    %test:args("3r679", "114r", "next"):)
-(:    %test:assertEquals("114v"):)
-(:function tt:anno-get-prev-or-next-page($documentURI as xs:string,:)
-(:$page as xs:string, $type as xs:string) {:)
-(:    anno:get-prev-or-next-page($documentURI, $page, $type):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r9ps"):)
-(:    %test:assertEquals("3r177", "3r178", "3r7vw", "3r7p1", "3r7p9", "3r7sk", "3r7tp", "3r7vd", "3r179", "3r7n0", "3r9vn", "3r9wf", "3rb3z", "3rbm9", "3rbmc", "3rx14", "3vp38"):)
-(:function tt:anno-get-uris($documentURI) {:)
-(:    anno:get-uris($documentURI):)
-(:};:)
-- 
GitLab


From 07e7eb303ef0ca5a31e980cd1fe9ac2bd83f4988 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 10:39:44 +0100
Subject: [PATCH 056/155] refactor: add generic function for document retrieval

---
 exist-app/modules/annotations.xqm    | 43 +++++++++-------------------
 exist-app/modules/commons.xqm        | 32 ++++++++++++++-------
 exist-app/modules/tapi-txt.xqm       |  8 +++---
 exist-app/tests/annotation-tests.xqm |  7 ++---
 exist-app/tests/commons-tests.xqm    | 19 ++++++------
 5 files changed, 50 insertions(+), 59 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index dc35fab..6a0f5c0 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -168,7 +168,7 @@ declare function anno:get-information-for-collection-object($collectionURI as xs
  : @return The resource's title
  :)
 declare function anno:get-metadata-title($uri as xs:string) as xs:string {
-    anno:get-document($uri, "meta")//tgmd:title/string()
+    commons:get-document($uri, "meta")//tgmd:title/string()
 };
 
 
@@ -216,7 +216,7 @@ declare function anno:get-creator($uri as xs:string) as xs:string {
             return
                 anno:get-all-xml-uris-for-submap($map)
     let $creators := for $xml in $xmls return
-        let $doc := anno:get-document($xml, "data")
+        let $doc := commons:get-document($xml, "data")
         return $doc//tei:teiHeader//tei:editor
     return
         distinct-values($creators) => string-join(", ")
@@ -513,7 +513,7 @@ declare function anno:get-annotations($documentURI as xs:string, $page as xs:str
  : @param $page The page to be returned as tei:pb/@n/string()
  :)
 declare function anno:get-page-fragment($documentURI as xs:string, $page as xs:string) {
-    let $nodeURI :=anno:get-document($documentURI, "data")/base-uri()
+    let $nodeURI :=commons:get-document($documentURI, "data")/base-uri()
     return
         tapi-html:get-page-fragment($nodeURI, $page)
 };
@@ -538,7 +538,7 @@ declare function anno:get-total-no-of-annotations($uri as xs:string) as xs:integ
             
     let $annotation-no-per-xml :=
         for $xml in $xmls return
-            let $doc := anno:get-document($xml, "data")
+            let $doc := commons:get-document($xml, "data")
             let $noOfElementsEach :=
                 for $element in $anno:annotationElements return
                     count($doc//tei:text//*[name(.) = $element])
@@ -728,7 +728,7 @@ $document as xs:string?, $page as xs:string?, $server as xs:string) {
 declare function anno:get-uris($resource as xs:string) as xs:string+ {
     let $resource-doc :=
         try {
-            anno:get-document($resource, "agg")
+            commons:get-document($resource, "agg")
         } catch * {
             error(QName($anno:ns, "ANNO01"), 
                 $resource || " is either not an aggregation or could not be found in the database.")
@@ -745,7 +745,7 @@ declare function anno:get-uris($resource as xs:string) as xs:string+ {
  : @return true() if resources stated by $uri is a TEI/XML resource
  :)
 declare function anno:is-resource-xml($uri as xs:string) as xs:boolean {
-    anno:get-document($uri, "meta")//tgmd:format = "text/xml"
+    commons:get-document($uri, "meta")//tgmd:format = "text/xml"
 };
 
 (:~ 
@@ -767,7 +767,7 @@ declare function anno:is-resource-edition($uri as xs:string) as xs:boolean {
  : @return A sequence of all page breaks occuring in the resource
  :)
 declare function anno:get-pages-in-TEI($documentURI as xs:string) as xs:string+ {
-    anno:get-document($documentURI, "data")//tei:pb[@facs]/@n/string()
+    commons:get-document($documentURI, "data")//tei:pb[@facs]/@n/string()
 };
 
 
@@ -846,7 +846,7 @@ as xs:string* {
  :)
 declare function anno:get-prev-xml-uris($uri as xs:string) as xs:string* {
     let $collection := anno:get-parent-aggregation($uri)
-    let $collection := anno:get-document($collection, "agg")
+    let $collection := commons:get-document($collection, "agg")
     
     let $tgURI := "textgrid:" || $uri
     let $tgURINode := $collection//@rdf:resource[./string() = $tgURI]
@@ -885,12 +885,12 @@ declare function anno:get-parent-aggregation($uri as xs:string) as xs:string {
  : @return The relative position of the first annotation
  :)
 declare function anno:determine-start-index($uri as xs:string) as xs:integer {
-    let $resourceType := anno:get-document($uri, "meta")//tgmd:format
+    let $resourceType := commons:get-document($uri, "meta")//tgmd:format
     return
         if ($resourceType = "text/tg.aggregation+xml") then
             let $project := anno:get-parent-aggregation($uri)
-            let $nodeForURI := anno:get-document($project, "agg")//*[@rdf:resource[matches(., $uri)]]
-            let $prevCollections := anno:get-document($project, "agg")//*[@rdf:resource[. << $nodeForURI]]/@rdf:resource
+            let $nodeForURI := commons:get-document($project, "agg")//*[@rdf:resource[matches(., $uri)]]
+            let $prevCollections := commons:get-document($project, "agg")//*[@rdf:resource[. << $nodeForURI]]/@rdf:resource
             let $prevCollections :=
                 for $collURI in $prevCollections return
                     replace($collURI, "textgrid:", "")
@@ -903,7 +903,7 @@ declare function anno:determine-start-index($uri as xs:string) as xs:integer {
             let $prevXMLs := anno:get-xmls-prev-in-collection($uri)
             let $noOfAnnotationsPerXML :=
                 for $xml in $prevXMLs return
-                    let $doc := anno:get-document($xml, "data")
+                    let $doc := commons:get-document($xml, "data")
                     let $noOfAnnotationsPerElement :=
                         for $name in $anno:annotationElements return
                             count($doc//tei:text//*[name(.) = $name])
@@ -928,7 +928,7 @@ declare function anno:determine-start-index($uri as xs:string) as xs:integer {
 declare function anno:determine-start-index-for-page($uri as xs:string,
 $page as xs:string) as xs:integer {
     let $xml := anno:find-in-map($anno:uris, $uri)
-    let $doc := anno:get-document($xml, "data")
+    let $doc := commons:get-document($xml, "data")
     let $currentPb := $doc//tei:pb[@n = $page and @facs]
     let $noOfAnnotationsPerElement :=
         for $name in $anno:annotationElements return
@@ -936,20 +936,3 @@ $page as xs:string) as xs:integer {
     return
         sum($noOfAnnotationsPerElement)
 };
-
-
-declare function anno:get-document($uri as xs:string, $type as xs:string)
-as document-node() {
-    let $collection :=
-        switch ($type)
-            case "agg" return $commons:agg
-            case "data" return $commons:tg-collection || "/data/"
-            case "meta" return $commons:meta
-            default return error(QName($anno:ns, "ANNO02"), "Unknown type " || $type)
-    let $document-uri := $collection || $uri || ".xml"
-    return
-        if(doc-available($document-uri)) then
-            doc($document-uri)
-        else
-            error(QName($anno:ns, "ANNO03"), "Document not found: " || $document-uri)
-};
diff --git a/exist-app/modules/commons.xqm b/exist-app/modules/commons.xqm
index 77c61d9..b9db008 100644
--- a/exist-app/modules/commons.xqm
+++ b/exist-app/modules/commons.xqm
@@ -13,6 +13,8 @@ declare variable $commons:meta := $commons:tg-collection || "/meta/";
 declare variable $commons:agg := $commons:tg-collection || "/agg/";
 declare variable $commons:appHome := "/db/apps/ahikar";
 
+declare variable $commons:ns := "http://ahikar.sub.uni-goettingen.de/ns/commons";
+
 declare variable $commons:responseHeader200 :=
     <rest:response>
         <http:response xmlns:http="http://expath.org/ns/http-client" status="200">
@@ -20,14 +22,9 @@ declare variable $commons:responseHeader200 :=
         </http:response>
     </rest:response>;
 
-declare function commons:get-aggregation($manifest-uri as xs:string)
-as document-node() {
-    doc($commons:agg || $manifest-uri || ".xml")
-};
-
 declare function commons:get-xml-uri($manifest-uri as xs:string)
 as xs:string {
-    let $aggregation-file := commons:get-aggregation($manifest-uri)
+    let $aggregation-file := commons:get-document($manifest-uri, "agg")
     return
         $aggregation-file//ore:aggregates[1]/@rdf:resource
         => substring-after(":")
@@ -37,10 +34,23 @@ declare function commons:get-tei-xml-for-manifest($manifest-uri as xs:string)
 as document-node() {
     let $xml-uri := commons:get-xml-uri($manifest-uri)
     return
-        doc($commons:data || $xml-uri || ".xml")
+        commons:get-document($xml-uri, "data")
 };
 
-declare function commons:open-tei-xml($tei-xml-uri as xs:string)
-as document-node() {
-    doc($commons:data || $tei-xml-uri || ".xml")
-};
\ No newline at end of file
+
+declare function commons:get-document($uri as xs:string,
+    $type as xs:string)
+as document-node()? {
+    let $collection :=
+        switch ($type)
+            case "agg" return $commons:agg
+            case "data" return $commons:data
+            case "meta" return $commons:meta
+            default return error(QName($commons:ns, "COMMONS001"), "Unknown type " || $type)
+    let $base-uri := $collection || $uri || ".xml"
+    return
+        if (doc-available($base-uri)) then
+            doc($base-uri)
+        else
+            error(QName($commons:ns, "COMMONS002"), "URI " || $uri || " not found.")
+};
diff --git a/exist-app/modules/tapi-txt.xqm b/exist-app/modules/tapi-txt.xqm
index 6dd2652..577661b 100644
--- a/exist-app/modules/tapi-txt.xqm
+++ b/exist-app/modules/tapi-txt.xqm
@@ -249,7 +249,7 @@ declare function tapi-txt:get-TEI-text($document-uri as xs:string,
     $type as xs:string)
 as element(tei:text) {
     if (tapi-txt:is-document-tei-xml($document-uri)) then
-        commons:open-tei-xml($document-uri)//tei:text[@type = $type]
+        commons:get-document($document-uri, "data")//tei:text[@type = $type]
     else
         tapi-txt:get-tei-xml-uri-from-edition
         => tapi-txt:get-text-of-type($type)
@@ -287,7 +287,7 @@ as xs:string {
 
 declare function tapi-txt:get-edition-aggregates-without-uri-namespace($document-uri as xs:string)
 as xs:string+ {
-    let $edition := commons:get-aggregation($document-uri)
+    let $edition := commons:get-document($document-uri, "agg")
     for $agg in $edition//ore:aggregates/@rdf:resource return
         replace($agg, "textgrid:", "")
 };
@@ -306,11 +306,11 @@ as xs:string {
 declare function tapi-txt:get-text-of-type($uri as xs:string,
     $type as xs:string)
 as element(tei:text) {
-    commons:open-tei-xml($uri)//tei:text[@type = $type]
+    commons:get-document($uri, "data")//tei:text[@type = $type]
 };
 
 
 declare function tapi-txt:compress-to-zip()
 as xs:base64Binary* {
     compression:zip(xs:anyURI($commons:tg-collection || "/txt/"), false())
-};
\ No newline at end of file
+};
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index 31df25d..dcd5c86 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -12,10 +12,9 @@ import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:o
 import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/annotations.xqm";
 
 declare
-    %test:args("ahiqar_sample", "data")
-    %test:assertXPath("$result//*[local-name(.) = 'TEI']")
-function at:anno-get-document($uri as xs:string, $type as xs:string) as document-node() {
-    anno:get-document($uri, $type)
+    %test:assertTrue
+function at:success() {
+    true()
 };
 
 
diff --git a/exist-app/tests/commons-tests.xqm b/exist-app/tests/commons-tests.xqm
index 1fd6839..1a3374a 100644
--- a/exist-app/tests/commons-tests.xqm
+++ b/exist-app/tests/commons-tests.xqm
@@ -11,12 +11,6 @@ import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:o
 
 declare variable $ct:restxq := "http://0.0.0.0:8080/exist/restxq/";
 
-declare
-    %test:args("ahiqar_agg") %test:assertXPath("$result//@* = 'textgrid:ahiqar_sample'")
-function ct:get-aggregation($manifest-uri as xs:string) {
-    commons:get-aggregation($manifest-uri)
-};
-
 declare
     %test:args("ahiqar_agg") %test:assertEquals("ahiqar_sample")
 function ct:get-xml-uri($manifest-uri as xs:string)
@@ -33,8 +27,13 @@ function ct:get-tei-xml-for-manifest($manifest-uri) {
 
 
 declare
-    %test:args("ahiqar_sample") %test:assertXPath("$result//*[local-name(.) = 'TEI']")
-function ct:open-tei-xml($tei-xml-uri as xs:string)
-as document-node() {
-    commons:open-tei-xml($tei-xml-uri)
+    %test:args("ahiqar_sample", "data") %test:assertXPath("$result/*[local-name(.) = 'TEI']")
+    %test:args("ahiqar_sample", "meta") %test:assertXPath("$result//* = 'Beispieldatei zum Testen'")
+    %test:args("ahiqar_agg", "agg") %test:assertXPath("$result//@* = 'textgrid:ahiqar_sample'")
+    %test:args("ahiqar_sample", "sata") %test:assertError("COMMONS001")
+    %test:args("qwerty", "data") %test:assertError("COMMONS002")
+function ct:get-document($uri as xs:string,
+    $type as xs:string)
+as document-node()? {
+    commons:get-document($uri, $type)
 };
-- 
GitLab


From 2069fa34ec49772fe82169041e1df45f35a48722 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 11:35:23 +0100
Subject: [PATCH 057/155] feat: only return aggregates that exist in database

---
 exist-app/data/ahiqar_agg.xml        |  3 ++-
 exist-app/modules/annotations.xqm    | 35 ++++------------------------
 exist-app/modules/commons.xqm        | 13 +++++++++++
 exist-app/modules/tapi-txt.xqm       | 15 +++---------
 exist-app/tests/annotation-tests.xqm |  6 ++---
 exist-app/tests/commons-tests.xqm    |  8 +++++++
 exist-app/tests/tapi-txt-tests.xqm   |  7 ------
 7 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/exist-app/data/ahiqar_agg.xml b/exist-app/data/ahiqar_agg.xml
index 67a6389..5b4d835 100644
--- a/exist-app/data/ahiqar_agg.xml
+++ b/exist-app/data/ahiqar_agg.xml
@@ -1,5 +1,6 @@
 <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
     <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:ahiqar_agg.0">
         <ore:aggregates rdf:resource="textgrid:ahiqar_sample"/>
+        <ore:aggregates rdf:resource="textgrid:ahiqar_sample_faux"/>
     </rdf:Description>
-</rdf:RDF>
+</rdf:RDF>
\ No newline at end of file
diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 6a0f5c0..e3759ae 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -46,7 +46,7 @@ declare variable $anno:annotationElements :=
 (: this variable holds a map with the complete project structure (excluding images) :)
 declare variable $anno:uris :=
     let $main-edition-object := "3r132"
-    let $language-aggs := anno:get-uris($main-edition-object)
+    let $language-aggs := commons:get-available-aggregates($main-edition-object)
     return
         map { $main-edition-object:
                 (: level 1: language aggregations :)
@@ -54,10 +54,10 @@ declare variable $anno:uris :=
                 map:entry($lang, 
                     (: level 2 (key): editions associated to a language aggregation :)
                     map:merge(
-                            let $editions := anno:get-uris($lang)
-                            for $uri in $editions[not(. = "3rrnp")] return
+                            let $editions := commons:get-available-aggregates($lang)
+                            for $uri in $editions return
                                 (: level 2 (value): XML associated with edition :)
-                                let $edition-parts := anno:get-uris($uri)
+                                let $edition-parts := commons:get-available-aggregates($uri)
                                 for $part in $edition-parts
                                 return
                                     if (anno:is-resource-xml($part)) then
@@ -69,12 +69,6 @@ declare variable $anno:uris :=
         }
     ;
 
-(: 
- : ##################
- : # REST ENDPOINTS #
- : ##################
- :)
-
 (:~
  : Returns annotation information about a single collection. Although this works for all collections,
  : it has mainly been designed for Ahikar's main collection, 3r132.
@@ -717,27 +711,6 @@ $document as xs:string?, $page as xs:string?, $server as xs:string) {
             ()
 };
 
-
-(:~
- : Returns a sequence of URIs that are part of a given aggregation.
- : 
- : @param $resource The URI of the current aggregation, e.g. '3r9ps'
- : @return A sequence of resource URIs that are part of the given aggregation
- : @error The resource provided isn't an aggregation or the file couldn't be opened
- :)
-declare function anno:get-uris($resource as xs:string) as xs:string+ {
-    let $resource-doc :=
-        try {
-            commons:get-document($resource, "agg")
-        } catch * {
-            error(QName($anno:ns, "ANNO01"), 
-                $resource || " is either not an aggregation or could not be found in the database.")
-        }
-            
-    return
-        for $res in $resource-doc//ore:aggregates/@rdf:resource return substring-after($res, "textgrid:")
-};
-
 (:~
  : Checks if a given resource is a TEI/XML.
  : 
diff --git a/exist-app/modules/commons.xqm b/exist-app/modules/commons.xqm
index b9db008..10d92bd 100644
--- a/exist-app/modules/commons.xqm
+++ b/exist-app/modules/commons.xqm
@@ -54,3 +54,16 @@ as document-node()? {
         else
             error(QName($commons:ns, "COMMONS002"), "URI " || $uri || " not found.")
 };
+
+declare function commons:get-available-aggregates($aggregation-uri as xs:string)
+as xs:string* {
+    let $aggregation-doc := commons:get-document($aggregation-uri, "agg")
+    for $aggregate in $aggregation-doc//ore:aggregates/@rdf:resource
+        let $unprefixed-uri := substring-after($aggregate, "textgrid:")
+        let $aggregate-base-uri := $commons:meta || $unprefixed-uri || ".xml"
+        return
+            if (doc-available($aggregate-base-uri)) then
+                $unprefixed-uri
+            else
+                ()
+};
\ No newline at end of file
diff --git a/exist-app/modules/tapi-txt.xqm b/exist-app/modules/tapi-txt.xqm
index 577661b..a244435 100644
--- a/exist-app/modules/tapi-txt.xqm
+++ b/exist-app/modules/tapi-txt.xqm
@@ -279,17 +279,8 @@ declare function tapi-txt:get-format($uri as xs:string) as xs:string {
 
 declare function tapi-txt:get-tei-xml-uri-from-edition($document-uri as xs:string)
 as xs:string {
-    let $aggregates := tapi-txt:get-edition-aggregates-without-uri-namespace($document-uri)
-    return
-        tapi-txt:get-tei-xml-from-aggregates($aggregates)
-};
-
-
-declare function tapi-txt:get-edition-aggregates-without-uri-namespace($document-uri as xs:string)
-as xs:string+ {
-    let $edition := commons:get-document($document-uri, "agg")
-    for $agg in $edition//ore:aggregates/@rdf:resource return
-        replace($agg, "textgrid:", "")
+    commons:get-available-aggregates($document-uri)
+    => tapi-txt:get-tei-xml-from-aggregates()
 };
 
 
@@ -313,4 +304,4 @@ as element(tei:text) {
 declare function tapi-txt:compress-to-zip()
 as xs:base64Binary* {
     compression:zip(xs:anyURI($commons:tg-collection || "/txt/"), false())
-};
+};
\ No newline at end of file
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index dcd5c86..afa8446 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -12,9 +12,9 @@ import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:o
 import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/annotations.xqm";
 
 declare
-    %test:assertTrue
-function at:success() {
-    true()
+    %test:assertFalse
+function at:fail() {
+    false()
 };
 
 
diff --git a/exist-app/tests/commons-tests.xqm b/exist-app/tests/commons-tests.xqm
index 1a3374a..bbc7f18 100644
--- a/exist-app/tests/commons-tests.xqm
+++ b/exist-app/tests/commons-tests.xqm
@@ -37,3 +37,11 @@ function ct:get-document($uri as xs:string,
 as document-node()? {
     commons:get-document($uri, $type)
 };
+
+declare
+    %test:args("ahiqar_agg") %test:assertEquals("ahiqar_sample")
+    %test:args("qwerty") %test:assertError("COMMONS002")
+function ct:get-available-aggregates($uri as xs:string)
+as xs:string+ {
+    commons:get-available-aggregates($uri)
+};
diff --git a/exist-app/tests/tapi-txt-tests.xqm b/exist-app/tests/tapi-txt-tests.xqm
index eb82e33..4700e67 100644
--- a/exist-app/tests/tapi-txt-tests.xqm
+++ b/exist-app/tests/tapi-txt-tests.xqm
@@ -465,13 +465,6 @@ function ttt:get-tei-xml-uri-from-edition($document as xs:string) {
 };
 
 
-declare
-    %test:args("ahiqar_agg") %test:assertEquals("ahiqar_sample")
-function ttt:get-edition-aggregates-without-uri-namespace($document as xs:string) {
-    tapi-txt:get-edition-aggregates-without-uri-namespace($document)
-};
-
-
 declare
     %test:args("ahiqar_sample") %test:assertEquals("ahiqar_sample")
 function ttt:get-tei-xml-from-aggregates($aggregates as xs:string+) {
-- 
GitLab


From 190cf94770306e48b150eea10b183054d198aba4 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 12:05:41 +0100
Subject: [PATCH 058/155] refactor: is-resource-edition, add missing tests

---
 exist-app/modules/annotations.xqm    | 10 ++++--
 exist-app/tests/annotation-tests.xqm | 52 ++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index e3759ae..9e7cbd3 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -601,6 +601,7 @@ declare function anno:get-bodyValue($annotation as node()) as xs:string {
  : @param $resources The URI of the resources to be checked
  : @return true() if all resources are available
  :)
+(:  ## tested ## :)
 declare function anno:are-resources-available($resources as xs:string+)
 as xs:boolean {
     let $availability :=
@@ -619,6 +620,7 @@ as xs:boolean {
  : @param $resources The URIs of resource's requested in an API call
  : @return The response header
  :)
+(:  ## tested ## :)
 declare function anno:get-404-header($resources as xs:string+) {
     <rest:response>
         <http:response xmlns:http="http://expath.org/ns/http-client" 
@@ -717,20 +719,21 @@ $document as xs:string?, $page as xs:string?, $server as xs:string) {
  : @param $uri The resource's URI
  : @return true() if resources stated by $uri is a TEI/XML resource
  :)
+ (: ## tested ## :)
 declare function anno:is-resource-xml($uri as xs:string) as xs:boolean {
     commons:get-document($uri, "meta")//tgmd:format = "text/xml"
 };
 
 (:~ 
  : Checks if the URI to a given resource belongs to an edition object. In this
- : case, its entry in $anno:uris isn't a map but a simple xs:string denoting the
- : URI of the corresponding TEI/XML.
+ : case, its format i text/tg.edition+tg.aggregation+xml.
  : 
  : @param $uri The resource's URI
  : @return true() if resources stated by $uri is an edition object
  :)
+ (: ## tested ## :)
 declare function anno:is-resource-edition($uri as xs:string) as xs:boolean {
-    not(anno:find-in-map($anno:uris, $uri) instance of map())
+    commons:get-document($uri, "meta")//tgmd:format = "text/tg.edition+tg.aggregation+xml"
 };
 
 (:~
@@ -739,6 +742,7 @@ declare function anno:is-resource-edition($uri as xs:string) as xs:boolean {
  : @param $documentURI The TEI resource's URI
  : @return A sequence of all page breaks occuring in the resource
  :)
+ (: ## tested ## :)
 declare function anno:get-pages-in-TEI($documentURI as xs:string) as xs:string+ {
     commons:get-document($documentURI, "data")//tei:pb[@facs]/@n/string()
 };
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index afa8446..0d3a628 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -17,6 +17,58 @@ function at:fail() {
     false()
 };
 
+declare
+    %test:args("ahiqar_sample") %test:assertTrue
+    %test:args("ahiqar_agg") %test:assertFalse
+function at:is-resource-xml($uri as xs:string)
+as xs:boolean {
+    anno:is-resource-xml($uri)
+};
+
+declare
+    %test:args("ahiqar_sample") %test:assertFalse
+    %test:args("ahiqar_agg") %test:assertTrue
+function at:is-resource-edition($uri as xs:string)
+as xs:boolean {
+    anno:is-resource-edition($uri)
+};
+
+declare
+    %test:args("ahiqar_sample") %test:assertXPath("count($result) = 4")
+    %test:args("ahiqar_sample") %test:assertXPath("$result = '82a'")
+function at:get-pages-in-TEI($uri as xs:string)
+as xs:string+ {
+    anno:get-pages-in-TEI($uri)
+};
+
+declare
+    %test:assertTrue
+function at:are-resources-available-true()
+as xs:boolean {
+    let $resources := "ahiqar_sample"
+    return
+        anno:are-resources-available($resources)
+};
+
+declare
+    %test:assertFalse
+function at:are-resources-available-false()
+as xs:boolean {
+    let $resources := ("qwerty", "ahiqar_sample")
+    return
+        anno:are-resources-available($resources)
+};
+
+declare
+    %test:assertXPath("$result//@status = '404'")
+    %test:assertXPath("$result//@message = 'One of the following requested resources couldn''t be found: qwerty, ahiqar_sample'")
+function at:get-404-header()
+as element() {
+    let $resources := ("qwerty", "ahiqar_sample")
+    return
+       anno:get-404-header($resources)
+};
+
 
 (:declare:)
 (:    %test:args("3r679", "114r"):)
-- 
GitLab


From 8753b90395c72afb8988e4fcbb9833c4ea794cb2 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 13:34:52 +0100
Subject: [PATCH 059/155] tests: add return type, remove unused module

---
 exist-app/tests/tapi-collection-tests.xqm | 1 -
 exist-app/tests/tapi-manifest-tests.xqm   | 1 -
 exist-app/tests/test-commons.xqm          | 3 ++-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/exist-app/tests/tapi-collection-tests.xqm b/exist-app/tests/tapi-collection-tests.xqm
index 82b61b2..e7b12be 100644
--- a/exist-app/tests/tapi-collection-tests.xqm
+++ b/exist-app/tests/tapi-collection-tests.xqm
@@ -6,7 +6,6 @@ declare namespace http = "http://expath.org/ns/http-client";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
-import module namespace map="http://www.w3.org/2005/xpath-functions/map";
 import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace tapi-coll="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection" at "../modules/tapi-collection.xqm";
diff --git a/exist-app/tests/tapi-manifest-tests.xqm b/exist-app/tests/tapi-manifest-tests.xqm
index d2d828b..a10304c 100644
--- a/exist-app/tests/tapi-manifest-tests.xqm
+++ b/exist-app/tests/tapi-manifest-tests.xqm
@@ -6,7 +6,6 @@ declare namespace http = "http://expath.org/ns/http-client";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
-import module namespace map="http://www.w3.org/2005/xpath-functions/map";
 import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace tapi-mani="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest" at "../modules/tapi-manifest.xqm";
diff --git a/exist-app/tests/test-commons.xqm b/exist-app/tests/test-commons.xqm
index eaa1777..2762d95 100644
--- a/exist-app/tests/test-commons.xqm
+++ b/exist-app/tests/test-commons.xqm
@@ -18,7 +18,8 @@ declare function tc:get-http-status($url as xs:string) as xs:string {
         http:send-request($req)[1]/@status
 };
 
-declare function tc:make-request($url as xs:string) {
+declare function tc:make-request($url as xs:string)
+as element() {
     <http:request href="{$url}" method="get">
         <http:header name="Connection" value="close"/>
    </http:request>
-- 
GitLab


From ba9d4ef0b3461240b01800da238dc6f0574338ca Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 13:53:28 +0100
Subject: [PATCH 060/155] tests: add further tests, revert change of
 is-resource-edition

---
 exist-app/modules/annotations.xqm    | 45 +++++++++++-----
 exist-app/tests/annotation-tests.xqm | 78 +++++++++++++++++++++++-----
 2 files changed, 96 insertions(+), 27 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 9e7cbd3..cb1ffe6 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -161,7 +161,9 @@ declare function anno:get-information-for-collection-object($collectionURI as xs
  : @param $uri The resource's URI
  : @return The resource's title
  :)
-declare function anno:get-metadata-title($uri as xs:string) as xs:string {
+(: ## tested ## :)
+declare function anno:get-metadata-title($uri as xs:string)
+as xs:string {
     commons:get-document($uri, "meta")//tgmd:title/string()
 };
 
@@ -368,7 +370,10 @@ $document as xs:string, $page as xs:string) {
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  :)
 declare function anno:make-annotationCollection-for-manifest($collection as xs:string,
-$document as xs:string, $page as xs:string, $server as xs:string) {
+    $document as xs:string,
+    $page as xs:string,
+    $server as xs:string)
+as map() {
     let $title := anno:get-metadata-title($collection)
 
     return
@@ -376,7 +381,7 @@ $document as xs:string, $page as xs:string, $server as xs:string) {
             "annotationCollection":
                 map {
                     "@context": "http://www.w3.org/ns/anno.jsonld",
-                    "id":       $anno:ns || "/annotationCollection/" || $document || "-" || $page,
+                    "id":       $anno:ns || "/annotationCollection/" || $document || "/" || $page,
                     "type":     "AnnotationCollection",
                     "label":    "Ahikar annotations for textgrid:" || $document || ": " || $title || ", page " || $page,
                     "x-creator":  anno:get-creator($document),
@@ -507,7 +512,7 @@ declare function anno:get-annotations($documentURI as xs:string, $page as xs:str
  : @param $page The page to be returned as tei:pb/@n/string()
  :)
 declare function anno:get-page-fragment($documentURI as xs:string, $page as xs:string) {
-    let $nodeURI :=commons:get-document($documentURI, "data")/base-uri()
+    let $nodeURI := commons:get-document($documentURI, "data")/base-uri()
     return
         tapi-html:get-page-fragment($nodeURI, $page)
 };
@@ -570,7 +575,11 @@ declare function anno:get-all-xml-uris-for-submap($map as map()) {
  : @param $id The node ID of the annotation. It is equivalent to generate-id($annotation)
  : @return A map containing the target information
  :)
-declare function anno:get-target-information($annotation as node(), $documentURI as xs:string, $id as xs:string) as map(*) {
+(: ## tested ## :)
+declare function anno:get-target-information($annotation as node(),
+    $documentURI as xs:string,
+    $id as xs:string)
+as map(*) {
     map {
         "id": $anno:ns || "/" || $documentURI || "/"|| $id,
         "format": "text/xml",
@@ -587,7 +596,9 @@ declare function anno:get-target-information($annotation as node(), $documentURI
  : @param $annotation The node which serves as a basis for the annotation
  : @return The content of bodyValue.
  :)
-declare function anno:get-bodyValue($annotation as node()) as xs:string {
+(: ## tested ## :)
+declare function anno:get-bodyValue($annotation as node())
+as xs:string {
     switch ($annotation/local-name())
         case "persName" return "A person's name."
         case "placeName" return "A place's name."
@@ -726,14 +737,14 @@ declare function anno:is-resource-xml($uri as xs:string) as xs:boolean {
 
 (:~ 
  : Checks if the URI to a given resource belongs to an edition object. In this
- : case, its format i text/tg.edition+tg.aggregation+xml.
+ : case, its entry in $anno:uris isn't a map but a simple xs:string denoting the
+ : URI of the corresponding TEI/XML.
  : 
  : @param $uri The resource's URI
  : @return true() if resources stated by $uri is an edition object
  :)
- (: ## tested ## :)
 declare function anno:is-resource-edition($uri as xs:string) as xs:boolean {
-    commons:get-document($uri, "meta")//tgmd:format = "text/tg.edition+tg.aggregation+xml"
+    not(anno:find-in-map($anno:uris, $uri) instance of map())
 };
 
 (:~
@@ -757,7 +768,9 @@ declare function anno:get-pages-in-TEI($documentURI as xs:string) as xs:string+
  : @param $type "prev" for the previous, "next" for the next page break
  :)
 declare function anno:get-prev-or-next-page($documentURI as xs:string,
-$page as xs:string, $type as xs:string) as xs:string? {
+    $page as xs:string, 
+    $type as xs:string)
+as xs:string? {
     let $tei := anno:find-in-map($anno:uris, $documentURI)
     let $pages := anno:get-pages-in-TEI($tei)
     let $no-of-pages := count($pages)
@@ -841,10 +854,14 @@ declare function anno:get-prev-xml-uris($uri as xs:string) as xs:string* {
  : @param $uri The resource's URI
  : @return The URI of the given resource's parent aggregation
  :)
-declare function anno:get-parent-aggregation($uri as xs:string) as xs:string {
-  for $doc in collection($commons:agg) return
-    if ($doc//@rdf:resource[matches(., $uri)]) then
-        base-uri($doc) => substring-after("agg/") => substring-before(".xml")
+(: ## tested ## :)
+declare function anno:get-parent-aggregation($uri as xs:string)
+as xs:string? {
+    if (collection($commons:agg)[.//@rdf:resource = "textgrid:" || $uri]) then
+        collection($commons:agg)[.//@rdf:resource = "textgrid:" || $uri]
+        => base-uri()
+        => substring-after("agg/")
+        => substring-before(".xml")
     else
         ()
 };
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index 0d3a628..e01ecfc 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -11,11 +11,7 @@ import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/annotations.xqm";
 
-declare
-    %test:assertFalse
-function at:fail() {
-    false()
-};
+declare variable $at:sample-doc := doc($commons:data || "/ahiqar_sample.xml");
 
 declare
     %test:args("ahiqar_sample") %test:assertTrue
@@ -28,6 +24,7 @@ as xs:boolean {
 declare
     %test:args("ahiqar_sample") %test:assertFalse
     %test:args("ahiqar_agg") %test:assertTrue
+    %test:pending
 function at:is-resource-edition($uri as xs:string)
 as xs:boolean {
     anno:is-resource-edition($uri)
@@ -70,6 +67,69 @@ as element() {
 };
 
 
+declare
+    %test:args("ahiqar_sample") %test:assertEquals("ahiqar_agg")
+    %test:args("ahiqar_agg") %test:assertEquals("ahiqar_collection")
+    %test:args("ahiqar_collection") %test:assertEmpty
+function at:get-parent-aggregation($uri as xs:string)
+as xs:string? {
+    anno:get-parent-aggregation($uri)
+};
+
+declare
+    %test:args("ahiqar_sample", "82a", "next") %test:assertEquals("82b")
+    %test:args("ahiqar_sample", "82b", "prev") %test:assertEquals("82a")
+    %test:args("ahiqar_sample", "83b", "next") %test:assertEmpty
+    %test:args("ahiqar_sample", "82a", "prev") %test:assertEmpty
+    %test:pending
+function at:get-prev-or-next-page($documentURI as xs:string,
+    $page as xs:string, 
+    $type as xs:string)
+as xs:string? {
+    anno:get-prev-or-next-page($documentURI, $page, $type)
+};
+
+declare
+    %test:args("ahiqar_sample") %test:assertEquals("Beispieldatei zum Testen")
+function at:get-metadata-title($uri as xs:string)
+as xs:string {
+    anno:get-metadata-title($uri)
+};
+
+declare
+    %test:assertEquals("A place's name.")
+function at:anno-get-bodyValue() {
+    let $annotation := $at:sample-doc//tei:text[@type = "transcription"]/descendant::tei:placeName[1]
+    return
+        anno:get-bodyValue($annotation)
+};
+
+declare
+    %test:args("ahiqar_sample", "N1.2.3.4")
+    %test:assertXPath("map:get($result, 'id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/ahiqar_sample/N1.2.3.4'")
+    %test:assertXPath("map:get($result, 'format') = 'text/xml'")
+    %test:assertXPath("map:get($result, 'language') = 'karshuni'")
+function at:get-target-information($documentURI as xs:string,
+    $id as xs:string)
+as map() {
+    let $annotation := $at:sample-doc//tei:text[@type = "transcription"]/descendant::tei:placeName[1]
+    return
+        anno:get-target-information($annotation, $documentURI, $id)
+};
+
+declare
+    %test:args("ahiqar_collection", "ahiqar_agg", "82a", "http://localhost:8080")
+    %test:assertXPath("map:get($result, 'annotationCollection') => map:get('id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationCollection/ahiqar_agg/82a'")
+    %test:assertXPath("map:get($result, 'annotationCollection') => map:get('label') = 'Ahikar annotations for textgrid:ahiqar_agg: Beispieldatei zum Testen, page 82a'")
+    %test:pending
+function at:make-annotationCollection-for-manifest($collection as xs:string,
+    $document as xs:string,
+    $page as xs:string,
+    $server as xs:string)
+as map() {
+    anno:make-annotationCollection-for-manifest($collection, $document, $page, $server)
+};
+
 (:declare:)
 (:    %test:args("3r679", "114r"):)
 (:    %test:assertEquals("0"):)
@@ -117,14 +177,6 @@ as element() {
 (:};:)
 
 
-(:declare:)
-(:    %test:assertEquals("A place's name."):)
-(:function at:anno-get-bodyValue() {:)
-(:    let $annotation := doc("/db/test-records/sample-tei.xml")//tei:placeName:)
-(:    return:)
-(:        anno:get-bodyValue($annotation):)
-(:};:)
-(::)
 (::)
 (:declare:)
 (:    %test:args("asdf"):)
-- 
GitLab


From bfb3e9ec6cf0104149d014c4d4d9013d41c27ffa Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 13:56:12 +0100
Subject: [PATCH 061/155] ci: remove surplus download

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bdd583..a6a7d1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,18 +56,17 @@ test_exist_app:
     reports:
       junit: exist-app/test/ahikar-test-results.xml
 
-build_exist_app-all:
+build_exist_app:
   image: docker.gitlab.gwdg.de/fontane-notizbuecher/build:latest
   stage: build
   script:
     - cd exist-app
-    - ant -propertyfile ${CI_COMMIT_REF_NAME}.build.properties prepare
+    - ant xar
     - FILENAME=$(ls build/ahikar*.xar)
     - curl -u ci:${EXIST_UPLOAD_PW} -X POST -F file=@${FILENAME} https://ci.de.dariah.eu/exist-upload
   artifacts:
     paths:
       - exist-app/build/*.xar
-      - exist-app/build/dependencies/*.xar
   
 load_frontend-all:
   image: docker.gitlab.gwdg.de/fontane-notizbuecher/build:latest
-- 
GitLab


From cc6eed002b33fc4d5a5e19d6a70f5fcb05f6764c Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 14:16:59 +0100
Subject: [PATCH 062/155] revert last commit

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6a7d1b..282217e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,12 +61,13 @@ build_exist_app:
   stage: build
   script:
     - cd exist-app
-    - ant xar
+    - ant -propertyfile ${CI_COMMIT_REF_NAME}.build.properties prepare
     - FILENAME=$(ls build/ahikar*.xar)
     - curl -u ci:${EXIST_UPLOAD_PW} -X POST -F file=@${FILENAME} https://ci.de.dariah.eu/exist-upload
   artifacts:
     paths:
       - exist-app/build/*.xar
+      - exist-app/build/dependencies/*.xar
   
 load_frontend-all:
   image: docker.gitlab.gwdg.de/fontane-notizbuecher/build:latest
-- 
GitLab


From d8e8a12eeb9ab49eb5fce2ab2e143a3296f58e7d Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 13 Nov 2020 15:19:03 +0100
Subject: [PATCH 063/155] tests: add separate map for testint

---
 exist-app/modules/annotations.xqm | 62 ++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index cb1ffe6..5e516de 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -45,28 +45,46 @@ declare variable $anno:annotationElements :=
 
 (: this variable holds a map with the complete project structure (excluding images) :)
 declare variable $anno:uris :=
-    let $main-edition-object := "3r132"
-    let $language-aggs := commons:get-available-aggregates($main-edition-object)
-    return
-        map { $main-edition-object:
-                (: level 1: language aggregations :)
-                map:merge(for $lang in $language-aggs return
-                map:entry($lang, 
-                    (: level 2 (key): editions associated to a language aggregation :)
-                    map:merge(
-                            let $editions := commons:get-available-aggregates($lang)
-                            for $uri in $editions return
-                                (: level 2 (value): XML associated with edition :)
-                                let $edition-parts := commons:get-available-aggregates($uri)
-                                for $part in $edition-parts
-                                return
-                                    if (anno:is-resource-xml($part)) then
-                                        map:entry($uri, $part)
-                                    else
-                                        ()
-                    )
-                ))
-        }
+    if (doc-available($commons:agg || "3r132.xml")) then
+        let $main-edition-object := "3r132"
+        let $language-aggs := commons:get-available-aggregates($main-edition-object)
+        return
+            map { $main-edition-object:
+                    (: level 1: language aggregations :)
+                    map:merge(for $lang in $language-aggs return
+                    map:entry($lang, 
+                        (: level 2 (key): editions associated to a language aggregation :)
+                        map:merge(
+                                let $editions := commons:get-available-aggregates($lang)
+                                for $uri in $editions return
+                                    (: level 2 (value): XML associated with edition :)
+                                    let $edition-parts := commons:get-available-aggregates($uri)
+                                    for $part in $edition-parts
+                                    return
+                                        if (anno:is-resource-xml($part)) then
+                                            map:entry($uri, $part)
+                                        else
+                                            ()
+                        )
+                    ))
+            }
+    else
+        let $main-edition-object := "ahiqar_collection"
+        let $editions := commons:get-available-aggregates($main-edition-object)
+        return
+            map { $main-edition-object:
+                map:merge(
+                    for $uri in $editions return
+                        (: level 2 (value): XML associated with edition :)
+                        let $edition-parts := commons:get-available-aggregates($uri)
+                        for $part in $edition-parts
+                        return
+                            if (anno:is-resource-xml($part)) then
+                                map:entry($uri, $part)
+                            else
+                                ()
+                )
+            }
     ;
 
 (:~
-- 
GitLab


From a859aa6c32add3448cc0f66ab315a2d9ec36e704 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 07:53:01 +0100
Subject: [PATCH 064/155] feat: rename and add sample files to match project
 structure

---
 .../{ahiqar_agg.xml => sample_edition.xml}    |  4 +-
 ...r_agg_meta.xml => sample_edition_meta.xml} |  2 +-
 exist-app/data/sample_lang_aggregation.xml    |  5 ++
 .../data/sample_lang_aggregation_meta.xml     | 22 +++++++++
 ...collection.xml => sample_main_edition.xml} |  4 +-
 ..._meta.xml => sample_main_edition_meta.xml} |  2 +-
 .../{ahiqar_sample.xml => sample_teixml.xml}  |  0
 ...sample_meta.xml => sample_teixml_meta.xml} |  2 +-
 exist-app/modules/annotations.xqm             |  2 +-
 exist-app/post-install.xq                     | 16 ++++---
 exist-app/tests/annotation-tests.xqm          | 48 +++++++++----------
 exist-app/tests/commons-tests.xqm             | 14 +++---
 exist-app/tests/tapi-collection-tests.xqm     | 26 +++++-----
 exist-app/tests/tapi-html-tests.xqm           | 20 ++++----
 exist-app/tests/tapi-item-tests.xqm           | 20 ++++----
 exist-app/tests/tapi-manifest-tests.xqm       | 26 +++++-----
 exist-app/tests/tapi-tests.xqm                | 22 ++++-----
 exist-app/tests/tapi-txt-tests.xqm            | 30 ++++++------
 18 files changed, 147 insertions(+), 118 deletions(-)
 rename exist-app/data/{ahiqar_agg.xml => sample_edition.xml} (71%)
 rename exist-app/data/{ahiqar_agg_meta.xml => sample_edition_meta.xml} (93%)
 create mode 100644 exist-app/data/sample_lang_aggregation.xml
 create mode 100644 exist-app/data/sample_lang_aggregation_meta.xml
 rename exist-app/data/{ahiqar_collection.xml => sample_main_edition.xml} (65%)
 rename exist-app/data/{ahiqar_collection_meta.xml => sample_main_edition_meta.xml} (92%)
 rename exist-app/data/{ahiqar_sample.xml => sample_teixml.xml} (100%)
 rename exist-app/data/{ahiqar_sample_meta.xml => sample_teixml_meta.xml} (93%)

diff --git a/exist-app/data/ahiqar_agg.xml b/exist-app/data/sample_edition.xml
similarity index 71%
rename from exist-app/data/ahiqar_agg.xml
rename to exist-app/data/sample_edition.xml
index 5b4d835..259105e 100644
--- a/exist-app/data/ahiqar_agg.xml
+++ b/exist-app/data/sample_edition.xml
@@ -1,6 +1,6 @@
 <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-    <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:ahiqar_agg.0">
-        <ore:aggregates rdf:resource="textgrid:ahiqar_sample"/>
+    <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_edition.0">
+        <ore:aggregates rdf:resource="textgrid:sample_teixml"/>
         <ore:aggregates rdf:resource="textgrid:ahiqar_sample_faux"/>
     </rdf:Description>
 </rdf:RDF>
\ No newline at end of file
diff --git a/exist-app/data/ahiqar_agg_meta.xml b/exist-app/data/sample_edition_meta.xml
similarity index 93%
rename from exist-app/data/ahiqar_agg_meta.xml
rename to exist-app/data/sample_edition_meta.xml
index be6c810..e1625b5 100644
--- a/exist-app/data/ahiqar_agg_meta.xml
+++ b/exist-app/data/sample_edition_meta.xml
@@ -7,7 +7,7 @@
                 <notes/>
             </provided>
             <generated>
-              <textgridUri extRef="">textgrid:ahiqar_agg.0</textgridUri>
+              <textgridUri extRef="">textgrid:sample_edition.0</textgridUri>
             </generated>
         </generic>
         <edition>
diff --git a/exist-app/data/sample_lang_aggregation.xml b/exist-app/data/sample_lang_aggregation.xml
new file mode 100644
index 0000000..de973ee
--- /dev/null
+++ b/exist-app/data/sample_lang_aggregation.xml
@@ -0,0 +1,5 @@
+<rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation.0">
+        <ore:aggregates rdf:resource="textgrid:sample_edition"/>
+    </rdf:Description>
+</rdf:RDF>
\ No newline at end of file
diff --git a/exist-app/data/sample_lang_aggregation_meta.xml b/exist-app/data/sample_lang_aggregation_meta.xml
new file mode 100644
index 0000000..1752f2b
--- /dev/null
+++ b/exist-app/data/sample_lang_aggregation_meta.xml
@@ -0,0 +1,22 @@
+<MetadataContainerType xmlns="http://textgrid.info/namespaces/metadata/core/2010" xmlns:ns2="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <object>
+        <generic>
+            <provided>
+                <title>Beispieldatei für Sprachenaggregation</title>
+                <format>text/tg.aggregation+xml</format>
+                <notes/>
+            </provided>
+            <generated>
+              <textgridUri extRef="">textgrid:sample_lang_aggregation.0</textgridUri>
+            </generated>
+        </generic>
+        <edition>
+            <isEditionOf/>
+            <agent role="actor" id=""/>
+        </edition>
+        <custom>
+            <cns:templateEditor xmlns:tgs="http://www.textgrid.info/namespaces/middleware/tgsearch" xmlns:tg="http://textgrid.info/relation-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cns="http://textgrid.info/custom-namespace/2009-01-01" xmlns:ns4="http://textgrid.info/namespaces/middleware/tgcrud/services/TGCrudService" xmlns:ns3="http://textgrid.info/namespaces/metadata/core/2010"/>
+        </custom>
+        <relations/>
+    </object>
+</MetadataContainerType>
diff --git a/exist-app/data/ahiqar_collection.xml b/exist-app/data/sample_main_edition.xml
similarity index 65%
rename from exist-app/data/ahiqar_collection.xml
rename to exist-app/data/sample_main_edition.xml
index 123a6b3..c5fad93 100644
--- a/exist-app/data/ahiqar_collection.xml
+++ b/exist-app/data/sample_main_edition.xml
@@ -1,5 +1,5 @@
 <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-    <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:ahiqar_collection.0">
-        <ore:aggregates rdf:resource="textgrid:ahiqar_agg"/>
+    <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_main_edition.0">
+        <ore:aggregates rdf:resource="textgrid:sample_lang_aggregation"/>
     </rdf:Description>
 </rdf:RDF>
diff --git a/exist-app/data/ahiqar_collection_meta.xml b/exist-app/data/sample_main_edition_meta.xml
similarity index 92%
rename from exist-app/data/ahiqar_collection_meta.xml
rename to exist-app/data/sample_main_edition_meta.xml
index 015cc67..5aef6d3 100644
--- a/exist-app/data/ahiqar_collection_meta.xml
+++ b/exist-app/data/sample_main_edition_meta.xml
@@ -7,7 +7,7 @@
                 <notes/>
             </provided>
             <generated>
-              <textgridUri extRef="">textgrid:ahiqar_collection.0</textgridUri>
+              <textgridUri extRef="">textgrid:sample_main_edition.0</textgridUri>
             </generated>
         </generic>
         <edition>
diff --git a/exist-app/data/ahiqar_sample.xml b/exist-app/data/sample_teixml.xml
similarity index 100%
rename from exist-app/data/ahiqar_sample.xml
rename to exist-app/data/sample_teixml.xml
diff --git a/exist-app/data/ahiqar_sample_meta.xml b/exist-app/data/sample_teixml_meta.xml
similarity index 93%
rename from exist-app/data/ahiqar_sample_meta.xml
rename to exist-app/data/sample_teixml_meta.xml
index a73bf40..69132f1 100644
--- a/exist-app/data/ahiqar_sample_meta.xml
+++ b/exist-app/data/sample_teixml_meta.xml
@@ -7,7 +7,7 @@
                 <notes/>
             </provided>
             <generated>
-              <textgridUri extRef="">textgrid:ahiqar_sample.0</textgridUri>
+              <textgridUri extRef="">textgrid:sample_teixml.0</textgridUri>
             </generated>
         </generic>
         <item/>
diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 5e516de..7672547 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -69,7 +69,7 @@ declare variable $anno:uris :=
                     ))
             }
     else
-        let $main-edition-object := "ahiqar_collection"
+        let $main-edition-object := "sample_main_edition"
         let $editions := commons:get-available-aggregates($main-edition-object)
         return
             map { $main-edition-object:
diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index b8e8e62..35eb282 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -18,7 +18,7 @@ declare function local:move-and-rename($filename as xs:string) as item()* {
                     xmldb:rename($target-meta-collection, $filename, $new-filename)
                 )
         else
-            if (matches($filename, "sample")) then
+            if (matches($filename, "teixml")) then
                 xmldb:move($data-file-path, $target-data-collection, $filename)
             else
                 xmldb:move($data-file-path, $target-agg-collection, $filename)
@@ -64,14 +64,16 @@ return (sm:chown($path, "admin"), sm:chmod($path, "rwsrwxr-x"))),
 ( 
     let $files := 
         ( 
-        "ahiqar_sample.xml",
-        "ahiqar_sample_meta.xml",
-        "ahiqar_agg.xml",
-        "ahiqar_agg_meta.xml",
+        "sample_teixml.xml",
+        "sample_teixml_meta.xml",
+        "sample_edition.xml",
+        "sample_edition_meta.xml",
         "ahiqar_images.xml",
         "ahiqar_images_meta.xml",
-        "ahiqar_collection.xml",
-        "ahiqar_collection_meta.xml")
+        "sample_main_edition.xml",
+        "sample_main_edition_meta.xml",
+        "sample_lang_aggregation.xml",
+        "sample_lang_aggregation_meta.xml")
     return
         ( 
             for $file in $files return
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index e01ecfc..5f873ee 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -11,19 +11,19 @@ import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/annotations.xqm";
 
-declare variable $at:sample-doc := doc($commons:data || "/ahiqar_sample.xml");
+declare variable $at:sample-doc := doc($commons:data || "/sample_teixml.xml");
 
 declare
-    %test:args("ahiqar_sample") %test:assertTrue
-    %test:args("ahiqar_agg") %test:assertFalse
+    %test:args("sample_teixml") %test:assertTrue
+    %test:args("sample_edition") %test:assertFalse
 function at:is-resource-xml($uri as xs:string)
 as xs:boolean {
     anno:is-resource-xml($uri)
 };
 
 declare
-    %test:args("ahiqar_sample") %test:assertFalse
-    %test:args("ahiqar_agg") %test:assertTrue
+    %test:args("sample_teixml") %test:assertFalse
+    %test:args("sample_edition") %test:assertTrue
     %test:pending
 function at:is-resource-edition($uri as xs:string)
 as xs:boolean {
@@ -31,8 +31,8 @@ as xs:boolean {
 };
 
 declare
-    %test:args("ahiqar_sample") %test:assertXPath("count($result) = 4")
-    %test:args("ahiqar_sample") %test:assertXPath("$result = '82a'")
+    %test:args("sample_teixml") %test:assertXPath("count($result) = 4")
+    %test:args("sample_teixml") %test:assertXPath("$result = '82a'")
 function at:get-pages-in-TEI($uri as xs:string)
 as xs:string+ {
     anno:get-pages-in-TEI($uri)
@@ -42,7 +42,7 @@ declare
     %test:assertTrue
 function at:are-resources-available-true()
 as xs:boolean {
-    let $resources := "ahiqar_sample"
+    let $resources := "sample_teixml"
     return
         anno:are-resources-available($resources)
 };
@@ -51,36 +51,36 @@ declare
     %test:assertFalse
 function at:are-resources-available-false()
 as xs:boolean {
-    let $resources := ("qwerty", "ahiqar_sample")
+    let $resources := ("qwerty", "sample_teixml")
     return
         anno:are-resources-available($resources)
 };
 
 declare
     %test:assertXPath("$result//@status = '404'")
-    %test:assertXPath("$result//@message = 'One of the following requested resources couldn''t be found: qwerty, ahiqar_sample'")
+    %test:assertXPath("$result//@message = 'One of the following requested resources couldn''t be found: qwerty, sample_teixml'")
 function at:get-404-header()
 as element() {
-    let $resources := ("qwerty", "ahiqar_sample")
+    let $resources := ("qwerty", "sample_teixml")
     return
        anno:get-404-header($resources)
 };
 
 
 declare
-    %test:args("ahiqar_sample") %test:assertEquals("ahiqar_agg")
-    %test:args("ahiqar_agg") %test:assertEquals("ahiqar_collection")
-    %test:args("ahiqar_collection") %test:assertEmpty
+    %test:args("sample_teixml") %test:assertEquals("sample_edition")
+    %test:args("sample_edition") %test:assertEquals("sample_lang_aggregation")
+    %test:args("sample_main_edition") %test:assertEmpty
 function at:get-parent-aggregation($uri as xs:string)
 as xs:string? {
     anno:get-parent-aggregation($uri)
 };
 
 declare
-    %test:args("ahiqar_sample", "82a", "next") %test:assertEquals("82b")
-    %test:args("ahiqar_sample", "82b", "prev") %test:assertEquals("82a")
-    %test:args("ahiqar_sample", "83b", "next") %test:assertEmpty
-    %test:args("ahiqar_sample", "82a", "prev") %test:assertEmpty
+    %test:args("sample_teixml", "82a", "next") %test:assertEquals("82b")
+    %test:args("sample_teixml", "82b", "prev") %test:assertEquals("82a")
+    %test:args("sample_teixml", "83b", "next") %test:assertEmpty
+    %test:args("sample_teixml", "82a", "prev") %test:assertEmpty
     %test:pending
 function at:get-prev-or-next-page($documentURI as xs:string,
     $page as xs:string, 
@@ -90,7 +90,7 @@ as xs:string? {
 };
 
 declare
-    %test:args("ahiqar_sample") %test:assertEquals("Beispieldatei zum Testen")
+    %test:args("sample_teixml") %test:assertEquals("Beispieldatei zum Testen")
 function at:get-metadata-title($uri as xs:string)
 as xs:string {
     anno:get-metadata-title($uri)
@@ -105,8 +105,8 @@ function at:anno-get-bodyValue() {
 };
 
 declare
-    %test:args("ahiqar_sample", "N1.2.3.4")
-    %test:assertXPath("map:get($result, 'id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/ahiqar_sample/N1.2.3.4'")
+    %test:args("sample_teixml", "N1.2.3.4")
+    %test:assertXPath("map:get($result, 'id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/sample_teixml/N1.2.3.4'")
     %test:assertXPath("map:get($result, 'format') = 'text/xml'")
     %test:assertXPath("map:get($result, 'language') = 'karshuni'")
 function at:get-target-information($documentURI as xs:string,
@@ -118,9 +118,9 @@ as map() {
 };
 
 declare
-    %test:args("ahiqar_collection", "ahiqar_agg", "82a", "http://localhost:8080")
-    %test:assertXPath("map:get($result, 'annotationCollection') => map:get('id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationCollection/ahiqar_agg/82a'")
-    %test:assertXPath("map:get($result, 'annotationCollection') => map:get('label') = 'Ahikar annotations for textgrid:ahiqar_agg: Beispieldatei zum Testen, page 82a'")
+    %test:args("sample_main_edition", "sample_edition", "82a", "http://localhost:8080")
+    %test:assertXPath("map:get($result, 'annotationCollection') => map:get('id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationCollection/sample_edition/82a'")
+    %test:assertXPath("map:get($result, 'annotationCollection') => map:get('label') = 'Ahikar annotations for textgrid:sample_edition: Beispieldatei zum Testen, page 82a'")
     %test:pending
 function at:make-annotationCollection-for-manifest($collection as xs:string,
     $document as xs:string,
diff --git a/exist-app/tests/commons-tests.xqm b/exist-app/tests/commons-tests.xqm
index bbc7f18..773d970 100644
--- a/exist-app/tests/commons-tests.xqm
+++ b/exist-app/tests/commons-tests.xqm
@@ -12,14 +12,14 @@ import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:o
 declare variable $ct:restxq := "http://0.0.0.0:8080/exist/restxq/";
 
 declare
-    %test:args("ahiqar_agg") %test:assertEquals("ahiqar_sample")
+    %test:args("sample_edition") %test:assertEquals("sample_teixml")
 function ct:get-xml-uri($manifest-uri as xs:string)
 as xs:string {
     commons:get-xml-uri($manifest-uri)
 };
 
 declare
-    %test:args("ahiqar_agg") %test:assertXPath("$result//*[local-name(.) = 'title'] = 'The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh,
+    %test:args("sample_edition") %test:assertXPath("$result//*[local-name(.) = 'title'] = 'The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh,
                king of Assyria and Nineveh'")
 function ct:get-tei-xml-for-manifest($manifest-uri) {
     commons:get-tei-xml-for-manifest($manifest-uri)
@@ -27,10 +27,10 @@ function ct:get-tei-xml-for-manifest($manifest-uri) {
 
 
 declare
-    %test:args("ahiqar_sample", "data") %test:assertXPath("$result/*[local-name(.) = 'TEI']")
-    %test:args("ahiqar_sample", "meta") %test:assertXPath("$result//* = 'Beispieldatei zum Testen'")
-    %test:args("ahiqar_agg", "agg") %test:assertXPath("$result//@* = 'textgrid:ahiqar_sample'")
-    %test:args("ahiqar_sample", "sata") %test:assertError("COMMONS001")
+    %test:args("sample_teixml", "data") %test:assertXPath("$result/*[local-name(.) = 'TEI']")
+    %test:args("sample_teixml", "meta") %test:assertXPath("$result//* = 'Beispieldatei zum Testen'")
+    %test:args("sample_edition", "agg") %test:assertXPath("$result//@* = 'textgrid:sample_teixml'")
+    %test:args("sample_teixml", "sata") %test:assertError("COMMONS001")
     %test:args("qwerty", "data") %test:assertError("COMMONS002")
 function ct:get-document($uri as xs:string,
     $type as xs:string)
@@ -39,7 +39,7 @@ as document-node()? {
 };
 
 declare
-    %test:args("ahiqar_agg") %test:assertEquals("ahiqar_sample")
+    %test:args("sample_edition") %test:assertEquals("sample_teixml")
     %test:args("qwerty") %test:assertError("COMMONS002")
 function ct:get-available-aggregates($uri as xs:string)
 as xs:string+ {
diff --git a/exist-app/tests/tapi-collection-tests.xqm b/exist-app/tests/tapi-collection-tests.xqm
index e7b12be..c65731a 100644
--- a/exist-app/tests/tapi-collection-tests.xqm
+++ b/exist-app/tests/tapi-collection-tests.xqm
@@ -42,7 +42,7 @@ function tct:_test-setup(){
         <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
             <rdf:Description rdf:about="test-aggregation-1">
-                <ore:aggregates rdf:resource="textgrid:ahiqar_sample"/>
+                <ore:aggregates rdf:resource="textgrid:sample_teixml"/>
             </rdf:Description>
         </rdf:RDF>
     let $agg1-meta :=
@@ -62,7 +62,7 @@ function tct:_test-setup(){
         <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
             <rdf:Description rdf:about="test-aggregation-2">
-                <ore:aggregates rdf:resource="textgrid:ahiqar_sample"/>
+                <ore:aggregates rdf:resource="textgrid:sample_teixml"/>
             </rdf:Description>
         </rdf:RDF>
     let $agg2-meta :=
@@ -102,7 +102,7 @@ function tct:_test-teardown() {
 };
 
 declare
-    %test:args("ahiqar_collection") %test:assertXPath("$result//*[local-name(.) = 'aggregates']")
+    %test:args("sample_main_edition") %test:assertXPath("$result//*[local-name(.) = 'aggregates']")
 function tct:get-aggregation($uri as xs:string) {
     tapi-coll:get-aggregation($uri)
 };
@@ -141,7 +141,7 @@ function tct:get-allowed-manifest-uris-mock-up-input-excluded() {
 
 
 declare
-    %test:args("ahiqar_collection", "ahiqar_agg") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/ahiqar_collection/ahiqar_agg/manifest.json")
+    %test:args("sample_main_edition", "sample_edition") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/sample_main_edition/sample_edition/manifest.json")
 function tct:make-id($colletion-uri as xs:string, $manifest-uri as xs:string)
 as xs:string {
     tapi-coll:make-id($tc:server, $colletion-uri, $manifest-uri)
@@ -149,15 +149,15 @@ as xs:string {
 
 
 declare
-    %test:assertEquals("ahiqar_agg")
+    %test:assertEquals("sample_edition")
 function tct:get-allowed-manifest-uris-sample-input() {
-    let $collection-metadata := tapi-coll:get-aggregation("ahiqar_collection")
+    let $collection-metadata := tapi-coll:get-aggregation("sample_lang_aggregation")
     return
         tapi-coll:get-allowed-manifest-uris($collection-metadata)
 };
 
 declare
-    %test:args("ahiqar_collection") %test:assertXPath("$result[self::document-node()]")
+    %test:args("sample_main_edition") %test:assertXPath("$result[self::document-node()]")
 function tct:get-metadata-file($uri as xs:string) {
     tapi-coll:get-metadata-file($uri)
 };
@@ -181,15 +181,15 @@ function tct:make-format-type($tgmd-format as xs:string) {
 declare
     %test:assertEquals("manifest")
 function tct:get-format-type() {
-    let $metadata := tapi-coll:get-metadata-file("ahiqar_agg")
+    let $metadata := tapi-coll:get-metadata-file("sample_edition")
     return
         tapi-coll:get-format-type($metadata)
 };
 
 
 declare
-    %test:args("ahiqar_collection") %test:assertXPath("$result//type[. = 'manifest']")
-    %test:args("ahiqar_collection") %test:assertXPath("$result//id[matches(., 'ahiqar_agg/manifest.json')]")
+    %test:args("sample_main_edition") %test:assertXPath("$result//type[. = 'manifest']")
+    %test:args("sample_lang_aggregation") %test:assertXPath("$result//id[matches(., 'sample_edition/manifest.json')]")
     %test:args("testapi-collection") %test:assertXPath("$result//id[matches(., 'test-aggregation-1/manifest.json')]")
     %test:args("testapi-collection") %test:assertXPath("$result//id[matches(., 'test-aggregation-2/manifest.json')]")
 function tct:make-sequence($collection-uri as xs:string) {
@@ -197,7 +197,7 @@ function tct:make-sequence($collection-uri as xs:string) {
 };
 
 declare
-    %test:args("ahiqar_collection") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/ahiqar_collection/annotationCollection.json")
+    %test:args("sample_main_edition") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/sample_main_edition/annotationCollection.json")
 function tct:make-annotationCollection-uri($collection-uri as xs:string)
 as xs:string {
     tapi-coll:make-annotationCollection-uri($tc:server, $collection-uri)
@@ -205,8 +205,8 @@ as xs:string {
 
 
 declare
-    %test:args("ahiqar_collection") %test:assertXPath("$result//title = 'The Story and Proverbs of Ahikar the Wise'")
-    %test:args("ahiqar_collection") %test:assertXPath("$result//*/string() = 'http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/ahiqar_collection/ahiqar_agg/manifest.json' ")
+    %test:args("sample_lang_aggregation") %test:assertXPath("$result//title = 'The Story and Proverbs of Ahikar the Wise'")
+    %test:args("sample_lang_aggregation") %test:assertXPath("$result//*/string() = 'http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/sample_lang_aggregation/sample_edition/manifest.json' ")
 function tct:get-json($collection-uri as xs:string) {
     tapi-coll:get-json($collection-uri, $tc:server)
 };
diff --git a/exist-app/tests/tapi-html-tests.xqm b/exist-app/tests/tapi-html-tests.xqm
index c54e4c1..cb5b126 100644
--- a/exist-app/tests/tapi-html-tests.xqm
+++ b/exist-app/tests/tapi-html-tests.xqm
@@ -14,18 +14,18 @@ declare
     %test:assertXPath("$result//@id = 'N4'")
 function thtmlt:add-IDs()
 as node()+ {
-    let $manifest := doc($commons:data || "ahiqar_sample.xml")/*
+    let $manifest := doc($commons:data || "sample_teixml.xml")/*
     return
         tapi-html:add-IDs($manifest)
 };
 
 
 declare
-    %test:args("/db/apps/sade/textgrid/data/ahiqar_sample.xml", "82a") %test:assertXPath("$result[local-name(.) = 'pb']")
-    %test:args("/db/apps/sade/textgrid/data/ahiqar_sample.xml", "82a") %test:assertXPath("$result/@facs = 'textgrid:3r1p0'")
-    %test:args("/db/apps/sade/textgrid/data/ahiqar_sample.xml", "82a") %test:assertXPath("$result/@n = '82b'")
-    %test:args("/db/apps/sade/textgrid/data/ahiqar_sample.xml", "83b") %test:assertXPath("$result[local-name(.) = 'ab']")
-    %test:args("/db/apps/sade/textgrid/data/ahiqar_sample.xml", "83b") %test:assertXPath("matches($result, 'ܘܗܦܟܬ ܛܥܢܬ ܐܰܒܵܪܐ ܘܠܐ ܐܝܼܩܰܪ ܥܠ')")
+    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result[local-name(.) = 'pb']")
+    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result/@facs = 'textgrid:3r1p0'")
+    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result/@n = '82b'")
+    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "83b") %test:assertXPath("$result[local-name(.) = 'ab']")
+    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "83b") %test:assertXPath("matches($result, 'ܘܗܦܟܬ ܛܥܢܬ ܐܰܒܵܪܐ ܘܠܐ ܐܝܼܩܰܪ ܥܠ')")
 function thtmlt:get-end-node($tei-xml-base-uri as xs:string,
     $page as xs:string)
 as item()+ {
@@ -37,7 +37,7 @@ as item()+ {
 
 
 declare
-    %test:args("/db/apps/sade/textgrid/data/ahiqar_sample.xml", "82a") %test:assertXPath("$result//*[local-name(.) = 'add'][@place = 'margin'] = 'حقًا'")
+    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result//*[local-name(.) = 'add'][@place = 'margin'] = 'حقًا'")
 function thtmlt:get-page-fragment($tei-xml-base-uri as xs:string,
     $page as xs:string)
 as element() {
@@ -46,7 +46,7 @@ as element() {
     
                         
 declare
-    %test:args("/db/apps/sade/textgrid/data/ahiqar_sample.xml", "82a") %test:assertXPath("$result//text()[matches(., 'حقًا')]")
+    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result//text()[matches(., 'حقًا')]")
 function thtmlt:transform-fragment($tei-xml-base-uri as xs:string,
     $page as xs:string)
 as element(xhtml:div) {
@@ -57,8 +57,8 @@ as element(xhtml:div) {
 
 
 declare
-    %test:args("ahiqar_sample", "82a") %test:assertXPath("$result//text()[matches(., 'حقًا')]")
-    %test:args("ahiqar_sample", "82a")
+    %test:args("sample_teixml", "82a") %test:assertXPath("$result//text()[matches(., 'حقًا')]")
+    %test:args("sample_teixml", "82a")
     (: checks if there is text at all in the result :)
     %test:assertXPath("$result//text()[matches(., '[\w]')]")
     (: if a div[@class = 'tei_body'] is present, the transformation has been successfull :)
diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index a11acf7..9c010c0 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -11,7 +11,7 @@ import module namespace tapi-item="http://ahikar.sub.uni-goettingen.de/ns/tapi/i
 
 
 declare
-    %test:args("ahiqar_agg", "82a") %test:assertEquals("3r1nz")
+    %test:args("sample_edition", "82a") %test:assertEquals("3r1nz")
 function titemt:get-facsimile-uri-for-page($manifest-uri as xs:string,
     $page as xs:string)
 as xs:string {
@@ -19,14 +19,14 @@ as xs:string {
 };
 
 declare
-    %test:args("ahiqar_agg") %test:assertEquals("Arabic, Classical Syriac, Eastern Syriac, Karshuni, Western Syriac")
+    %test:args("sample_edition") %test:assertEquals("Arabic, Classical Syriac, Eastern Syriac, Karshuni, Western Syriac")
 function titemt:get-language-string($manifest-uri as xs:string)
 as xs:string {
     tapi-item:get-language-string($manifest-uri)
 };
 
 declare
-    %test:args("ahiqar_agg", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz")
+    %test:args("sample_edition", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz")
 function titemt:make-facsimile-id($manifest-uri as xs:string,
     $page as xs:string)
 as xs:string {
@@ -34,7 +34,7 @@ as xs:string {
 };
 
 declare
-    %test:args("ahiqar_agg") %test:assertEquals("The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh,
+    %test:args("sample_edition") %test:assertEquals("The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh,
                king of Assyria and Nineveh")
 function titemt:make-title($manifest-uri as xs:string)
 as xs:string {
@@ -43,7 +43,7 @@ as xs:string {
 
 
 declare
-    %test:args("ahiqar_collection", "ahiqar_agg", "82a")
+    %test:args("sample_main_edition", "sample_edition", "82a")
     (: checks if the correct file has been opened :)
     %test:assertXPath("$result//*[local-name(.) = 'title'] = 'The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh,
                king of Assyria and Nineveh' ")
@@ -52,10 +52,10 @@ declare
     %test:assertXPath("$result//*[local-name(.) = 'langAlt'] = 'karshuni' ")
     %test:assertXPath("$result//*[local-name(.) = 'x-langString'][matches(., 'Classical Syriac')]")
     (: checks if underlying pages are identified :)
-    %test:assertXPath("$result//*[local-name(.) = 'content'] = 'http://0.0.0.0:8080/exist/restxq/api/content/ahiqar_sample-82a.html' ")
+    %test:assertXPath("$result//*[local-name(.) = 'content'] = 'http://0.0.0.0:8080/exist/restxq/api/content/sample_teixml-82a.html' ")
     (: checks if images connected to underlying pages are identified :)
     %test:assertXPath("$result//*[local-name(.) = 'id'] = 'http://0.0.0.0:8080/exist/restxq/api/images/3r1nz' ")
-    %test:assertXPath("$result//*[local-name(.) = 'annotationCollection'] = 'http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/ahiqar_collection/ahiqar_agg/82a/annotationCollection.json' ")
+    %test:assertXPath("$result//*[local-name(.) = 'annotationCollection'] = 'http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/sample_main_edition/sample_edition/82a/annotationCollection.json' ")
 function titemt:get-json($collection as xs:string,
     $document as xs:string,
     $page as xs:string) 
@@ -65,9 +65,9 @@ as element(object){
 
 
 declare
-    %test:args("ahiqar_agg") %test:assertXPath("count($result) = 5")
-    %test:args("ahiqar_agg") %test:assertXPath("$result[local-name(.) = ('lang', 'langAlt')]")
-    %test:args("ahiqar_agg") %test:assertXPath("count($result[local-name(.) = 'lang']) = 2")
+    %test:args("sample_edition") %test:assertXPath("count($result) = 5")
+    %test:args("sample_edition") %test:assertXPath("$result[local-name(.) = ('lang', 'langAlt')]")
+    %test:args("sample_edition") %test:assertXPath("count($result[local-name(.) = 'lang']) = 2")
 function titemt:make-language-elements($manifest-uri as xs:string)
 as element()+ {
     tapi-item:make-language-elements($manifest-uri)
diff --git a/exist-app/tests/tapi-manifest-tests.xqm b/exist-app/tests/tapi-manifest-tests.xqm
index a10304c..2811fdf 100644
--- a/exist-app/tests/tapi-manifest-tests.xqm
+++ b/exist-app/tests/tapi-manifest-tests.xqm
@@ -129,44 +129,44 @@ function tmt:_test-teardown() {
 };
 
 declare
-    %test:args("ahiqar_agg") %test:assertXPath("$result//* = 'textgrid:ahiqar_agg.0'")
+    %test:args("sample_edition") %test:assertXPath("$result//* = 'textgrid:sample_edition.0'")
 function tmt:get-metadata-file($manifest-uri) {
     tapi-mani:get-metadata-file($manifest-uri)
 };
 
 
 declare
-    %test:args("ahiqar_collection", "ahiqar_agg") %test:assertXPath("$result//id[matches(., '/api/textapi/ahikar/ahiqar_collection/ahiqar_agg-82a/latest/item.json')]")
+    %test:args("sample_main_edition", "sample_edition") %test:assertXPath("$result//id[matches(., '/api/textapi/ahikar/sample_main_edition/sample_edition-82a/latest/item.json')]")
 function tmt:make-sequences($collection-uri as xs:string,
     $manifest-uri as xs:string) {
     tapi-mani:make-sequences($collection-uri, $manifest-uri, $tc:server)
 };
 
 declare
-     %test:args("ahiqar_agg") %test:assertXPath("count($result) = 4")
+     %test:args("sample_edition") %test:assertXPath("count($result) = 4")
 function tmt:get-valid-page-ids($manifest-uri as xs:string) {
     tapi-mani:get-valid-page-ids($manifest-uri)
 };
 
 declare
-    %test:args("ahiqar_collection", "ahiqar_agg")
+    %test:args("sample_main_edition", "sample_edition")
     %test:assertXPath("$result//label = 'Beispieldatei zum Testen'")
-    %test:assertXPath("$result//id[matches(., '/api/textapi/ahikar/ahiqar_collection/ahiqar_agg/manifest.json')]")
-    %test:assertXPath("$result//annotationCollection[matches(., '/api/annotations/ahikar/ahiqar_collection/ahiqar_agg-82a/annotationCollection.json')] ")
+    %test:assertXPath("$result//id[matches(., '/api/textapi/ahikar/sample_main_edition/sample_edition/manifest.json')]")
+    %test:assertXPath("$result//annotationCollection[matches(., '/api/annotations/ahikar/sample_main_edition/sample_edition-82a/annotationCollection.json')] ")
 function tmt:get-json($collection-uri as xs:string,
     $manifest-uri as xs:string) {
     tapi-mani:get-json($collection-uri, $manifest-uri, $tc:server)
 };
 
 declare
-    %test:args("ahiqar_agg") %test:assertEquals("Beispieldatei zum Testen")
+    %test:args("sample_edition") %test:assertEquals("Beispieldatei zum Testen")
 function tmt:get-manifest-title($manifest-uri as xs:string) {
     tapi-mani:get-manifest-title($manifest-uri)
 };
 
 declare
-    %test:args("ahiqar_agg") %test:assertXPath("count($result) = 2")
-    %test:args("ahiqar_agg") %test:assertXPath("$result//name = 'Simon Birol'")
+    %test:args("sample_edition") %test:assertXPath("count($result) = 2")
+    %test:args("sample_edition") %test:assertXPath("$result//name = 'Simon Birol'")
     %test:args("test-manifest1") %test:assertXPath("count($result) = 1")
     %test:args("test-manifest1") %test:assertXPath("$result//name = 'none'")
 function tmt:make-editors($manifest-uri as xs:string) {
@@ -174,14 +174,14 @@ function tmt:make-editors($manifest-uri as xs:string) {
 };
 
 declare
-    %test:args("ahiqar_agg") %test:assertXPath("$result/string() = '18.10.1697'")
+    %test:args("sample_edition") %test:assertXPath("$result/string() = '18.10.1697'")
     %test:args("test-manifest1") %test:assertXPath("$result/string() = 'unknown'")
 function tmt:make-creation-date($manifest-uri as xs:string) {
     tapi-mani:make-creation-date($manifest-uri)
 };
 
 declare
-    %test:args("ahiqar_agg") %test:assertXPath("$result/string() = 'Alqosh, Iraq'")
+    %test:args("sample_edition") %test:assertXPath("$result/string() = 'Alqosh, Iraq'")
     %test:args("test-manifest1") %test:assertXPath("$result/string() = 'unknown'")
     %test:args("test-manifest2") %test:assertXPath("$result/string() = 'Iraq'")
     %test:args("test-manifest3") %test:assertXPath("$result/string() = 'Alqosh'")
@@ -190,7 +190,7 @@ function tmt:make-origin($manifest-uri as xs:string) {
 };
 
 declare
-    %test:args("ahiqar_agg") %test:assertXPath("$result/string() = 'University of Cambridge - Cambridge University Library, Great Britain'")
+    %test:args("sample_edition") %test:assertXPath("$result/string() = 'University of Cambridge - Cambridge University Library, Great Britain'")
     %test:args("test-manifest1") %test:assertXPath("$result/string() = 'unknown'")
     %test:args("test-manifest2") %test:assertXPath("$result/string() = 'University of Cambridge - Cambridge University Library'")
     %test:args("test-manifest3") %test:assertXPath("$result/string() = 'Great Britain'")
@@ -199,7 +199,7 @@ function tmt:make-current-location($manifest-uri as xs:string) {
 };
 
 declare
-     %test:args("ahiqar_collection", "ahiqar_agg") %test:assertExists
+     %test:args("sample_main_edition", "sample_edition") %test:assertExists
 function tmt:get-json($collection-uri as xs:string,
     $manifest-uri as xs:string) {
     tapi-mani:get-json($collection-uri, $manifest-uri, $tc:server)
diff --git a/exist-app/tests/tapi-tests.xqm b/exist-app/tests/tapi-tests.xqm
index 5916370..5939dca 100644
--- a/exist-app/tests/tapi-tests.xqm
+++ b/exist-app/tests/tapi-tests.xqm
@@ -86,7 +86,7 @@ declare
     %test:assertTrue
 function tt:is-html-api-available()
 as xs:boolean {
-    let $url := $tc:server || "/content/ahiqar_sample-82a.html"
+    let $url := $tc:server || "/content/sample_teixml-82a.html"
     return
         tc:is-endpoint-http200($url)
 };
@@ -97,7 +97,7 @@ declare
      : the underlying function. :)
     %test:assertXPath("$result//*[@class = 'tei_body']")
 function tt:content-rest() as document-node() {
-    let $url := $tc:server || "/content/ahiqar_sample-82a.html"
+    let $url := $tc:server || "/content/sample_teixml-82a.html"
     let $req := tc:make-request($url)
     return http:send-request($req)[2]
 };
@@ -124,7 +124,7 @@ declare
      : the underlying function. :)
     %test:assertXPath("matches($result, '[\w]')")
 function tt:content-txt() as xs:string {
-    let $url := $tc:server || "/textapi/ahikar/ahiqar_collection/ahiqar_sample.txt"
+    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/sample_teixml.txt"
     let $req := <http:request href="{$url}" method="get">
                         <http:header name="Connection" value="close"/>
                    </http:request>
@@ -135,13 +135,13 @@ function tt:content-txt() as xs:string {
 declare
     %test:assertTrue
 function tt:is-txt-api-available() {
-    let $url := $tc:server || "/content/ahiqar_sample.txt"
+    let $url := $tc:server || "/content/sample_teixml.txt"
     return
         tc:is-endpoint-http200($url)
 };
 
 declare function tt:txt() {
-    let $url := $tc:server || "textapi/ahiqar/ahiqar_collection/ahiqar_sample.txt"
+    let $url := $tc:server || "textapi/ahiqar/sample_main_edition/sample_teixml.txt"
     let $req := tc:make-request($url)
     return http:send-request($req)[2] => util:base64-decode()
 };
@@ -158,7 +158,7 @@ function tt:remove-whitespaces() as document-node() {
 declare
     %test:assertTrue
 function tt:is-collection-endpoint-http200() {
-    let $url := $tc:server || "/textapi/ahikar/ahiqar_collection/collection.json"
+    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/collection.json"
     return
         tc:is-endpoint-http200($url)
 };
@@ -174,7 +174,7 @@ declare
     %test:assertXPath("map:contains($result, 'sequence')")
 function tt:endpoint-collection()
 as item() {
-    let $url := $tc:server || "/textapi/ahikar/ahiqar_collection/collection.json"
+    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/collection.json"
     let $req := <http:request href="{$url}" method="get">
                         <http:header name="Connection" value="close"/>
                    </http:request>
@@ -184,7 +184,7 @@ as item() {
 declare
     %test:assertTrue
 function tt:is-manifest-endpoint-http200() {
-    let $url := $tc:server || "/textapi/ahikar/ahiqar_collection/ahiqar_agg/manifest.json"
+    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/sample_edition/manifest.json"
     return
         tc:is-endpoint-http200($url)
 };
@@ -205,7 +205,7 @@ declare
     %test:assertXPath("map:contains($result, 'sequence')")
 function tt:endpoint-manifest()
 as item() {
-    let $url := $tc:server || "/textapi/ahikar/ahiqar_collection/ahiqar_agg/manifest.json"
+    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/sample_edition/manifest.json"
     let $req := tc:make-request($url)
     return
         http:send-request($req)[2]
@@ -216,7 +216,7 @@ as item() {
 declare
     %test:assertTrue
 function tt:is-item-endpoint-http200() {
-    let $url := $tc:server || "/textapi/ahikar/ahiqar_collection/ahiqar_agg-82a/latest/item.json"
+    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/sample_edition-82a/latest/item.json"
     return
         tc:is-endpoint-http200($url)
 };
@@ -235,7 +235,7 @@ declare
     %test:assertXPath("map:contains($result, 'langAlt')")
     %test:assertXPath("map:contains($result, 'image')")
 function tt:endpoint-item() as item() {
-    let $url := $tc:server || "/textapi/ahikar/ahiqar_collection/ahiqar_agg-82a/latest/item.json"
+    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/sample_edition-82a/latest/item.json"
     let $req := tc:make-request($url)
     return http:send-request($req)[2]
         => util:base64-decode()
diff --git a/exist-app/tests/tapi-txt-tests.xqm b/exist-app/tests/tapi-txt-tests.xqm
index 4700e67..43e3a98 100644
--- a/exist-app/tests/tapi-txt-tests.xqm
+++ b/exist-app/tests/tapi-txt-tests.xqm
@@ -7,7 +7,7 @@ declare namespace tei="http://www.tei-c.org/ns/1.0";
 import module namespace tapi-txt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt" at "../modules/tapi-txt.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 
-declare variable $ttt:sample-file := local:open-file("ahiqar_sample");
+declare variable $ttt:sample-file := local:open-file("sample_teixml");
 declare variable $ttt:sample-transliteration := $ttt:sample-file//tei:text[@type = "transliteration"];
 declare variable $ttt:sample-transcription := $ttt:sample-file//tei:text[@type = "transcription"];
 
@@ -20,7 +20,7 @@ as xs:string+ {
 
 
 declare
-    %test:args("ahiqar_sample") %test:assertExists
+    %test:args("sample_teixml") %test:assertExists
     %test:args("1234") %test:assertError("org.exist.xquery.XPathException")
 function ttt:open-file($uri as xs:string) as document-node() {
     local:open-file($uri)
@@ -250,7 +250,7 @@ as xs:string {
 };
 
 declare
-    %test:assertEquals("/db/apps/sade/textgrid/data/ahiqar_sample.xml")
+    %test:assertEquals("/db/apps/sade/textgrid/data/sample_teixml.xml")
 function ttt:get-base-uri()
 as xs:string {
     tapi-txt:get-base-uri($ttt:sample-transcription)
@@ -264,21 +264,21 @@ as xs:string {
 };
 
 declare
-    %test:assertEquals("karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription.txt")
+    %test:assertEquals("karshuni-Beispieldatei_zum_Testen-sample_teixml-transcription.txt")
 function ttt:make-file-name()
 as xs:string {
     tapi-txt:make-file-name($ttt:sample-transcription)
 };
 
 declare
-    %test:assertEquals("ahiqar_sample-transcription.txt")
+    %test:assertEquals("sample_teixml-transcription.txt")
 function ttt:make-file-name-suffix()
 as xs:string {
     tapi-txt:make-file-name-suffix($ttt:sample-transcription)
 };
 
 declare
-    %test:args("/db/apps/sade/textgrid/data/ahiqar_sample.xml") %test:assertEquals("ahiqar_sample")
+    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml") %test:assertEquals("sample_teixml")
 function ttt:get-file-name($base-uri as xs:string)
 as xs:string {
     tapi-txt:get-file-name($base-uri)
@@ -433,7 +433,7 @@ as document-node() {
 
 
 declare
-    %test:args("ahiqar_sample", "transcription")
+    %test:args("sample_teixml", "transcription")
     %test:assertXPath("$result[local-name(.) = 'text' and @type = 'transcription']")
 function ttt:get-tei($document-uri as xs:string,
     $type as xs:string)
@@ -442,8 +442,8 @@ as element() {
 };
 
 declare
-    %test:args("ahiqar_sample") %test:assertEquals("text/xml")
-    %test:args("ahiqar_agg") %test:assertEquals("text/tg.edition+tg.aggregation+xml")
+    %test:args("sample_teixml") %test:assertEquals("text/xml")
+    %test:args("sample_edition") %test:assertEquals("text/tg.edition+tg.aggregation+xml")
 function ttt:tgmd-format($uri as xs:string)
 as xs:string {
     tapi-txt:get-format($uri)
@@ -451,7 +451,7 @@ as xs:string {
 
 
 declare
-    %test:args("ahiqar_sample", "transcription")
+    %test:args("sample_teixml", "transcription")
     %test:assertXPath("$result[local-name(.) = 'text' and @type = 'transcription']")
 function ttt:get-tei($document as xs:string, $type as xs:string) as element() {
     tapi-txt:get-TEI-text($document, $type)
@@ -459,28 +459,28 @@ function ttt:get-tei($document as xs:string, $type as xs:string) as element() {
 
 
 declare
-    %test:args("ahiqar_agg") %test:assertEquals("ahiqar_sample")
+    %test:args("sample_edition") %test:assertEquals("sample_teixml")
 function ttt:get-tei-xml-uri-from-edition($document as xs:string) {
     tapi-txt:get-tei-xml-uri-from-edition($document)
 };
 
 
 declare
-    %test:args("ahiqar_sample") %test:assertEquals("ahiqar_sample")
+    %test:args("sample_teixml") %test:assertEquals("sample_teixml")
 function ttt:get-tei-xml-from-aggregates($aggregates as xs:string+) {
     tapi-txt:get-tei-xml-from-aggregates($aggregates)
 };
 
 
 declare 
-    %test:args("ahiqar_sample", "transliteration") %test:assertXPath("$result[@type = 'transliteration']")
+    %test:args("sample_teixml", "transliteration") %test:assertXPath("$result[@type = 'transliteration']")
 function ttt:get-text-of-type($uri as xs:string, $type as xs:string) {
     tapi-txt:get-text-of-type($uri, $type)
 };
 
 declare
-    %test:args("ahiqar_sample") %test:assertTrue
-    %test:args("ahiqar_agg") %test:assertFalse
+    %test:args("sample_teixml") %test:assertTrue
+    %test:args("sample_edition") %test:assertFalse
 function ttt:is-document-tei-xml($document-uri as xs:string)
 as xs:boolean {
     tapi-txt:is-document-tei-xml($document-uri)
-- 
GitLab


From a6d64f5bbd2ee10bc7e18be40ab6d62cd73527ad Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 08:02:06 +0100
Subject: [PATCH 065/155] tests: let $anno:uris depend on database state

---
 exist-app/modules/annotations.xqm | 69 +++++++++++++------------------
 1 file changed, 28 insertions(+), 41 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 7672547..7e0d812 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -45,47 +45,34 @@ declare variable $anno:annotationElements :=
 
 (: this variable holds a map with the complete project structure (excluding images) :)
 declare variable $anno:uris :=
-    if (doc-available($commons:agg || "3r132.xml")) then
-        let $main-edition-object := "3r132"
-        let $language-aggs := commons:get-available-aggregates($main-edition-object)
-        return
-            map { $main-edition-object:
-                    (: level 1: language aggregations :)
-                    map:merge(for $lang in $language-aggs return
-                    map:entry($lang, 
-                        (: level 2 (key): editions associated to a language aggregation :)
-                        map:merge(
-                                let $editions := commons:get-available-aggregates($lang)
-                                for $uri in $editions return
-                                    (: level 2 (value): XML associated with edition :)
-                                    let $edition-parts := commons:get-available-aggregates($uri)
-                                    for $part in $edition-parts
-                                    return
-                                        if (anno:is-resource-xml($part)) then
-                                            map:entry($uri, $part)
-                                        else
-                                            ()
-                        )
-                    ))
-            }
-    else
-        let $main-edition-object := "sample_main_edition"
-        let $editions := commons:get-available-aggregates($main-edition-object)
-        return
-            map { $main-edition-object:
-                map:merge(
-                    for $uri in $editions return
-                        (: level 2 (value): XML associated with edition :)
-                        let $edition-parts := commons:get-available-aggregates($uri)
-                        for $part in $edition-parts
-                        return
-                            if (anno:is-resource-xml($part)) then
-                                map:entry($uri, $part)
-                            else
-                                ()
-                )
-            }
-    ;
+    let $main-edition-object := 
+        if (doc-available($commons:agg || "3r132.xml")) then
+            "3r132"
+        else
+            "sample_main_edition"
+    
+    let $language-aggs := commons:get-available-aggregates($main-edition-object)
+    return
+        map { $main-edition-object:
+                (: level 1: language aggregations :)
+                map:merge(for $lang in $language-aggs return
+                map:entry($lang, 
+                    (: level 2 (key): editions associated to a language aggregation :)
+                    map:merge(
+                            let $editions := commons:get-available-aggregates($lang)
+                            for $uri in $editions return
+                                (: level 2 (value): XML associated with edition :)
+                                let $edition-parts := commons:get-available-aggregates($uri)
+                                for $part in $edition-parts
+                                return
+                                    if (anno:is-resource-xml($part)) then
+                                        map:entry($uri, $part)
+                                    else
+                                        ()
+                    )
+                ))
+        }
+;
 
 (:~
  : Returns annotation information about a single collection. Although this works for all collections,
-- 
GitLab


From 705212607bd8160bb5826b9f949b899e6b5f6efe Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 08:12:35 +0100
Subject: [PATCH 066/155] refactor: remove unused modules

---
 exist-app/modules/annotations.xqm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 7e0d812..3c5fa5c 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -19,11 +19,9 @@ declare namespace rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
-import module namespace fragment="https://wiki.tei-c.org/index.php?title=Milestone-chunk.xquery" at "fragment.xqm";
 import module namespace functx = "http://www.functx.com";
 import module namespace requestr="http://exquery.org/ns/request";
 import module namespace rest="http://exquery.org/ns/restxq";
-import module namespace tapi="http://ahikar.sub.uni-goettingen.de/ns/tapi" at "tapi.xqm";
 import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "tapi-html.xqm";
 
 
-- 
GitLab


From e7d435575d9ec2004feb8280bc87bcae69dd8c2b Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 08:13:26 +0100
Subject: [PATCH 067/155] tests: make output human and machine readable

Closes #61
---
 exist-app/modules/testtrigger.xqm | 112 +++++++++++++-----------------
 1 file changed, 49 insertions(+), 63 deletions(-)

diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 2609b0f..997d4ed 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -1,70 +1,56 @@
 xquery version "3.1";
-
 (:~
- : Providing an API endpoint for triggering test execution.
- : This endpoint has been established instead of the text execution in post-install.xq
- : since at this point the RESTXQ API isn't fired up yet which causes the tests to throw errors.
- : 
- : @author Michelle Weidling
- : @since 0.4.0
+ : Script providing access to the test functions (XQSuite) for local unit test
+ : execution.
+ : Elevated rights (dba/admin) are required for some tests.
  :)
 
-module namespace testtrigger="http://ahikar.sub.uni-goettingen.de/ns/testtrigger";
-
-import module namespace rest="http://exquery.org/ns/restxq";
+import module namespace ttt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" at "tapi-txt-tests.xqm";
+import module namespace ct="http://ahikar.sub.uni-goettingen.de/ns/commons-tests" at "commons-tests.xqm";
+import module namespace tct="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests" at "tapi-collection-tests.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
-
-import module namespace ct="http://ahikar.sub.uni-goettingen.de/ns/commons-tests" at "../tests/commons-tests.xqm";
-import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "../tests/tei2html-tests.xqm";
-import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "../tests/tei2html-textprocessing-tests.xqm";
-import module namespace ttt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" at "../tests/tapi-txt-tests.xqm";
-import module namespace tct="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests" at "../tests/tapi-collection-tests.xqm";
-import module namespace thtmlt="http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests" at "../tests/tapi-html-tests.xqm";
-import module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" at "../tests/tapi-item-tests.xqm";
-import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" at "../tests/tapi-manifest-tests.xqm";
-import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "../tests/tapi-tests.xqm";
+import module namespace thtmlt="http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests" at "tapi-html-tests.xqm";
+import module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" at "tapi-item-tests.xqm";
+import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" at "tapi-manifest-tests.xqm";
+import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "tapi-tests.xqm";
+import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "tei2html-tests.xqm";
+import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "tei2html-textprocessing-tests.xqm";
 import module namespace at="http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" at "../tests/annotation-tests.xqm";
 
-(:~
- : Triggers the tests for the Ahikar backend. Called by the CI.
- : 
- : @param $token A CI token
- : @return item() A log message to std out. In the Docker environment, this goes to exist.log.
- : @error The deploy token provided is incorrect
- :)
-declare
-  %rest:GET
-  %rest:HEAD
-  %rest:path("/trigger-tests")
-  %rest:query-param("token", "{$token}")
-function testtrigger:trigger($token)
-as item()? {
-  if( $token ne environment-variable("APP_DEPLOY_TOKEN" ))
-    then error(QName("error://1", "deploy"), "Deploy token incorrect.")
-  else
-    let $sysout := util:log-system-out("TextAPI and package installation done. running tests…")
-    let $tests := 
-        (
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests"))
-        )
-    
-    let $fileSeparator := util:system-property("file.separator")
-    let $system-path := system:get-exist-home() || $fileSeparator
-    
-    let $testWrap := <tests time="{current-dateTime()}">{ $tests }</tests>
-    
-    let $filename := $system-path || "ahikar-test-results.xml"
-    let $file := file:serialize($testWrap, $filename, ())
-    
-    return
-        util:log-system-out("Tests complete. See " || $filename)
-};
\ No newline at end of file
+declare function local:get-human-readable-pkg-name($package as xs:string)
+as xs:string? {
+    switch ($package)
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" return "TextAPI general"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" return "TXT creation"
+        case "http://ahikar.sub.uni-goettingen.de/ns/commons-tests" return "Commons"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests" return "TextAPI Collections"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" return "TextAPI Manifests"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" return "TextAPI Items"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests" return "HTML creation"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" return "TEI2HTML transformation"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" return "TEI2HTML text processing"
+        case "http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" return "AnnotationAPI"
+        default return ()
+};
+
+let $test-results :=
+    (
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests"))
+    )
+
+for $result in $test-results
+order by $result//@package return
+    if ($result//@failures = 0
+    and $result//@errors = 0) then
+        <OK name="{local:get-human-readable-pkg-name($result//@package)}" package="{$result//@package}"/>
+    else
+        $result
\ No newline at end of file
-- 
GitLab


From 1601d17776a75e6387838f7554e6ab00810c807d Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 08:52:31 +0100
Subject: [PATCH 068/155] tests: only get relevant output (cf. #61)

---
 exist-app/modules/testtrigger.xqm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 997d4ed..9c2ab16 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -53,4 +53,10 @@ order by $result//@package return
     and $result//@errors = 0) then
         <OK name="{local:get-human-readable-pkg-name($result//@package)}" package="{$result//@package}"/>
     else
-        $result
\ No newline at end of file
+        <PROBLEM name="{local:get-human-readable-pkg-name($result//@package)}"
+            package="{$result//@package}"
+            errors="{$result//@errors}"
+            failures="{$result//@failures}">
+            {$result//testcase[child::*[self::failure or self::error]]}
+        </PROBLEM>
+        
\ No newline at end of file
-- 
GitLab


From a52b914607dbb575cedf3ac4b4756c63c06940d0 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 09:46:16 +0100
Subject: [PATCH 069/155] tests: add more tests

---
 exist-app/modules/annotations.xqm    |  74 ++++++++++++------
 exist-app/tests/annotation-tests.xqm | 107 ++++++++++++++++++++++++---
 2 files changed, 147 insertions(+), 34 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 3c5fa5c..ed874c5 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -24,6 +24,8 @@ import module namespace requestr="http://exquery.org/ns/request";
 import module namespace rest="http://exquery.org/ns/restxq";
 import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "tapi-html.xqm";
 
+import module namespace console="http://exist-db.org/xquery/console";
+
 
 declare variable $anno:ns := "http://ahikar.sub.uni-goettingen.de/ns/annotations";
 declare variable $anno:server :=
@@ -179,7 +181,11 @@ as xs:string {
  : @param $first-entry The IRI of the first Annotation Page that is included within the Collection
  : @param $last-entry The IRI of the last Annotation Page that is included within the Collection
  :)
-declare function anno:make-annotationCollection-map($uri as xs:string, $title as xs:string, $first-entry as xs:string, $last-entry as xs:string) {
+declare function anno:make-annotationCollection-map($uri as xs:string,
+    $title as xs:string,
+    $first-entry as xs:string,
+    $last-entry as xs:string)
+as map() {
     map {
         "annotationCollection":
             map {
@@ -204,11 +210,12 @@ declare function anno:make-annotationCollection-map($uri as xs:string, $title as
  : @return A string containing the creators of the annotations as stated in the
  : TEI header of the (underlying) resource(s).
  :)
-declare function anno:get-creator($uri as xs:string) as xs:string {
+declare function anno:get-creator($uri as xs:string)
+as xs:string {
     let $xmls :=
         if (anno:is-resource-xml($uri)) then
             $uri
-        else if(anno:is-resource-edition($uri)) then
+        else if(anno:is-resource-edition($anno:uris, $uri)) then
             anno:find-in-map($anno:uris, $uri)
         else
             let $map := anno:find-in-map($anno:uris, $uri)
@@ -261,12 +268,14 @@ $document as xs:string) {
  : @return A map with all information necessary for the Annotation Collection
  :)
 declare function anno:make-annotationPage($collection as xs:string, 
-$document as xs:string, $server as xs:string) {
+    $document as xs:string,
+    $server as xs:string)
+as map() {
     let $nextPage := anno:get-prev-or-next-annotationPage-ID($collection, $document, "next")
     let $prevPage := anno:get-prev-or-next-annotationPage-ID($collection, $document, "prev")
 
     let $xmls :=
-        if(anno:is-resource-edition($document)) then
+        if(anno:is-resource-edition($anno:uris, $document)) then
             anno:find-in-map($anno:uris, $document)
         else
             anno:find-in-map($anno:uris, $document) => anno:get-all-xml-uris-for-submap()
@@ -372,6 +381,7 @@ $document as xs:string, $page as xs:string) {
  : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  :)
+(: ## tested ## :)
 declare function anno:make-annotationCollection-for-manifest($collection as xs:string,
     $document as xs:string,
     $page as xs:string,
@@ -488,7 +498,9 @@ $document as xs:string, $page as xs:string, $server as xs:string) {
  : @param $documentURI The XML's URI. Attention: This refers directly to the XML file, NOT the superordinate edition!
  : @param $page The page within an XML file, i.e. a tei:pb/@n within a TEI resource
  :)
-declare function anno:get-annotations($documentURI as xs:string, $page as xs:string) {
+declare function anno:get-annotations($documentURI as xs:string,
+    $page as xs:string)
+as map() {
     let $pageChunk := anno:get-page-fragment($documentURI, $page)
     
     let $annotation-elements := 
@@ -514,7 +526,10 @@ declare function anno:get-annotations($documentURI as xs:string, $page as xs:str
  : @param $documentURI The resource's URI. Attention: This refers to the TEI file itself!
  : @param $page The page to be returned as tei:pb/@n/string()
  :)
-declare function anno:get-page-fragment($documentURI as xs:string, $page as xs:string) {
+(: ## tested ## :)
+declare function anno:get-page-fragment($documentURI as xs:string,
+    $page as xs:string)
+as element(tei:TEI) {
     let $nodeURI := commons:get-document($documentURI, "data")/base-uri()
     return
         tapi-html:get-page-fragment($nodeURI, $page)
@@ -529,11 +544,13 @@ declare function anno:get-page-fragment($documentURI as xs:string, $page as xs:s
  : @param $uri The resource's URI
  : @return The number of annotations that are associated with the $uri
  :)
-declare function anno:get-total-no-of-annotations($uri as xs:string) as xs:integer {
+(: ## tested ## :)
+declare function anno:get-total-no-of-annotations($uri as xs:string)
+as xs:integer {
     let $map-entry-for-uri := anno:find-in-map($anno:uris, $uri)
     
     let $xmls :=
-        if (anno:is-resource-edition($uri)) then
+        if (anno:is-resource-edition($anno:uris, $uri)) then
             $map-entry-for-uri
         else
             anno:get-all-xml-uris-for-submap($map-entry-for-uri)
@@ -557,16 +574,20 @@ declare function anno:get-total-no-of-annotations($uri as xs:string) as xs:integ
  : @param $map A part of the $anno:uris map
  : @return All values of the lowest $map level
  :)
-declare function anno:get-all-xml-uris-for-submap($map as map()) {
+(: ## tested ## :)
+declare function anno:get-all-xml-uris-for-submap($map as map())
+as xs:string* {
     let $get-values := function($key, $value){$value}
     
     for $value in map:for-each($map, $get-values) return
         if ($value instance of map()) then
              anno:get-all-xml-uris-for-submap($value)
-        else if ($value = "3rrnp") then
-            ()
-        else
+        (: this condition ensures that TEI/XMLs that have been deleted or aren't
+        available for some other reason are not considered :)
+        else if(doc-available($commons:data || $value || ".xml")) then
             $value
+        else
+            ()
 };
 
 
@@ -657,7 +678,10 @@ declare function anno:get-404-header($resources as xs:string+) {
  : @param $key The key whose value is to be returned
  : @return The value of the given $key
  :)
-declare function anno:find-in-map($map as map(), $key as xs:string) as item()? {
+(: ## tested ## :)
+declare function anno:find-in-map($map as map(),
+    $key as xs:string)
+as item()? {
     let $get-values := function($key, $value){$value}
     return
         if (map:keys($map) = $key) then
@@ -712,9 +736,12 @@ $document as xs:string, $type as xs:string) {
             default return ()
 };
 
-
+(: ## tested ## :)
 declare function anno:get-prev-or-next-annotationPage-url($collection as xs:string,
-$document as xs:string?, $page as xs:string?, $server as xs:string) {
+    $document as xs:string?,
+    $page as xs:string?,
+    $server as xs:string)
+as xs:string? {
     let $pageSuffix :=
         if ($page) then
             "/" || $page
@@ -746,8 +773,11 @@ declare function anno:is-resource-xml($uri as xs:string) as xs:boolean {
  : @param $uri The resource's URI
  : @return true() if resources stated by $uri is an edition object
  :)
-declare function anno:is-resource-edition($uri as xs:string) as xs:boolean {
-    not(anno:find-in-map($anno:uris, $uri) instance of map())
+(: ## tested ää :)
+declare function anno:is-resource-edition($map as map(),
+    $uri as xs:string)
+as xs:boolean {
+    not(anno:find-in-map($map, $uri) instance of map())
 };
 
 (:~
@@ -766,15 +796,15 @@ declare function anno:get-pages-in-TEI($documentURI as xs:string) as xs:string+
  : Returns the previous or next @n of a tei:pb seen from a given tei:pb which is
  : denoted in $page.
  : 
- : @param $documentURI The current resource's URI
+ : @param $manifest-uri The current manifest's URI
  : @param $page The @n attribute of the current page break/tei:pb
  : @param $type "prev" for the previous, "next" for the next page break
  :)
-declare function anno:get-prev-or-next-page($documentURI as xs:string,
+declare function anno:get-prev-or-next-page($manifest-uri as xs:string,
     $page as xs:string, 
     $type as xs:string)
 as xs:string? {
-    let $tei := anno:find-in-map($anno:uris, $documentURI)
+    let $tei := anno:find-in-map($anno:uris, $manifest-uri)
     let $pages := anno:get-pages-in-TEI($tei)
     let $no-of-pages := count($pages)
     let $current-position := index-of($pages, $page)
@@ -817,7 +847,7 @@ as xs:string* {
             let $edition := anno:get-parent-aggregation($uri)
             return
                 anno:get-prev-xml-uris($edition)
-    else if(anno:is-resource-edition($uri)) then
+    else if(anno:is-resource-edition($anno-uris, $uri)) then
         anno:get-prev-xml-uris($uri)
     else
         ()
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index 5f873ee..ee17dc4 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -21,15 +21,6 @@ as xs:boolean {
     anno:is-resource-xml($uri)
 };
 
-declare
-    %test:args("sample_teixml") %test:assertFalse
-    %test:args("sample_edition") %test:assertTrue
-    %test:pending
-function at:is-resource-edition($uri as xs:string)
-as xs:boolean {
-    anno:is-resource-edition($uri)
-};
-
 declare
     %test:args("sample_teixml") %test:assertXPath("count($result) = 4")
     %test:args("sample_teixml") %test:assertXPath("$result = '82a'")
@@ -118,10 +109,9 @@ as map() {
 };
 
 declare
-    %test:args("sample_main_edition", "sample_edition", "82a", "http://localhost:8080")
+    %test:args("sample_lang_aggregation", "sample_edition", "82a", "http://localhost:8080")
     %test:assertXPath("map:get($result, 'annotationCollection') => map:get('id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationCollection/sample_edition/82a'")
-    %test:assertXPath("map:get($result, 'annotationCollection') => map:get('label') = 'Ahikar annotations for textgrid:sample_edition: Beispieldatei zum Testen, page 82a'")
-    %test:pending
+    %test:assertXPath("map:get($result, 'annotationCollection') => map:get('type') = 'AnnotationCollection'")
 function at:make-annotationCollection-for-manifest($collection as xs:string,
     $document as xs:string,
     $page as xs:string,
@@ -130,6 +120,99 @@ as map() {
     anno:make-annotationCollection-for-manifest($collection, $document, $page, $server)
 };
 
+declare
+    %test:args("sample_teixml", "82a") %test:assertXPath("$result//* = 'حقًا'")
+function at:get-page-fragment($documentURI as xs:string,
+    $page as xs:string)
+as element(tei:TEI) {
+    anno:get-page-fragment($documentURI, $page)
+};
+
+declare
+    %test:args("sample_main_edition") %test:assertEquals("65")
+    %test:args("sample_lang_aggregation") %test:assertEquals("65")
+function at:get-total-no-of-annotations($uri as xs:string) {
+    anno:get-total-no-of-annotations($uri)
+};
+
+declare
+    %test:assertEquals("sample_teixml")
+function at:get-all-xml-uris-for-submap()
+as xs:string* {
+    let $map :=
+         map {
+            "sample_lang_aggregation":
+            map {
+                "sample_edition": "sample_teixml",
+                "faux_edition": "faux_teixml"
+            }
+         }
+    return
+        anno:get-all-xml-uris-for-submap($map)
+};
+
+
+declare
+    %test:args("sample_edition") %test:assertEquals("sample_teixml")
+function at:find-in-map($key as xs:string)
+as item()? {
+    let $map :=
+        map {
+                "sample_lang_aggregation":
+                map {
+                    "sample_edition": "sample_teixml",
+                    "faux_edition": "faux_teixml"
+                }
+             }  
+    
+    return
+        anno:find-in-map($map, $key)
+};
+
+
+declare
+    %test:args("sample_edition", "11")
+    %test:assertEquals("http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation/sample_edition/11/annotationPage.json")
+    %test:args("sample_edition", "")
+    %test:assertEquals("http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationPage.json")
+    %test:args("", "")
+    %test:assertEmpty
+function at:get-prev-or-next-annotationPage-url($document as xs:string?,
+    $page as xs:string?)
+as xs:string? {
+    let $collection := "sample_lang_aggregation"
+    let $server := "http://localhost:8080"
+    return
+        anno:get-prev-or-next-annotationPage-url($collection, $document, $page, $server)
+};
+
+declare
+    %test:args("sample_edition") %test:assertTrue
+    %test:args("sample_lang_aggregation") %test:assertFalse
+function at:is-resource-edition($uri as xs:string) {
+    let $map := 
+        map {
+                "sample_lang_aggregation":
+                map {
+                    "sample_edition": "sample_teixml",
+                    "faux_edition": "faux_teixml"
+                }
+             }  
+    return
+        anno:is-resource-edition($map, $uri)
+};
+
+declare
+    %test:args("sample_edition", "82a", "next") %test:assertEquals("82b")
+    %test:args("sample_edition", "82a", "prev") %test:assertEmpty
+    %test:args("sample_edition", "82b", "prev") %test:assertEquals("82a")
+function at:get-prev-or-next-page($manifest-uri as xs:string,
+    $page as xs:string, 
+    $type as xs:string)
+as xs:string? {
+    anno:get-prev-or-next-page($manifest-uri, $page, $type)
+};
+
 (:declare:)
 (:    %test:args("3r679", "114r"):)
 (:    %test:assertEquals("0"):)
-- 
GitLab


From 2e1bf6a10374459d12f7cf32f263c33c857de106 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 09:52:53 +0100
Subject: [PATCH 070/155] refactor: replace switch

---
 exist-app/modules/annotations.xqm | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index ed874c5..eab2732 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -800,6 +800,7 @@ declare function anno:get-pages-in-TEI($documentURI as xs:string) as xs:string+
  : @param $page The @n attribute of the current page break/tei:pb
  : @param $type "prev" for the previous, "next" for the next page break
  :)
+(: ## tested ## :)
 declare function anno:get-prev-or-next-page($manifest-uri as xs:string,
     $page as xs:string, 
     $type as xs:string)
@@ -814,19 +815,14 @@ as xs:string? {
         else
             $current-position - 1
     return
-        switch ($type)
-            case "prev" return
-                if ($new-position le $no-of-pages
-                and $new-position != 0) then
-                    $pages[$new-position]
-                else
-                    ()
-            case "next" return
-                if ($new-position le $no-of-pages) then
-                    $pages[$new-position]
-                else
-                    ()
-            default return ()
+        if ($new-position le $no-of-pages
+        and ($type = "prev"
+        and $new-position != 0
+        or
+        $type = "next")) then
+            $pages[$new-position]
+        else
+            ()
 };
 
 
-- 
GitLab


From a4867f0a4128f5e690b5fb715d23121c54c2121d Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 10:05:04 +0100
Subject: [PATCH 071/155] chore: update changelog

---
 CHANGELOG.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0e576d..78d1d67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,13 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.0.1] - 2020-1-12
+## [2.2.1] - 2020-11-16
 
 ## Changed
 
 - When extracting the relevant plain text sections, the semantic divisions of the texts are now considered.
 Each semantic division, which is indicated in the texts by a tei:milestone, is now stored in a separate file.
 
+## [2.1.0] - 2020-11-12
+
+### Changed
+
+- prepared for changed endpoints at Text-API (document-page to document/page)
+
+### Fixed
+
+- wrong Annotation IDs
+
 ## [2.0.0] - 2020-11-06
 
 ### Changed
-- 
GitLab


From 81c1d72a548b385ec93e18dd39c4b6a07e003989 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 10:14:21 +0100
Subject: [PATCH 072/155] chore: remove console module

---
 exist-app/modules/annotations.xqm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index eab2732..c768eae 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -24,8 +24,6 @@ import module namespace requestr="http://exquery.org/ns/request";
 import module namespace rest="http://exquery.org/ns/restxq";
 import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "tapi-html.xqm";
 
-import module namespace console="http://exist-db.org/xquery/console";
-
 
 declare variable $anno:ns := "http://ahikar.sub.uni-goettingen.de/ns/annotations";
 declare variable $anno:server :=
-- 
GitLab


From 8b08400170de0d1ca739aa356940bdf02162b938 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 10:18:59 +0100
Subject: [PATCH 073/155] chore: update changelog

---
 CHANGELOG.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6cebb4..63c8a43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.0] - 2020-11-16
+
+### Changed
+
+- Some parts of `annotation.xqm` have been refactored to improve the code and/or make it testable.
+- `test-runner.xq` now produces machine-readable output and only displays the tests that fail.
+
+### Added
+
+- Tests for the AnnotationAPI.
+
 ## [2.1.0] - 2020-11-12
 
 ### Changed
@@ -15,7 +26,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - wrong Annotation IDs
 
-
 ## [2.0.0] - 2020-11-06
 
 ### Changed
-- 
GitLab


From 0f0d490c9d849e367577c1eee8d69257513de1c4 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 10:23:51 +0100
Subject: [PATCH 074/155] test: restore old state of test trigger

---
 exist-app/modules/testtrigger.xqm | 116 ++++++++++++++++--------------
 exist-app/tests/tests-runner.xq   |  28 +++++++-
 2 files changed, 87 insertions(+), 57 deletions(-)

diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 9c2ab16..671da1f 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -1,62 +1,70 @@
 xquery version "3.1";
+
 (:~
- : Script providing access to the test functions (XQSuite) for local unit test
- : execution.
- : Elevated rights (dba/admin) are required for some tests.
+ : Providing an API endpoint for triggering test execution.
+ : This endpoint has been established instead of the text execution in post-install.xq
+ : since at this point the RESTXQ API isn't fired up yet which causes the tests to throw errors.
+ : 
+ : @author Michelle Weidling
+ : @since 0.4.0
  :)
 
-import module namespace ttt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" at "tapi-txt-tests.xqm";
-import module namespace ct="http://ahikar.sub.uni-goettingen.de/ns/commons-tests" at "commons-tests.xqm";
-import module namespace tct="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests" at "tapi-collection-tests.xqm";
+module namespace testtrigger="http://ahikar.sub.uni-goettingen.de/ns/testtrigger";
+
+import module namespace rest="http://exquery.org/ns/restxq";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
-import module namespace thtmlt="http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests" at "tapi-html-tests.xqm";
-import module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" at "tapi-item-tests.xqm";
-import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" at "tapi-manifest-tests.xqm";
-import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "tapi-tests.xqm";
-import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "tei2html-tests.xqm";
-import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "tei2html-textprocessing-tests.xqm";
+
+import module namespace ct="http://ahikar.sub.uni-goettingen.de/ns/commons-tests" at "../tests/commons-tests.xqm";
+import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "../tests/tei2html-tests.xqm";
+import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "../tests/tei2html-textprocessing-tests.xqm";
+import module namespace ttt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" at "../tests/tapi-txt-tests.xqm";
+import module namespace tct="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests" at "../tests/tapi-collection-tests.xqm";
+import module namespace thtmlt="http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests" at "../tests/tapi-html-tests.xqm";
+import module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" at "../tests/tapi-item-tests.xqm";
+import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" at "../tests/tapi-manifest-tests.xqm";
+import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "../tests/tapi-tests.xqm";
 import module namespace at="http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" at "../tests/annotation-tests.xqm";
 
-declare function local:get-human-readable-pkg-name($package as xs:string)
-as xs:string? {
-    switch ($package)
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" return "TextAPI general"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" return "TXT creation"
-        case "http://ahikar.sub.uni-goettingen.de/ns/commons-tests" return "Commons"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests" return "TextAPI Collections"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" return "TextAPI Manifests"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" return "TextAPI Items"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests" return "HTML creation"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" return "TEI2HTML transformation"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" return "TEI2HTML text processing"
-        case "http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" return "AnnotationAPI"
-        default return ()
+(:~
+ : Triggers the tests for the Ahikar backend. Called by the CI.
+ : 
+ : @param $token A CI token
+ : @return item() A log message to std out. In the Docker environment, this goes to exist.log.
+ : @error The deploy token provided is incorrect
+ :)
+declare
+  %rest:GET
+  %rest:HEAD
+  %rest:path("/trigger-tests")
+  %rest:query-param("token", "{$token}")
+function testtrigger:trigger($token)
+as item()? {
+  if( $token ne environment-variable("APP_DEPLOY_TOKEN" ))
+    then error(QName("error://1", "deploy"), "Deploy token incorrect.")
+  else
+    let $sysout := util:log-system-out("TextAPI and package installation done. running tests…")
+    let $tests := 
+        (
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
+            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests"))
+        )
+    
+    let $fileSeparator := util:system-property("file.separator")
+    let $system-path := system:get-exist-home() || $fileSeparator
+    
+    let $testWrap := <tests time="{current-dateTime()}">{ $tests }</tests>
+    
+    let $filename := $system-path || "ahikar-test-results.xml"
+    let $file := file:serialize($testWrap, $filename, ())
+    
+    return
+        util:log-system-out("Tests complete. See " || $filename)
 };
-
-let $test-results :=
-    (
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests"))
-    )
-
-for $result in $test-results
-order by $result//@package return
-    if ($result//@failures = 0
-    and $result//@errors = 0) then
-        <OK name="{local:get-human-readable-pkg-name($result//@package)}" package="{$result//@package}"/>
-    else
-        <PROBLEM name="{local:get-human-readable-pkg-name($result//@package)}"
-            package="{$result//@package}"
-            errors="{$result//@errors}"
-            failures="{$result//@failures}">
-            {$result//testcase[child::*[self::failure or self::error]]}
-        </PROBLEM>
-        
\ No newline at end of file
diff --git a/exist-app/tests/tests-runner.xq b/exist-app/tests/tests-runner.xq
index b608b0e..9c2ab16 100644
--- a/exist-app/tests/tests-runner.xq
+++ b/exist-app/tests/tests-runner.xq
@@ -17,6 +17,21 @@ import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-te
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "tei2html-textprocessing-tests.xqm";
 import module namespace at="http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" at "../tests/annotation-tests.xqm";
 
+declare function local:get-human-readable-pkg-name($package as xs:string)
+as xs:string? {
+    switch ($package)
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" return "TextAPI general"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" return "TXT creation"
+        case "http://ahikar.sub.uni-goettingen.de/ns/commons-tests" return "Commons"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests" return "TextAPI Collections"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" return "TextAPI Manifests"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" return "TextAPI Items"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests" return "HTML creation"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" return "TEI2HTML transformation"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" return "TEI2HTML text processing"
+        case "http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" return "AnnotationAPI"
+        default return ()
+};
 
 let $test-results :=
     (
@@ -32,9 +47,16 @@ let $test-results :=
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests"))
     )
 
-for $result in $test-results return
+for $result in $test-results
+order by $result//@package return
     if ($result//@failures = 0
     and $result//@errors = 0) then
-        "Everything okay: " || $result//@package
+        <OK name="{local:get-human-readable-pkg-name($result//@package)}" package="{$result//@package}"/>
     else
-        $result
\ No newline at end of file
+        <PROBLEM name="{local:get-human-readable-pkg-name($result//@package)}"
+            package="{$result//@package}"
+            errors="{$result//@errors}"
+            failures="{$result//@failures}">
+            {$result//testcase[child::*[self::failure or self::error]]}
+        </PROBLEM>
+        
\ No newline at end of file
-- 
GitLab


From 4dfd64fb71f1f55010123e384e492b86e5ca826b Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 10:31:23 +0100
Subject: [PATCH 075/155] tests: remove redundancies between API and local
 runner

Cf. #62
---
 exist-app/modules/testtrigger.xqm | 60 ++++++++++++++++++++++++-------
 exist-app/tests/tests-runner.xq   | 56 ++---------------------------
 2 files changed, 49 insertions(+), 67 deletions(-)

diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 671da1f..e56797c 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -43,19 +43,7 @@ as item()? {
     then error(QName("error://1", "deploy"), "Deploy token incorrect.")
   else
     let $sysout := util:log-system-out("TextAPI and package installation done. running tests…")
-    let $tests := 
-        (
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
-            test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests"))
-        )
+    let $tests := testtrigger:execute-tests()
     
     let $fileSeparator := util:system-property("file.separator")
     let $system-path := system:get-exist-home() || $fileSeparator
@@ -68,3 +56,49 @@ as item()? {
     return
         util:log-system-out("Tests complete. See " || $filename)
 };
+
+declare function testtrigger:execute-tests()
+as element()+ {
+    let $test-results :=
+    (
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests"))
+    )
+
+    for $result in $test-results
+    order by $result//@package return
+        if ($result//@failures = 0
+        and $result//@errors = 0) then
+            <OK name="{local:get-human-readable-pkg-name($result//@package)}" package="{$result//@package}"/>
+        else
+            <PROBLEM name="{local:get-human-readable-pkg-name($result//@package)}"
+                package="{$result//@package}"
+                errors="{$result//@errors}"
+                failures="{$result//@failures}">
+                {$result//testcase[child::*[self::failure or self::error]]}
+            </PROBLEM>
+};
+
+declare function local:get-human-readable-pkg-name($package as xs:string)
+as xs:string? {
+    switch ($package)
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" return "TextAPI general"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" return "TXT creation"
+        case "http://ahikar.sub.uni-goettingen.de/ns/commons-tests" return "Commons"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests" return "TextAPI Collections"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" return "TextAPI Manifests"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" return "TextAPI Items"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests" return "HTML creation"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" return "TEI2HTML transformation"
+        case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" return "TEI2HTML text processing"
+        case "http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" return "AnnotationAPI"
+        default return ()
+};
diff --git a/exist-app/tests/tests-runner.xq b/exist-app/tests/tests-runner.xq
index 9c2ab16..664f46f 100644
--- a/exist-app/tests/tests-runner.xq
+++ b/exist-app/tests/tests-runner.xq
@@ -5,58 +5,6 @@ xquery version "3.1";
  : Elevated rights (dba/admin) are required for some tests.
  :)
 
-import module namespace ttt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" at "tapi-txt-tests.xqm";
-import module namespace ct="http://ahikar.sub.uni-goettingen.de/ns/commons-tests" at "commons-tests.xqm";
-import module namespace tct="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests" at "tapi-collection-tests.xqm";
-import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
-import module namespace thtmlt="http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests" at "tapi-html-tests.xqm";
-import module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" at "tapi-item-tests.xqm";
-import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" at "tapi-manifest-tests.xqm";
-import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "tapi-tests.xqm";
-import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "tei2html-tests.xqm";
-import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "tei2html-textprocessing-tests.xqm";
-import module namespace at="http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" at "../tests/annotation-tests.xqm";
+import module namespace testtrigger="http://ahikar.sub.uni-goettingen.de/ns/testtrigger" at "../modules/testtrigger.xqm";
 
-declare function local:get-human-readable-pkg-name($package as xs:string)
-as xs:string? {
-    switch ($package)
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" return "TextAPI general"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" return "TXT creation"
-        case "http://ahikar.sub.uni-goettingen.de/ns/commons-tests" return "Commons"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests" return "TextAPI Collections"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" return "TextAPI Manifests"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" return "TextAPI Items"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests" return "HTML creation"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" return "TEI2HTML transformation"
-        case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" return "TEI2HTML text processing"
-        case "http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" return "AnnotationAPI"
-        default return ()
-};
-
-let $test-results :=
-    (
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests"))
-    )
-
-for $result in $test-results
-order by $result//@package return
-    if ($result//@failures = 0
-    and $result//@errors = 0) then
-        <OK name="{local:get-human-readable-pkg-name($result//@package)}" package="{$result//@package}"/>
-    else
-        <PROBLEM name="{local:get-human-readable-pkg-name($result//@package)}"
-            package="{$result//@package}"
-            errors="{$result//@errors}"
-            failures="{$result//@failures}">
-            {$result//testcase[child::*[self::failure or self::error]]}
-        </PROBLEM>
-        
\ No newline at end of file
+testtrigger:execute-tests()
\ No newline at end of file
-- 
GitLab


From 3aaffe0ad6df1dafe22ac422245d62b6e0b81030 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 11:34:40 +0100
Subject: [PATCH 076/155] tests: add more tests

---
 exist-app/data/sample_teixml.xml        |   4 +
 exist-app/modules/annotations.xqm       |  20 ++--
 exist-app/tests/annotation-tests.xqm    | 145 +++++++-----------------
 exist-app/tests/tapi-html-tests.xqm     |   4 +-
 exist-app/tests/tapi-manifest-tests.xqm |   2 +-
 5 files changed, 59 insertions(+), 116 deletions(-)

diff --git a/exist-app/data/sample_teixml.xml b/exist-app/data/sample_teixml.xml
index 83e35c3..44f9e2f 100644
--- a/exist-app/data/sample_teixml.xml
+++ b/exist-app/data/sample_teixml.xml
@@ -810,6 +810,10 @@ Ideas (or parts of ideas) that have bee marked with LC refer to the Leiden Conve
                <!-- addition with unknown type -->
                <ab> ܘܗܦܟܬ ܛܥܢܬ ܐܰܒܵܪܐ ܘܠܐ ܐܝܼܩܰܪ ܥܠܝ <add place="sidelong">ܐܝܟ</add>
                </ab>
+               
+               <pb facs="textgrid:3r85r" n="84a"/>
+               <ab>some test text</ab>
+              <ab>some test<persName>ܢܕܢ܂</persName></ab>
             </body>
          </text>
       </group>
diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index c768eae..c9fc0df 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -46,6 +46,7 @@ declare variable $anno:uris :=
     let $main-edition-object := 
         if (doc-available($commons:agg || "3r132.xml")) then
             "3r132"
+        (: this main edition object is for testing purposes :)
         else
             "sample_main_edition"
     
@@ -179,6 +180,7 @@ as xs:string {
  : @param $first-entry The IRI of the first Annotation Page that is included within the Collection
  : @param $last-entry The IRI of the last Annotation Page that is included within the Collection
  :)
+(: ## tested ## :)
 declare function anno:make-annotationCollection-map($uri as xs:string,
     $title as xs:string,
     $first-entry as xs:string,
@@ -208,6 +210,7 @@ as map() {
  : @return A string containing the creators of the annotations as stated in the
  : TEI header of the (underlying) resource(s).
  :)
+(: ## tested ## :)
 declare function anno:get-creator($uri as xs:string)
 as xs:string {
     let $xmls :=
@@ -265,6 +268,7 @@ $document as xs:string) {
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  : @return A map with all information necessary for the Annotation Collection
  :)
+(: ## tested ## :)
 declare function anno:make-annotationPage($collection as xs:string, 
     $document as xs:string,
     $server as xs:string)
@@ -493,13 +497,13 @@ $document as xs:string, $page as xs:string, $server as xs:string) {
  : 
  : At this stage, TEI files are scraped for person and place names.
  : 
- : @param $documentURI The XML's URI. Attention: This refers directly to the XML file, NOT the superordinate edition!
+ : @param $teixml-uri The XML's URI.
  : @param $page The page within an XML file, i.e. a tei:pb/@n within a TEI resource
  :)
-declare function anno:get-annotations($documentURI as xs:string,
+declare function anno:get-annotations($teixml-uri as xs:string,
     $page as xs:string)
-as map() {
-    let $pageChunk := anno:get-page-fragment($documentURI, $page)
+as map()+ {
+    let $pageChunk := anno:get-page-fragment($teixml-uri, $page)
     
     let $annotation-elements := 
         for $name in $anno:annotationElements return
@@ -509,10 +513,10 @@ as map() {
         let $id := string( $annotation/@id ) (: get the predefined ID from the in-memory TEI with IDs :)
         return
         map {
-            "id": $anno:ns || "/" || $documentURI || "/annotation-" || $id,
+            "id": $anno:ns || "/" || $teixml-uri || "/annotation-" || $id,
             "type": "Annotation",
             "bodyValue": anno:get-bodyValue($annotation),
-            "target": anno:get-target-information($annotation, $documentURI, $id)
+            "target": anno:get-target-information($annotation, $teixml-uri, $id)
         }
 };
 
@@ -771,7 +775,7 @@ declare function anno:is-resource-xml($uri as xs:string) as xs:boolean {
  : @param $uri The resource's URI
  : @return true() if resources stated by $uri is an edition object
  :)
-(: ## tested ää :)
+(: ## tested ## :)
 declare function anno:is-resource-edition($map as map(),
     $uri as xs:string)
 as xs:boolean {
@@ -841,7 +845,7 @@ as xs:string* {
             let $edition := anno:get-parent-aggregation($uri)
             return
                 anno:get-prev-xml-uris($edition)
-    else if(anno:is-resource-edition($anno-uris, $uri)) then
+    else if(anno:is-resource-edition($anno:uris, $uri)) then
         anno:get-prev-xml-uris($uri)
     else
         ()
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index ee17dc4..a888891 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -22,7 +22,7 @@ as xs:boolean {
 };
 
 declare
-    %test:args("sample_teixml") %test:assertXPath("count($result) = 4")
+    %test:args("sample_teixml") %test:assertXPath("count($result) = 5")
     %test:args("sample_teixml") %test:assertXPath("$result = '82a'")
 function at:get-pages-in-TEI($uri as xs:string)
 as xs:string+ {
@@ -129,8 +129,8 @@ as element(tei:TEI) {
 };
 
 declare
-    %test:args("sample_main_edition") %test:assertEquals("65")
-    %test:args("sample_lang_aggregation") %test:assertEquals("65")
+    %test:args("sample_main_edition") %test:assertEquals("66")
+    %test:args("sample_lang_aggregation") %test:assertEquals("66")
 function at:get-total-no-of-annotations($uri as xs:string) {
     anno:get-total-no-of-annotations($uri)
 };
@@ -213,108 +213,43 @@ as xs:string? {
     anno:get-prev-or-next-page($manifest-uri, $page, $type)
 };
 
-(:declare:)
-(:    %test:args("3r679", "114r"):)
-(:    %test:assertEquals("0"):)
-(:function at:anno-determine-start-index-for-page($uri as xs:string, $page as xs:string) {:)
-(:    anno:determine-start-index-for-page($uri, $page):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertEquals("16"):)
-(:function at:anno-determine-start-index($uri as xs:string) {:)
-(:    anno:determine-start-index($uri):)
-(:};:)
-(::)
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertEquals("3r679"):)
-(:function at:anno-get-parent-aggregation($uri as xs:string) {:)
-(:    anno:get-parent-aggregation($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertEquals("114r", "114v"):)
-(:function at:anno-get-pages-in-TEI($uri as xs:string) {:)
-(:    anno:get-pages-in-TEI($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r679"):)
-(:    %test:assertTrue:)
-(:function at:anno-is-resource-edition($uri as xs:string) {:)
-(:    anno:is-resource-edition($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertTrue:)
-(:function at:anno-is-resource-xml($uri as xs:string) {:)
-(:    anno:is-resource-xml($uri):)
-(:};:)
-
-
-(::)
-(:declare:)
-(:    %test:args("asdf"):)
-(:    %test:assertFalse:)
-(:(:    %test:args("3r131"):):)
-(:(:    %test:assertTrue:):)
-(:function at:anno-are-resources-available($resources as xs:string+) {:)
-(:    anno:are-resources-available($resources):)
-(:};:)
-
+declare
+    %test:args("sample_teixml") %test:assertEquals("Simon Birol, Aly Elrefaei")
+    %test:args("sample_edition") %test:assertEquals("Simon Birol, Aly Elrefaei")
+function at:get-creator($uri as xs:string)
+as xs:string {
+    anno:get-creator($uri)
+};
 
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertEquals("Simon Birol, Aly Elrefaei"):)
-(:function at:anno-get-creator($uri as xs:string) {:)
-(:    anno:get-creator($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r131"):)
-(:    %test:assertEquals("Brit. Lib. Add. 7200"):)
-(:function at:anno-get-metadata-title($uri as xs:string) {:)
-(:    anno:get-metadata-title($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r679"):)
-(:    %test:assertEquals("3r676", "3r672"):)
-(:function at:anno-get-prev-xml-uris($uri as xs:string) {:)
-(:    anno:get-prev-xml-uris($uri):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r679"):)
-(:    %test:assertEquals("3r676", "3r672"):)
-(:function at:anno-get-xmls-prev-in-collection($uri as xs:string) {:)
-(:    anno:get-xmls-prev-in-collection($uri):)
-(:};:)
+declare
+    %test:args("sample_edition", 
+        "Beispieledition", 
+        "http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation/sample_edition/82a/annotationPage.json", 
+        "http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation/sample_edition/83b/annotationPage.json")
+    %test:assertXPath("map:get($result, 'annotationCollection') => map:get('label') = 'Ahikar annotations for textgrid:sample_edition: Beispieledition'")
+    %test:assertXPath("map:get($result, 'annotationCollection') => map:get('x-creator') = 'Simon Birol, Aly Elrefaei'")
+function at:make-annotationCollection-map($uri as xs:string,
+    $title as xs:string,
+    $first-entry as xs:string,
+    $last-entry as xs:string)
+as map() {
+    anno:make-annotationCollection-map($uri, $title, $first-entry, $last-entry)
+};
 
+declare
+    %test:args("sample_lang_aggregation", "sample_edition", "http://localhost:8080")
+    %test:assertXPath("map:get($result, 'annotationPage') => map:get('id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationPage/sample_lang_aggregation/sample_edition'")
+function at:make-annotationPage($collection as xs:string, 
+    $manifest as xs:string,
+    $server as xs:string)
+as map() {
+    anno:make-annotationPage($collection, $manifest, $server)
+};
 
-(:declare:)
-(:    %test:args("3r679", "114r", "next"):)
-(:    %test:assertEquals("114v"):)
-(:function at:anno-get-prev-or-next-page($documentURI as xs:string,:)
-(:$page as xs:string, $type as xs:string) {:)
-(:    anno:get-prev-or-next-page($documentURI, $page, $type):)
-(:};:)
-(::)
-(::)
-(:declare:)
-(:    %test:args("3r9ps"):)
-(:    %test:assertEquals("3r177", "3r178", "3r7vw", "3r7p1", "3r7p9", "3r7sk", "3r7tp", "3r7vd", "3r179", "3r7n0", "3r9vn", "3r9wf", "3rb3z", "3rbm9", "3rbmc", "3rx14", "3vp38"):)
-(:function at:anno-get-uris($documentURI) {:)
-(:    anno:get-uris($documentURI):)
-(:};:)
+declare
+    %test:args("sample_teixml", "83b") %test:assertXPath("count($result) = 15")
+function at:get-annotations($teixml-uri as xs:string,
+    $page as xs:string)
+as map()+ {
+    anno:get-annotations($teixml-uri, $page)
+};
diff --git a/exist-app/tests/tapi-html-tests.xqm b/exist-app/tests/tapi-html-tests.xqm
index cb5b126..166b087 100644
--- a/exist-app/tests/tapi-html-tests.xqm
+++ b/exist-app/tests/tapi-html-tests.xqm
@@ -24,8 +24,8 @@ declare
     %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result[local-name(.) = 'pb']")
     %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result/@facs = 'textgrid:3r1p0'")
     %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result/@n = '82b'")
-    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "83b") %test:assertXPath("$result[local-name(.) = 'ab']")
-    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "83b") %test:assertXPath("matches($result, 'ܘܗܦܟܬ ܛܥܢܬ ܐܰܒܵܪܐ ܘܠܐ ܐܝܼܩܰܪ ܥܠ')")
+    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "84a") %test:assertXPath("$result[local-name(.) = 'ab']")
+    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "84a") %test:assertXPath("matches($result, 'ܢܕܢ')")
 function thtmlt:get-end-node($tei-xml-base-uri as xs:string,
     $page as xs:string)
 as item()+ {
diff --git a/exist-app/tests/tapi-manifest-tests.xqm b/exist-app/tests/tapi-manifest-tests.xqm
index 2811fdf..62eb08d 100644
--- a/exist-app/tests/tapi-manifest-tests.xqm
+++ b/exist-app/tests/tapi-manifest-tests.xqm
@@ -143,7 +143,7 @@ function tmt:make-sequences($collection-uri as xs:string,
 };
 
 declare
-     %test:args("sample_edition") %test:assertXPath("count($result) = 4")
+     %test:args("sample_edition") %test:assertXPath("count($result) = 5")
 function tmt:get-valid-page-ids($manifest-uri as xs:string) {
     tapi-mani:get-valid-page-ids($manifest-uri)
 };
-- 
GitLab


From a97eb015d53309c1b6a38306a348acca7e76c910 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 11:34:57 +0100
Subject: [PATCH 077/155] fix: include start and end nodes in fragments

---
 exist-app/modules/tapi-html.xqm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/exist-app/modules/tapi-html.xqm b/exist-app/modules/tapi-html.xqm
index dd83c2c..920be10 100644
--- a/exist-app/modules/tapi-html.xqm
+++ b/exist-app/modules/tapi-html.xqm
@@ -42,8 +42,9 @@ as element() {
         $start-node := $node//tei:pb[@n = $page and @facs],
         $end-node := tapi-html:get-end-node($start-node),
         $wrap-in-first-common-ancestor-only := false(),
-        $include-start-and-end-nodes := false(),
+        $include-start-and-end-nodes := true(),
         $empty-ancestor-elements-to-include := ("")
+        
     return
         fragment:get-fragment-from-doc(
             $node,
-- 
GitLab


From 17cf480fd2a5cee957fd40fea65da01f8c0d85f9 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 13:29:56 +0100
Subject: [PATCH 078/155] tests: add more tests

---
 exist-app/modules/annotations.xqm    | 86 ++++++++++++++--------------
 exist-app/tests/annotation-tests.xqm | 81 ++++++++++++++++++++++++++
 2 files changed, 124 insertions(+), 43 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index c9fc0df..69e79e6 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -500,6 +500,7 @@ $document as xs:string, $page as xs:string, $server as xs:string) {
  : @param $teixml-uri The XML's URI.
  : @param $page The page within an XML file, i.e. a tei:pb/@n within a TEI resource
  :)
+(: ## tested ## :)
 declare function anno:get-annotations($teixml-uri as xs:string,
     $page as xs:string)
 as map()+ {
@@ -512,12 +513,12 @@ as map()+ {
     for $annotation in $annotation-elements return
         let $id := string( $annotation/@id ) (: get the predefined ID from the in-memory TEI with IDs :)
         return
-        map {
-            "id": $anno:ns || "/" || $teixml-uri || "/annotation-" || $id,
-            "type": "Annotation",
-            "bodyValue": anno:get-bodyValue($annotation),
-            "target": anno:get-target-information($annotation, $teixml-uri, $id)
-        }
+            map {
+                "id": $anno:ns || "/" || $teixml-uri || "/annotation-" || $id,
+                "type": "Annotation",
+                "bodyValue": anno:get-bodyValue($annotation),
+                "target": anno:get-target-information($annotation, $teixml-uri, $id)
+            }
 };
 
 
@@ -713,29 +714,37 @@ as item()? {
  : @param $type "prev" for getting the previous page, "next" for getting the next page
  : @return 
  :)
+(: ## tested ## :)
 declare function anno:get-prev-or-next-annotationPage-ID($collection as xs:string,
-$document as xs:string, $type as xs:string) {
+    $document as xs:string,
+    $type as xs:string)
+as xs:string? {
     let $collection-keys := anno:find-in-map($anno:uris, $collection) => map:keys()
-    let $no-of-keys := count($collection-keys)
-    let $position := index-of($collection-keys, $document)
+    return
+        anno:get-prev-or-next($collection-keys, $document, $type)
+};
+
+(: ## tested ## :)
+declare function anno:get-prev-or-next($entities as item()+,
+    $searched-for as xs:string,
+    $type as xs:string)
+as xs:string? {
+    let $no-of-entities := count($entities)
+    let $position-of-searched-for := index-of($entities, $searched-for)
     let $new-position := 
         if ($type = "prev") then
-            $position - 1
+            $position-of-searched-for - 1
         else
-            $position + 1
+            $position-of-searched-for + 1
     return
-        switch ($type)
-            case "prev" return
-                if ($new-position le $no-of-keys) then
-                    $collection-keys[$new-position]
-                else
-                    ()
-            case "next" return
-                if ($new-position le $no-of-keys) then
-                    $collection-keys[$new-position]
-                else
-                    ()
-            default return ()
+        if ($new-position le $no-of-entities
+        and ($type = "prev"
+        and $new-position != 0
+        or
+        $type = "next")) then
+            $entities[$new-position]
+        else
+            ()
 };
 
 (: ## tested ## :)
@@ -809,22 +818,8 @@ declare function anno:get-prev-or-next-page($manifest-uri as xs:string,
 as xs:string? {
     let $tei := anno:find-in-map($anno:uris, $manifest-uri)
     let $pages := anno:get-pages-in-TEI($tei)
-    let $no-of-pages := count($pages)
-    let $current-position := index-of($pages, $page)
-    let $new-position :=
-        if ($type = "next") then
-            $current-position + 1
-        else
-            $current-position - 1
     return
-        if ($new-position le $no-of-pages
-        and ($type = "prev"
-        and $new-position != 0
-        or
-        $type = "next")) then
-            $pages[$new-position]
-        else
-            ()
+        anno:get-prev-or-next($pages, $page, $type)
 };
 
 
@@ -865,7 +860,8 @@ as xs:string* {
  : @param $uri The URI of the current edition
  : @return A list of all URIs of TEI resources that appear before the given edition in a collection 
  :)
-declare function anno:get-prev-xml-uris($uri as xs:string) as xs:string* {
+declare function anno:get-prev-xml-uris($uri as xs:string)
+as xs:string* {
     let $collection := anno:get-parent-aggregation($uri)
     let $collection := commons:get-document($collection, "agg")
     
@@ -909,7 +905,9 @@ as xs:string? {
  : an edition.
  : @return The relative position of the first annotation
  :)
-declare function anno:determine-start-index($uri as xs:string) as xs:integer {
+(: ## tested ## :)
+declare function anno:determine-start-index($uri as xs:string)
+as xs:integer {
     let $resourceType := commons:get-document($uri, "meta")//tgmd:format
     return
         if ($resourceType = "text/tg.aggregation+xml") then
@@ -946,18 +944,20 @@ declare function anno:determine-start-index($uri as xs:string) as xs:integer {
  : XML file, and this function returns the start index for a page in a TEI/XML.
  : 
  : @see https://www.w3.org/TR/annotation-model/#annotation-page
- : @param $uri The URI of the given resource. This may refers to an edition.
+ : @param $uri The URI of the given resource. This may refer to an edition.
  : @param $page The @n attribute of the current tei:pb
  : @return The relative position of the first annotation
  :)
+(: ## tested ## :)
 declare function anno:determine-start-index-for-page($uri as xs:string,
-$page as xs:string) as xs:integer {
+    $page as xs:string)
+as xs:integer {
     let $xml := anno:find-in-map($anno:uris, $uri)
     let $doc := commons:get-document($xml, "data")
     let $currentPb := $doc//tei:pb[@n = $page and @facs]
     let $noOfAnnotationsPerElement :=
         for $name in $anno:annotationElements return
-            count($doc//tei:text//*[name(.) = $name][. << $currentPb])
+            count($doc//*[name(.) = $name][.[ancestor::tei:text[1] = $currentPb/ancestor::tei:text[1]] << $currentPb])
     return
         sum($noOfAnnotationsPerElement)
 };
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index a888891..60a4714 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -11,6 +11,8 @@ import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/annotations.xqm";
 
+import module namespace console="http://exist-db.org/xquery/console";
+
 declare variable $at:sample-doc := doc($commons:data || "/sample_teixml.xml");
 
 declare
@@ -239,6 +241,7 @@ as map() {
 declare
     %test:args("sample_lang_aggregation", "sample_edition", "http://localhost:8080")
     %test:assertXPath("map:get($result, 'annotationPage') => map:get('id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationPage/sample_lang_aggregation/sample_edition'")
+    %test:pending
 function at:make-annotationPage($collection as xs:string, 
     $manifest as xs:string,
     $server as xs:string)
@@ -253,3 +256,81 @@ function at:get-annotations($teixml-uri as xs:string,
 as map()+ {
     anno:get-annotations($teixml-uri, $page)
 };
+
+declare
+    %test:args("sample_teixml", "84a")
+    %test:assertXPath("$result = 'A person''s name.'")
+function at:get-annotations-detailed-bodyValue($teixml-uri as xs:string,
+    $page as xs:string)
+as xs:string {
+    let $result-map := anno:get-annotations($teixml-uri, $page)
+    let $bodyValue := map:get($result-map, "bodyValue")
+    return
+        $bodyValue
+};
+
+declare
+    %test:args("sample_teixml", "84a")
+    %test:assertXPath("$result = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/sample_teixml/annotation-N4.4.2.4.4.354.2'")
+function at:get-annotations-detailed-id($teixml-uri as xs:string,
+    $page as xs:string)
+as xs:string {
+    let $result-map := anno:get-annotations($teixml-uri, $page)
+    let $id := map:get($result-map, "id")
+    return
+        $id
+};
+
+declare
+    %test:args("sample_teixml", "84a")
+    %test:assertXPath("$result instance of map()")
+function at:get-annotations-detailed-target($teixml-uri as xs:string,
+    $page as xs:string)
+as map() {
+    let $result-map := anno:get-annotations($teixml-uri, $page)
+    let $target := map:get($result-map, "target")
+    return
+        $target
+};
+
+declare
+    %test:args("sample_edition", "82a") %test:assertEquals("0")
+    %test:args("sample_edition", "82b") %test:assertEquals("11")
+function at:determine-start-index-for-page($uri as xs:string,
+    $page as xs:string)
+as xs:integer {
+    anno:determine-start-index-for-page($uri, $page)
+};
+
+declare
+    %test:args("sample_lang_aggregation") %test:assertEquals("0")
+    %test:args("sample_edition") %test:assertEquals("0")
+    %test:args("sample_teixml") %test:assertEquals("0")
+function at:determine-start-index($uri as xs:string)
+as xs:integer {
+    anno:determine-start-index($uri)
+};
+
+
+declare
+    %test:args("next", "1r") %test:assertEquals("1v")
+    %test:args("prev", "1r") %test:assertEmpty
+    %test:args("next", "2r") %test:assertEmpty
+    %test:args("prev", "2r") %test:assertEquals("1ab")
+function at:get-prev-or-next($type as xs:string,
+    $searched-for as xs:string)
+as xs:string? {
+    let $entities := ("1r", "1v", "1ab", "2r")
+    return
+        anno:get-prev-or-next($entities, $searched-for, $type)
+};
+
+declare
+    %test:args("sample_lang_aggregation", "sample_edition", "next") %test:assertEmpty
+    %test:args("sample_lang_aggregation", "sample_edition", "prev") %test:assertEmpty
+function anno:get-prev-or-next-annotationPage-ID($collection as xs:string,
+    $document as xs:string,
+    $type as xs:string)
+as xs:string? {
+    anno:get-prev-or-next-annotationPage-ID($collection, $document, $type)
+};
\ No newline at end of file
-- 
GitLab


From 2dc4148dc9f00851ac575c6a2c42e8fd7bc2459b Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 13:31:47 +0100
Subject: [PATCH 079/155] fix: remove console module

---
 exist-app/tests/annotation-tests.xqm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index 60a4714..eadbdf6 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -11,8 +11,6 @@ import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/annotations.xqm";
 
-import module namespace console="http://exist-db.org/xquery/console";
-
 declare variable $at:sample-doc := doc($commons:data || "/sample_teixml.xml");
 
 declare
-- 
GitLab


From db1a34ada4f82af0ab39f313e065e02b7d120b8b Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 14:49:20 +0100
Subject: [PATCH 080/155] tests: add more tests

---
 exist-app/modules/annotations.xqm    | 28 ++++++++---
 exist-app/tests/annotation-tests.xqm | 73 +++++++++++++++++++++++++++-
 2 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/annotations.xqm
index 69e79e6..16afc1b 100644
--- a/exist-app/modules/annotations.xqm
+++ b/exist-app/modules/annotations.xqm
@@ -24,7 +24,6 @@ import module namespace requestr="http://exquery.org/ns/request";
 import module namespace rest="http://exquery.org/ns/restxq";
 import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "tapi-html.xqm";
 
-
 declare variable $anno:ns := "http://ahikar.sub.uni-goettingen.de/ns/annotations";
 declare variable $anno:server :=
     if(try {
@@ -108,7 +107,11 @@ function anno:collection-rest($collection as xs:string) {
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  : @return A map with all information necessary for the Annotation Collection
  :)
-declare function anno:make-annotationCollection($collection as xs:string, $document as xs:string?, $server as xs:string) as map(){
+(: ## tested ## :)
+declare function anno:make-annotationCollection($collection as xs:string,
+    $document as xs:string?,
+    $server as xs:string)
+as map() {
     (: if $document is a collection then its value in $anno:uris is a map containing the aggregated manifests.
     at this point it is relevant if $document is actually a manifest or a collection.
     we have to create different paths containing $first and $last for the two of them,
@@ -146,7 +149,10 @@ declare function anno:make-annotationCollection($collection as xs:string, $docum
  : @param The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  : @return A map with all information necessary for the Annotation Collection
  :)
-declare function anno:get-information-for-collection-object($collectionURI as xs:string, $server as xs:string) as map() {
+(: ## tested ## :)
+declare function anno:get-information-for-collection-object($collectionURI as xs:string,
+    $server as xs:string)
+as map() {
     let $child-keys := anno:find-in-map($anno:uris, $collectionURI) => map:keys()
     let $first := $child-keys[1]
     let $last := $child-keys[last()]
@@ -429,7 +435,9 @@ declare
     %rest:path("/api/annotations/ahikar/{$collection}/{$document}/{$page}/annotationPage.json")
     %output:method("json")
 function anno:annotationPage-for-manifest-rest($collection as xs:string, 
-$document as xs:string, $page as xs:string) {
+    $document as xs:string,
+    $page as xs:string)
+as element()+ {
     if (anno:are-resources-available(($collection, $document))) then
         ($commons:responseHeader200,
         anno:make-annotationPage-for-manifest($collection, $document, $page, $anno:server))
@@ -453,8 +461,12 @@ $document as xs:string, $page as xs:string) {
  : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  :)
+(: ## tested ## :)
 declare function anno:make-annotationPage-for-manifest($collection as xs:string,
-$document as xs:string, $page as xs:string, $server as xs:string) {
+    $document as xs:string,
+    $page as xs:string,
+    $server as xs:string)
+as map() {
     let $docTitle := anno:get-metadata-title($document)
     let $xml := anno:find-in-map($anno:uris, $document)
     let $prevPage := anno:get-prev-or-next-page($document, $page, "prev")
@@ -834,6 +846,7 @@ as xs:string? {
  : @param $uri The URI of the current resource. This may refer to a edition or TEI/XML.
  : @return A list of URIs that appear before the given resource in a collection 
  :)
+(: ## tested ## :)
 declare function anno:get-xmls-prev-in-collection($uri as xs:string)
 as xs:string* {
     if (anno:is-resource-xml($uri)) then
@@ -860,6 +873,7 @@ as xs:string* {
  : @param $uri The URI of the current edition
  : @return A list of all URIs of TEI resources that appear before the given edition in a collection 
  :)
+(: ## tested ## :)
 declare function anno:get-prev-xml-uris($uri as xs:string)
 as xs:string* {
     let $collection := anno:get-parent-aggregation($uri)
@@ -868,7 +882,9 @@ as xs:string* {
     let $tgURI := "textgrid:" || $uri
     let $tgURINode := $collection//@rdf:resource[./string() = $tgURI]
     let $prevEditions := $collection//@rdf:resource[. << $tgURINode]
-    let $prevEditionsURIs := for $edition in $prevEditions return replace($edition, "textgrid:", "")
+    let $prevEditionsURIs := 
+        for $edition in $prevEditions return
+            replace($edition, "textgrid:", "")
     
     for $edition in $prevEditionsURIs return
         anno:find-in-map($anno:uris, $edition)
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index eadbdf6..abca7af 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -7,7 +7,6 @@ declare namespace tei="http://www.tei-c.org/ns/1.0";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
 import module namespace map="http://www.w3.org/2005/xpath-functions/map";
-import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/annotations.xqm";
 
@@ -89,7 +88,8 @@ as xs:string {
 
 declare
     %test:assertEquals("A place's name.")
-function at:anno-get-bodyValue() {
+function at:anno-get-bodyValue()
+as xs:string {
     let $annotation := $at:sample-doc//tei:text[@type = "transcription"]/descendant::tei:placeName[1]
     return
         anno:get-bodyValue($annotation)
@@ -331,4 +331,73 @@ function anno:get-prev-or-next-annotationPage-ID($collection as xs:string,
     $type as xs:string)
 as xs:string? {
     anno:get-prev-or-next-annotationPage-ID($collection, $document, $type)
+};
+
+declare
+    %test:args("sample_lang_aggregation", "sample_edition", "84a", "http://localhost:8080")
+    %test:assertEquals("http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationPage/sample_lang_aggregation/sample_edition-84a")
+function at:make-annotationPage-for-manifest-id($collection as xs:string,
+    $document as xs:string,
+    $page as xs:string,
+    $server as xs:string)
+as xs:string {
+    let $result := anno:make-annotationPage-for-manifest($collection, $document, $page, $server)
+    return
+        map:get($result, "annotationPage")
+        => map:get("id")
+};
+
+
+declare
+    %test:args("sample_lang_aggregation", "sample_edition", "84a", "http://localhost:8080")
+    %test:assertEquals("http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationCollection/sample_edition")
+function at:make-annotationPage-for-manifest-part-of($collection as xs:string,
+    $document as xs:string,
+    $page as xs:string,
+    $server as xs:string)
+as xs:string {
+    let $result := anno:make-annotationPage-for-manifest($collection, $document, $page, $server)
+    return
+        map:get($result, "annotationPage")
+        => map:get("partOf")
+        => map:get("id")
+};
+
+declare
+    %test:args("sample_lang_aggregation", "http://localhost:8080")
+    %test:assertEquals("http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationPage.json")
+function at:get-information-for-collection-object($collectionURI as xs:string,
+    $server as xs:string)
+as xs:string {
+    let $result := anno:get-information-for-collection-object($collectionURI, $server)
+    return
+        map:get($result, "annotationCollection")
+        => map:get("first")
+};
+
+declare
+    %test:args("sample_lang_aggregation", "sample_edition", "http://localhost:8080")
+    %test:assertXPath("$result instance of map()")
+    %test:args("sample_lang_aggregation", "", "http://localhost:8080")
+    %test:assertXPath("$result instance of map()")
+function at:make-annotationCollection($collection as xs:string,
+    $document as xs:string?,
+    $server as xs:string)
+as map() {
+    anno:make-annotationCollection($collection, $document, $server)
+};
+
+declare
+    %test:args("sample_teixml") %test:assertEmpty
+function at:get-prev-xml-uris($uri as xs:string)
+as xs:string* {
+    anno:get-prev-xml-uris($uri)
+};
+
+declare
+    %test:args("sample_teixml") %test:assertEmpty
+    %test:args("sample_edition") %test:assertEmpty
+function at:get-xmls-prev-in-collection($uri as xs:string)
+as xs:string* {
+    anno:get-xmls-prev-in-collection($uri)
 };
\ No newline at end of file
-- 
GitLab


From 6907361a11f7bb0b927e02cdcb9b908aa69bd3ed Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 14:53:25 +0100
Subject: [PATCH 081/155] chore: remove unused module

---
 exist-app/tests/tapi-tests.xqm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/exist-app/tests/tapi-tests.xqm b/exist-app/tests/tapi-tests.xqm
index 5939dca..7eaa7ce 100644
--- a/exist-app/tests/tapi-tests.xqm
+++ b/exist-app/tests/tapi-tests.xqm
@@ -12,7 +12,6 @@ module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests";
 declare namespace http = "http://expath.org/ns/http-client";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 
-import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/annotations.xqm";
 import module namespace map="http://www.w3.org/2005/xpath-functions/map";
 import module namespace tapi="http://ahikar.sub.uni-goettingen.de/ns/tapi" at "../modules/tapi.xqm";
 import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
-- 
GitLab


From 30152c103179d773b3f4fdbd4f482ae6b8ce2189 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 14:54:14 +0100
Subject: [PATCH 082/155] refactor: move annotation.xqm to separate
 subcollection

---
 exist-app/modules/{ => AnnotationAPI}/annotations.xqm | 0
 exist-app/tests/annotation-tests.xqm                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename exist-app/modules/{ => AnnotationAPI}/annotations.xqm (100%)

diff --git a/exist-app/modules/annotations.xqm b/exist-app/modules/AnnotationAPI/annotations.xqm
similarity index 100%
rename from exist-app/modules/annotations.xqm
rename to exist-app/modules/AnnotationAPI/annotations.xqm
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index abca7af..036b610 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -8,7 +8,7 @@ declare namespace tei="http://www.tei-c.org/ns/1.0";
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
 import module namespace map="http://www.w3.org/2005/xpath-functions/map";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
-import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/annotations.xqm";
+import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "../modules/AnnotationAPI/annotations.xqm";
 
 declare variable $at:sample-doc := doc($commons:data || "/sample_teixml.xml");
 
-- 
GitLab


From f514a2e7169e15851ff8c6c674915c8c99bc62e5 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 15:17:08 +0100
Subject: [PATCH 083/155] refactor: move REST to separate module

---
 .../AnnotationAPI/annotations-rest.xqm        | 194 ++++++++++++++++++
 .../modules/AnnotationAPI/annotations.xqm     | 180 +---------------
 exist-app/modules/testtrigger.xqm             |   5 +-
 exist-app/tests/annotation-rest-tests.xqm     |  21 ++
 exist-app/tests/annotation-tests.xqm          |  13 +-
 5 files changed, 222 insertions(+), 191 deletions(-)
 create mode 100644 exist-app/modules/AnnotationAPI/annotations-rest.xqm
 create mode 100644 exist-app/tests/annotation-rest-tests.xqm

diff --git a/exist-app/modules/AnnotationAPI/annotations-rest.xqm b/exist-app/modules/AnnotationAPI/annotations-rest.xqm
new file mode 100644
index 0000000..3fde836
--- /dev/null
+++ b/exist-app/modules/AnnotationAPI/annotations-rest.xqm
@@ -0,0 +1,194 @@
+xquery version "3.1";
+
+(:~
+ : This module provides the REST interface for Ahiqar's AnnotationAPI.
+ :
+ : @author Michelle Weidling
+ : @version 1.8.1
+ : @since 1.7.0
+ : @see https://subugoe.pages.gwdg.de/ahiqar/api-documentation/
+ : @see https://subugoe.pages.gwdg.de/ahiqar/api-documentation/page/text-api-specs/
+ : :)
+
+module namespace anno-rest="http://ahikar.sub.uni-goettingen.de/ns/annotations/rest";
+
+declare namespace tei="http://www.tei-c.org/ns/1.0";
+declare namespace ore="http://www.openarchives.org/ore/terms/";
+declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
+
+import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "annotations.xqm";
+import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
+import module namespace requestr="http://exquery.org/ns/request";
+import module namespace rest="http://exquery.org/ns/restxq";
+
+declare variable $anno-rest:server :=
+    if(try {
+    requestr:hostname() = "existdb"
+} catch * {
+    true()
+})
+    then doc("../expath-pkg.xml")/*/@name => replace("/$", "")
+    else "http://localhost:8094/exist/restxq";
+
+(:~
+ : Returns annotation information about a single collection. Although this works for all collections,
+ : it has mainly been designed for Ahikar's main collection, 3r132.
+ : 
+ : For retrieving annotation information about other collections cf. the endpoint
+ : /annotations/ahikar/{$collection}/{$document}/annotationCollection.json
+ : 
+ : @param $collection The URI of the collection, e.g. '3r132'
+ : @return An Annotation Collecion for the given collection
+ :)
+declare
+    %rest:GET
+    %rest:HEAD
+    %rest:path("/annotations/ahikar/{$collection}/annotationCollection.json")
+    %output:method("json")
+function anno-rest:collection-rest($collection as xs:string) {
+    if (anno:are-resources-available($collection)) then
+        ($commons:responseHeader200,
+        anno:make-annotationCollection($collection, (), $anno-rest:server))
+    else
+        anno-rest:get-404-header($collection)
+};
+
+(:~
+ : Returns the Annotation Page of a given Collection Object according to W3C.
+ : 
+ : @see https://www.w3.org/TR/annotation-model/#annotation-page
+ : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
+ : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
+ : 
+ : @param $collection The URI of the Collection Object
+ : @param $document The URI of an aggregated Collection or Manifest Object
+ :)
+declare
+    %rest:GET
+    %rest:HEAD
+    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/annotationPage.json")
+    %output:method("json")
+function anno-rest:annotationPage-for-collection-rest($collection as xs:string, 
+$document as xs:string) {
+    if (anno:are-resources-available(($collection, $document))) then
+        ($commons:responseHeader200,
+        anno:make-annotationPage($collection, $document, $anno-rest:server))
+        
+    else
+        anno-rest:get-404-header(($collection, $document))
+};
+
+
+(:~
+ : Returns the Annotation Collection of a given Collection or Manifest Object according to W3C.
+ : 
+ : The Collection Object given by $collection mainly serves for identification and compliance
+ : with the TextAPI.
+ : 
+ : @see https://www.w3.org/TR/annotation-model/#annotation-collection
+ : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
+ : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
+ : 
+ : @param $collection The URI of the Collection Object
+ : @param $document The URI of an aggregated Collection or Manifest Object
+ : @return An Annotation Collecion for the given Collection or Manifest Object
+ :)
+declare
+    %rest:GET
+    %rest:HEAD
+    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/annotationCollection.json")
+    %output:method("json")
+function anno-rest:manifest-rest($collection as xs:string, 
+$document as xs:string) {
+    if (anno:are-resources-available(($collection, $document))) then
+        ($commons:responseHeader200,
+        anno:make-annotationCollection($collection, $document, $anno-rest:server))
+        
+    else
+        anno-rest:get-404-header(($collection, $document))
+};
+
+
+(:~
+ : Returns the Annotation Collection of a given Collection or Manifest Object according to W3C.
+ : 
+ : The Collection Object given by $collection mainly serves for identification and compliance
+ : with the TextAPI.
+ : 
+ : @see https://www.w3.org/TR/annotation-model/#annotation-collection
+ : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
+ : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
+ : 
+ : @param $collection The URI of the Collection Object
+ : @param $document The URI of an aggregated Collection or Manifest Object
+ : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
+ : @return An Annotation Collection for the given Collection or Manifest Object
+ :)
+declare
+    %rest:GET
+    %rest:HEAD
+    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/{$page}/annotationCollection.json")
+    %output:method("json")
+function anno-rest:annotationCollection-for-manifest-rest($collection as xs:string, 
+$document as xs:string, $page as xs:string) {
+    if (anno:are-resources-available(($collection, $document))) then
+        ($commons:responseHeader200,
+        anno:make-annotationCollection-for-manifest($collection, $document, $page, $anno-rest:server))
+        
+    else
+        anno-rest:get-404-header(($collection, $document))
+};
+
+(:~
+ : Returns the Annotation Page of a given Collection or Manifest Object according to W3C.
+ : 
+ : The Collection Object given by $collection mainly serves for identification and compliance
+ : with the TextAPI.
+ : 
+ : @see https://www.w3.org/TR/annotation-model/#annotation-page
+ : @see https://www.w3.org/TR/annotation-model/#annotation-page
+ : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
+ : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
+ : 
+ : @param $collection The URI of the Collection Object
+ : @param $document The URI of an aggregated Collection or Manifest Object
+ : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
+ : @return An Annotation Page for the given Collection or Manifest Object
+ :)
+declare
+    %rest:GET
+    %rest:HEAD
+    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/{$page}/annotationPage.json")
+    %output:method("json")
+function anno-rest:annotationPage-for-manifest-rest($collection as xs:string, 
+    $document as xs:string,
+    $page as xs:string)
+as element()+ {
+    if (anno:are-resources-available(($collection, $document))) then
+        ($commons:responseHeader200,
+        anno:make-annotationPage-for-manifest($collection, $document, $page, $anno-rest:server))
+        
+    else
+        anno-rest:get-404-header(($collection, $document))
+};
+
+(:~
+ : Creates a HTTP 404 header containing information about missing resources.
+ : This function is called whenever an API call is made but at least one of the
+ : requested resources isn't available.
+ : 
+ : @param $resources The URIs of resource's requested in an API call
+ : @return The response header
+ :)
+(:  ## tested ## :)
+declare function anno-rest:get-404-header($resources as xs:string+) {
+    <rest:response>
+        <http:response xmlns:http="http://expath.org/ns/http-client" 
+            status="404"
+            message="One of the following requested resources couldn't be found: {string-join($resources, ", ")}">
+            <http:header name="Access-Control-Allow-Origin" value="*"/>
+        </http:response>
+    </rest:response>
+};
\ No newline at end of file
diff --git a/exist-app/modules/AnnotationAPI/annotations.xqm b/exist-app/modules/AnnotationAPI/annotations.xqm
index 16afc1b..24ae575 100644
--- a/exist-app/modules/AnnotationAPI/annotations.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations.xqm
@@ -18,21 +18,11 @@ declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";
 declare namespace rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
 
-import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
+import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../commons.xqm";
 import module namespace functx = "http://www.functx.com";
-import module namespace requestr="http://exquery.org/ns/request";
-import module namespace rest="http://exquery.org/ns/restxq";
-import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "tapi-html.xqm";
+import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "../tapi-html.xqm";
 
 declare variable $anno:ns := "http://ahikar.sub.uni-goettingen.de/ns/annotations";
-declare variable $anno:server :=
-    if(try {
-    requestr:hostname() = "existdb"
-} catch * {
-    true()
-})
-    then doc("../expath-pkg.xml")/*/@name => replace("/$", "")
-    else "http://localhost:8094/exist/restxq";
 
 declare variable $anno:annotationElements := 
     (
@@ -72,30 +62,6 @@ declare variable $anno:uris :=
         }
 ;
 
-(:~
- : Returns annotation information about a single collection. Although this works for all collections,
- : it has mainly been designed for Ahikar's main collection, 3r132.
- : 
- : For retrieving annotation information about other collections cf. the endpoint
- : /annotations/ahikar/{$collection}/{$document}/annotationCollection.json
- : 
- : @param $collection The URI of the collection, e.g. '3r132'
- : @return An Annotation Collecion for the given collection
- :)
-declare
-    %rest:GET
-    %rest:HEAD
-    %rest:path("/annotations/ahikar/{$collection}/annotationCollection.json")
-    %output:method("json")
-function anno:collection-rest($collection as xs:string) {
-    if (anno:are-resources-available($collection)) then
-        ($commons:responseHeader200,
-        anno:make-annotationCollection($collection, (), $anno:server))
-    else
-        anno:get-404-header($collection)
-};
-
-
 (:~
  : A generic function for creating an W3C compliant Annotation Collection for a given resource.
  : 
@@ -236,32 +202,6 @@ as xs:string {
 };
 
 
-(:~
- : Returns the Annotation Page of a given Collection Object according to W3C.
- : 
- : @see https://www.w3.org/TR/annotation-model/#annotation-page
- : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
- : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
- : 
- : @param $collection The URI of the Collection Object
- : @param $document The URI of an aggregated Collection or Manifest Object
- :)
-declare
-    %rest:GET
-    %rest:HEAD
-    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/annotationPage.json")
-    %output:method("json")
-function anno:annotationPage-for-collection-rest($collection as xs:string, 
-$document as xs:string) {
-    if (anno:are-resources-available(($collection, $document))) then
-        ($commons:responseHeader200,
-        anno:make-annotationPage($collection, $document, $anno:server))
-        
-    else
-        anno:get-404-header(($collection, $document))
-};
-
-
 (:~
  : A generic function for creating an W3C compliant Annotation Page for a given resource.
  : 
@@ -311,68 +251,6 @@ as map() {
         }
 };
 
-
-(:~
- : Returns the Annotation Collection of a given Collection or Manifest Object according to W3C.
- : 
- : The Collection Object given by $collection mainly serves for identification and compliance
- : with the TextAPI.
- : 
- : @see https://www.w3.org/TR/annotation-model/#annotation-collection
- : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
- : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
- : 
- : @param $collection The URI of the Collection Object
- : @param $document The URI of an aggregated Collection or Manifest Object
- : @return An Annotation Collecion for the given Collection or Manifest Object
- :)
-declare
-    %rest:GET
-    %rest:HEAD
-    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/annotationCollection.json")
-    %output:method("json")
-function anno:manifest-rest($collection as xs:string, 
-$document as xs:string) {
-    if (anno:are-resources-available(($collection, $document))) then
-        ($commons:responseHeader200,
-        anno:make-annotationCollection($collection, $document, $anno:server))
-        
-    else
-        anno:get-404-header(($collection, $document))
-};
-
-
-(:~
- : Returns the Annotation Collection of a given Collection or Manifest Object according to W3C.
- : 
- : The Collection Object given by $collection mainly serves for identification and compliance
- : with the TextAPI.
- : 
- : @see https://www.w3.org/TR/annotation-model/#annotation-collection
- : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
- : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
- : 
- : @param $collection The URI of the Collection Object
- : @param $document The URI of an aggregated Collection or Manifest Object
- : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
- : @return An Annotation Collection for the given Collection or Manifest Object
- :)
-declare
-    %rest:GET
-    %rest:HEAD
-    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/{$page}/annotationCollection.json")
-    %output:method("json")
-function anno:annotationCollection-for-manifest-rest($collection as xs:string, 
-$document as xs:string, $page as xs:string) {
-    if (anno:are-resources-available(($collection, $document))) then
-        ($commons:responseHeader200,
-        anno:make-annotationCollection-for-manifest($collection, $document, $page, $anno:server))
-        
-    else
-        anno:get-404-header(($collection, $document))
-};
-
-
 (:~
  : A function for creating an W3C compliant Annotation Collection for a given page
  : in a Manifest Object.
@@ -413,40 +291,6 @@ as map() {
 };
 
 
-(:~
- : Returns the Annotation Page of a given Collection or Manifest Object according to W3C.
- : 
- : The Collection Object given by $collection mainly serves for identification and compliance
- : with the TextAPI.
- : 
- : @see https://www.w3.org/TR/annotation-model/#annotation-page
- : @see https://www.w3.org/TR/annotation-model/#annotation-page
- : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
- : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
- : 
- : @param $collection The URI of the Collection Object
- : @param $document The URI of an aggregated Collection or Manifest Object
- : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
- : @return An Annotation Page for the given Collection or Manifest Object
- :)
-declare
-    %rest:GET
-    %rest:HEAD
-    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/{$page}/annotationPage.json")
-    %output:method("json")
-function anno:annotationPage-for-manifest-rest($collection as xs:string, 
-    $document as xs:string,
-    $page as xs:string)
-as element()+ {
-    if (anno:are-resources-available(($collection, $document))) then
-        ($commons:responseHeader200,
-        anno:make-annotationPage-for-manifest($collection, $document, $page, $anno:server))
-        
-    else
-        anno:get-404-header(($collection, $document))
-};
-
-
 (:~
  : A function for creating an W3C compliant Annotation Page for a given Manifest Object.
  : Since we need a slightly different string for the 'next' and 'prev' fields, this
@@ -662,26 +506,6 @@ as xs:boolean {
 };
 
 
-(:~
- : Creates a HTTP 404 header containing information about missing resources.
- : This function is called whenever an API call is made but at least one of the
- : requested resources isn't available.
- : 
- : @param $resources The URIs of resource's requested in an API call
- : @return The response header
- :)
-(:  ## tested ## :)
-declare function anno:get-404-header($resources as xs:string+) {
-    <rest:response>
-        <http:response xmlns:http="http://expath.org/ns/http-client" 
-            status="404"
-            message="One of the following requested resources couldn't be found: {string-join($resources, ", ")}">
-            <http:header name="Access-Control-Allow-Origin" value="*"/>
-        </http:response>
-    </rest:response>
-};
-
-
 (:~
  : Returns the value of a key which can be on an arbitrary level of a nested map.
  : Thus it corresponds to the map:find function which hasn't been implemented in
diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index e56797c..8955918 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -24,6 +24,7 @@ import module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item
 import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" at "../tests/tapi-manifest-tests.xqm";
 import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "../tests/tapi-tests.xqm";
 import module namespace at="http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" at "../tests/annotation-tests.xqm";
+import module namespace art="http://ahikar.sub.uni-goettingen.de/ns/annotations/rest/tests" at "../tests/annotation-rest-tests.xqm";
 
 (:~
  : Triggers the tests for the Ahikar backend. Called by the CI.
@@ -70,7 +71,8 @@ as element()+ {
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests"))
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/annotations/rest/tests"))
     )
 
     for $result in $test-results
@@ -100,5 +102,6 @@ as xs:string? {
         case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" return "TEI2HTML transformation"
         case "http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" return "TEI2HTML text processing"
         case "http://ahikar.sub.uni-goettingen.de/ns/annotations/tests" return "AnnotationAPI"
+        case "http://ahikar.sub.uni-goettingen.de/ns/annotations/rest/tests" return "AnnotationAPI REST"
         default return ()
 };
diff --git a/exist-app/tests/annotation-rest-tests.xqm b/exist-app/tests/annotation-rest-tests.xqm
new file mode 100644
index 0000000..7ba9de9
--- /dev/null
+++ b/exist-app/tests/annotation-rest-tests.xqm
@@ -0,0 +1,21 @@
+xquery version "3.1";
+
+module namespace art="http://ahikar.sub.uni-goettingen.de/ns/annotations/rest/tests";
+
+declare namespace http = "http://expath.org/ns/http-client";
+declare namespace tei="http://www.tei-c.org/ns/1.0";
+
+import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
+import module namespace map="http://www.w3.org/2005/xpath-functions/map";
+import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
+import module namespace anno-rest="http://ahikar.sub.uni-goettingen.de/ns/annotations/rest" at "../modules/AnnotationAPI/annotations-rest.xqm";
+
+declare
+    %test:assertXPath("$result//@status = '404'")
+    %test:assertXPath("$result//@message = 'One of the following requested resources couldn''t be found: qwerty, sample_teixml'")
+function art:get-404-header()
+as element() {
+    let $resources := ("qwerty", "sample_teixml")
+    return
+       anno-rest:get-404-header($resources)
+};
\ No newline at end of file
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index 036b610..d468eee 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -46,17 +46,6 @@ as xs:boolean {
         anno:are-resources-available($resources)
 };
 
-declare
-    %test:assertXPath("$result//@status = '404'")
-    %test:assertXPath("$result//@message = 'One of the following requested resources couldn''t be found: qwerty, sample_teixml'")
-function at:get-404-header()
-as element() {
-    let $resources := ("qwerty", "sample_teixml")
-    return
-       anno:get-404-header($resources)
-};
-
-
 declare
     %test:args("sample_teixml") %test:assertEquals("sample_edition")
     %test:args("sample_edition") %test:assertEquals("sample_lang_aggregation")
@@ -400,4 +389,4 @@ declare
 function at:get-xmls-prev-in-collection($uri as xs:string)
 as xs:string* {
     anno:get-xmls-prev-in-collection($uri)
-};
\ No newline at end of file
+};
-- 
GitLab


From 5f71fc7fc321cf27d8079ac5a9bae74173c2fc32 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 15:52:44 +0100
Subject: [PATCH 084/155] tests: add tests for REST interface

---
 .../AnnotationAPI/annotations-rest.xqm        |  29 +--
 .../modules/AnnotationAPI/annotations.xqm     |   2 +-
 exist-app/tests/annotation-rest-tests.xqm     | 169 +++++++++++++++++-
 3 files changed, 183 insertions(+), 17 deletions(-)

diff --git a/exist-app/modules/AnnotationAPI/annotations-rest.xqm b/exist-app/modules/AnnotationAPI/annotations-rest.xqm
index 3fde836..e54e843 100644
--- a/exist-app/modules/AnnotationAPI/annotations-rest.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations-rest.xqm
@@ -12,11 +12,7 @@ xquery version "3.1";
 
 module namespace anno-rest="http://ahikar.sub.uni-goettingen.de/ns/annotations/rest";
 
-declare namespace tei="http://www.tei-c.org/ns/1.0";
-declare namespace ore="http://www.openarchives.org/ore/terms/";
 declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";
-declare namespace rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
 
 import module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations" at "annotations.xqm";
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
@@ -42,6 +38,7 @@ declare variable $anno-rest:server :=
  : @param $collection The URI of the collection, e.g. '3r132'
  : @return An Annotation Collecion for the given collection
  :)
+(: ## tested ## :)
 declare
     %rest:GET
     %rest:HEAD
@@ -65,10 +62,11 @@ function anno-rest:collection-rest($collection as xs:string) {
  : @param $collection The URI of the Collection Object
  : @param $document The URI of an aggregated Collection or Manifest Object
  :)
+(: ## tested ## :)
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/annotationPage.json")
+    %rest:path("/annotations/ahikar/{$collection}/{$document}/annotationPage.json")
     %output:method("json")
 function anno-rest:annotationPage-for-collection-rest($collection as xs:string, 
 $document as xs:string) {
@@ -95,13 +93,15 @@ $document as xs:string) {
  : @param $document The URI of an aggregated Collection or Manifest Object
  : @return An Annotation Collecion for the given Collection or Manifest Object
  :)
+(: ## tested ## :)
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/annotationCollection.json")
+    %rest:path("/annotations/ahikar/{$collection}/{$document}/annotationCollection.json")
     %output:method("json")
 function anno-rest:manifest-rest($collection as xs:string, 
-$document as xs:string) {
+    $document as xs:string)
+as item()+ {
     if (anno:are-resources-available(($collection, $document))) then
         ($commons:responseHeader200,
         anno:make-annotationCollection($collection, $document, $anno-rest:server))
@@ -129,10 +129,12 @@ $document as xs:string) {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/{$page}/annotationCollection.json")
+    %rest:path("/annotations/ahikar/{$collection}/{$document}/{$page}/annotationCollection.json")
     %output:method("json")
 function anno-rest:annotationCollection-for-manifest-rest($collection as xs:string, 
-$document as xs:string, $page as xs:string) {
+    $document as xs:string,
+    $page as xs:string)
+as item()+ {
     if (anno:are-resources-available(($collection, $document))) then
         ($commons:responseHeader200,
         anno:make-annotationCollection-for-manifest($collection, $document, $page, $anno-rest:server))
@@ -160,12 +162,12 @@ $document as xs:string, $page as xs:string) {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/api/annotations/ahikar/{$collection}/{$document}/{$page}/annotationPage.json")
+    %rest:path("/annotations/ahikar/{$collection}/{$document}/{$page}/annotationPage.json")
     %output:method("json")
 function anno-rest:annotationPage-for-manifest-rest($collection as xs:string, 
     $document as xs:string,
     $page as xs:string)
-as element()+ {
+as item()+ {
     if (anno:are-resources-available(($collection, $document))) then
         ($commons:responseHeader200,
         anno:make-annotationPage-for-manifest($collection, $document, $page, $anno-rest:server))
@@ -183,7 +185,8 @@ as element()+ {
  : @return The response header
  :)
 (:  ## tested ## :)
-declare function anno-rest:get-404-header($resources as xs:string+) {
+declare function anno-rest:get-404-header($resources as xs:string+)
+as element() {
     <rest:response>
         <http:response xmlns:http="http://expath.org/ns/http-client" 
             status="404"
@@ -191,4 +194,4 @@ declare function anno-rest:get-404-header($resources as xs:string+) {
             <http:header name="Access-Control-Allow-Origin" value="*"/>
         </http:response>
     </rest:response>
-};
\ No newline at end of file
+};
diff --git a/exist-app/modules/AnnotationAPI/annotations.xqm b/exist-app/modules/AnnotationAPI/annotations.xqm
index 24ae575..e4cf511 100644
--- a/exist-app/modules/AnnotationAPI/annotations.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations.xqm
@@ -359,7 +359,7 @@ as map() {
 (: ## tested ## :)
 declare function anno:get-annotations($teixml-uri as xs:string,
     $page as xs:string)
-as map()+ {
+as map()* {
     let $pageChunk := anno:get-page-fragment($teixml-uri, $page)
     
     let $annotation-elements := 
diff --git a/exist-app/tests/annotation-rest-tests.xqm b/exist-app/tests/annotation-rest-tests.xqm
index 7ba9de9..f149748 100644
--- a/exist-app/tests/annotation-rest-tests.xqm
+++ b/exist-app/tests/annotation-rest-tests.xqm
@@ -3,12 +3,12 @@ xquery version "3.1";
 module namespace art="http://ahikar.sub.uni-goettingen.de/ns/annotations/rest/tests";
 
 declare namespace http = "http://expath.org/ns/http-client";
-declare namespace tei="http://www.tei-c.org/ns/1.0";
 
-import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
 import module namespace map="http://www.w3.org/2005/xpath-functions/map";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace anno-rest="http://ahikar.sub.uni-goettingen.de/ns/annotations/rest" at "../modules/AnnotationAPI/annotations-rest.xqm";
+import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
+
 
 declare
     %test:assertXPath("$result//@status = '404'")
@@ -18,4 +18,167 @@ as element() {
     let $resources := ("qwerty", "sample_teixml")
     return
        anno-rest:get-404-header($resources)
-};
\ No newline at end of file
+};
+
+declare
+    %test:assertTrue
+function art:is-collection-annotationCollection-endpoint-http200()
+as xs:boolean {
+    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/annotationCollection.json"
+    return
+        tc:is-endpoint-http200($url)
+};
+
+
+declare
+    (: check if all parts are present.
+     : no further tests are needed since the content has been tested while testing
+     : the underlying function. :)
+    %test:assertXPath("map:contains($result, 'total')")
+    %test:assertXPath("map:contains($result, 'first')")
+    %test:assertXPath("map:contains($result, 'label')")
+    %test:assertXPath("map:contains($result, 'last')")
+    %test:assertXPath("map:contains($result, 'x-creator')")
+    %test:assertXPath("map:contains($result, 'type')")
+    %test:assertXPath("map:contains($result, 'id')")
+function art:endpoint-collection-annotationCollection()
+as item() {
+    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/annotationCollection.json"
+    let $req := <http:request href="{$url}" method="get">
+                        <http:header name="Connection" value="close"/>
+                   </http:request>
+    return 
+        http:send-request($req)[2]
+        => util:base64-decode()
+        => parse-json()
+        => map:get("annotationCollection")
+};
+
+declare
+    %test:assertTrue
+function art:is-document-annotationPage-endpoint-http200()
+as xs:boolean {
+    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationPage.json"
+    return
+        tc:is-endpoint-http200($url)
+};
+
+
+declare
+    (: check if all parts are present.
+     : no further tests are needed since the content has been tested while testing
+     : the underlying function. :)
+    %test:assertXPath("map:contains($result, 'partOf')")
+    %test:assertXPath("map:contains($result, 'items')")
+    %test:assertXPath("map:contains($result, 'startIndex')")
+    %test:assertXPath("map:contains($result, 'prev')")
+    %test:assertXPath("map:contains($result, 'next')")
+    %test:assertXPath("map:contains($result, 'id')")
+function art:endpoint-document-annotationPage()
+as item() {
+    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationPage.json"
+    let $req := <http:request href="{$url}" method="get">
+                        <http:header name="Connection" value="close"/>
+                   </http:request>
+    return 
+        http:send-request($req)[2]
+        => util:base64-decode()
+        => parse-json()
+        => map:get("annotationPage")
+};
+declare
+    %test:assertTrue
+function art:is-document-annotationCollection-endpoint-http200()
+as xs:boolean {
+    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationCollection.json"
+    return
+        tc:is-endpoint-http200($url)
+};
+
+declare
+    (: check if all parts are present.
+     : no further tests are needed since the content has been tested while testing
+     : the underlying function. :)
+    %test:assertXPath("map:contains($result, 'total')")
+    %test:assertXPath("map:contains($result, 'first')")
+    %test:assertXPath("map:contains($result, 'label')")
+    %test:assertXPath("map:contains($result, 'last')")
+    %test:assertXPath("map:contains($result, 'x-creator')")
+    %test:assertXPath("map:contains($result, 'type')")
+    %test:assertXPath("map:contains($result, 'id')")
+function art:endpoint-document-annotationCollection()
+as item() {
+    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationCollection.json"
+    let $req := <http:request href="{$url}" method="get">
+                        <http:header name="Connection" value="close"/>
+                   </http:request>
+    return 
+        http:send-request($req)[2]
+        => util:base64-decode()
+        => parse-json()
+        => map:get("annotationCollection")
+};
+
+declare
+    %test:assertTrue
+function art:is-item-annotationCollection-endpoint-http200()
+as xs:boolean {
+    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/83a/annotationCollection.json"
+    return
+        tc:is-endpoint-http200($url)
+};
+
+declare
+    (: check if all parts are present.
+     : no further tests are needed since the content has been tested while testing
+     : the underlying function. :)
+    %test:assertXPath("map:contains($result, 'total')")
+    %test:assertXPath("map:contains($result, 'first')")
+    %test:assertXPath("map:contains($result, 'label')")
+    %test:assertXPath("map:contains($result, 'x-creator')")
+    %test:assertXPath("map:contains($result, 'type')")
+    %test:assertXPath("map:contains($result, 'id')")
+function art:endpoint-item-annotationCollection()
+as item() {
+    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/83a/annotationCollection.json"
+    let $req := <http:request href="{$url}" method="get">
+                        <http:header name="Connection" value="close"/>
+                   </http:request>
+    return 
+        http:send-request($req)[2]
+        => util:base64-decode()
+        => parse-json()
+        => map:get("annotationCollection")
+};
+
+declare
+    %test:assertTrue
+function art:is-item-annotationPage-endpoint-http200()
+as xs:boolean {
+    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/83a/annotationPage.json"
+    return
+        tc:is-endpoint-http200($url)
+};
+
+declare
+    (: check if all parts are present.
+     : no further tests are needed since the content has been tested while testing
+     : the underlying function. :)
+    %test:assertXPath("map:contains($result, 'partOf')")
+    %test:assertXPath("map:contains($result, 'items')")
+    %test:assertXPath("map:contains($result, 'startIndex')")
+    %test:assertXPath("map:contains($result, 'prev')")
+    %test:assertXPath("map:contains($result, 'next')")
+    %test:assertXPath("map:contains($result, 'id')")
+function art:endpoint-item-annotationPage()
+as item() {
+    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/83a/annotationPage.json"
+    let $req := <http:request href="{$url}" method="get">
+                        <http:header name="Connection" value="close"/>
+                   </http:request>
+    return 
+        http:send-request($req)[2]
+        => util:base64-decode()
+        => parse-json()
+        => map:get("annotationPage")
+};
-- 
GitLab


From 8ed464e10470f8c4eb7c9d3294be6b31783d03bd Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 16 Nov 2020 15:56:35 +0100
Subject: [PATCH 085/155] chore: remove unnecessary comments

---
 .../AnnotationAPI/annotations-rest.xqm        |  4 ---
 .../modules/AnnotationAPI/annotations.xqm     | 28 -------------------
 2 files changed, 32 deletions(-)

diff --git a/exist-app/modules/AnnotationAPI/annotations-rest.xqm b/exist-app/modules/AnnotationAPI/annotations-rest.xqm
index e54e843..654ed2c 100644
--- a/exist-app/modules/AnnotationAPI/annotations-rest.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations-rest.xqm
@@ -38,7 +38,6 @@ declare variable $anno-rest:server :=
  : @param $collection The URI of the collection, e.g. '3r132'
  : @return An Annotation Collecion for the given collection
  :)
-(: ## tested ## :)
 declare
     %rest:GET
     %rest:HEAD
@@ -62,7 +61,6 @@ function anno-rest:collection-rest($collection as xs:string) {
  : @param $collection The URI of the Collection Object
  : @param $document The URI of an aggregated Collection or Manifest Object
  :)
-(: ## tested ## :)
 declare
     %rest:GET
     %rest:HEAD
@@ -93,7 +91,6 @@ $document as xs:string) {
  : @param $document The URI of an aggregated Collection or Manifest Object
  : @return An Annotation Collecion for the given Collection or Manifest Object
  :)
-(: ## tested ## :)
 declare
     %rest:GET
     %rest:HEAD
@@ -184,7 +181,6 @@ as item()+ {
  : @param $resources The URIs of resource's requested in an API call
  : @return The response header
  :)
-(:  ## tested ## :)
 declare function anno-rest:get-404-header($resources as xs:string+)
 as element() {
     <rest:response>
diff --git a/exist-app/modules/AnnotationAPI/annotations.xqm b/exist-app/modules/AnnotationAPI/annotations.xqm
index e4cf511..60204a2 100644
--- a/exist-app/modules/AnnotationAPI/annotations.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations.xqm
@@ -73,7 +73,6 @@ declare variable $anno:uris :=
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  : @return A map with all information necessary for the Annotation Collection
  :)
-(: ## tested ## :)
 declare function anno:make-annotationCollection($collection as xs:string,
     $document as xs:string?,
     $server as xs:string)
@@ -115,7 +114,6 @@ as map() {
  : @param The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  : @return A map with all information necessary for the Annotation Collection
  :)
-(: ## tested ## :)
 declare function anno:get-information-for-collection-object($collectionURI as xs:string,
     $server as xs:string)
 as map() {
@@ -137,7 +135,6 @@ as map() {
  : @param $uri The resource's URI
  : @return The resource's title
  :)
-(: ## tested ## :)
 declare function anno:get-metadata-title($uri as xs:string)
 as xs:string {
     commons:get-document($uri, "meta")//tgmd:title/string()
@@ -152,7 +149,6 @@ as xs:string {
  : @param $first-entry The IRI of the first Annotation Page that is included within the Collection
  : @param $last-entry The IRI of the last Annotation Page that is included within the Collection
  :)
-(: ## tested ## :)
 declare function anno:make-annotationCollection-map($uri as xs:string,
     $title as xs:string,
     $first-entry as xs:string,
@@ -182,7 +178,6 @@ as map() {
  : @return A string containing the creators of the annotations as stated in the
  : TEI header of the (underlying) resource(s).
  :)
-(: ## tested ## :)
 declare function anno:get-creator($uri as xs:string)
 as xs:string {
     let $xmls :=
@@ -214,7 +209,6 @@ as xs:string {
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  : @return A map with all information necessary for the Annotation Collection
  :)
-(: ## tested ## :)
 declare function anno:make-annotationPage($collection as xs:string, 
     $document as xs:string,
     $server as xs:string)
@@ -267,7 +261,6 @@ as map() {
  : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  :)
-(: ## tested ## :)
 declare function anno:make-annotationCollection-for-manifest($collection as xs:string,
     $document as xs:string,
     $page as xs:string,
@@ -305,7 +298,6 @@ as map() {
  : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  :)
-(: ## tested ## :)
 declare function anno:make-annotationPage-for-manifest($collection as xs:string,
     $document as xs:string,
     $page as xs:string,
@@ -356,7 +348,6 @@ as map() {
  : @param $teixml-uri The XML's URI.
  : @param $page The page within an XML file, i.e. a tei:pb/@n within a TEI resource
  :)
-(: ## tested ## :)
 declare function anno:get-annotations($teixml-uri as xs:string,
     $page as xs:string)
 as map()* {
@@ -385,7 +376,6 @@ as map()* {
  : @param $documentURI The resource's URI. Attention: This refers to the TEI file itself!
  : @param $page The page to be returned as tei:pb/@n/string()
  :)
-(: ## tested ## :)
 declare function anno:get-page-fragment($documentURI as xs:string,
     $page as xs:string)
 as element(tei:TEI) {
@@ -403,7 +393,6 @@ as element(tei:TEI) {
  : @param $uri The resource's URI
  : @return The number of annotations that are associated with the $uri
  :)
-(: ## tested ## :)
 declare function anno:get-total-no-of-annotations($uri as xs:string)
 as xs:integer {
     let $map-entry-for-uri := anno:find-in-map($anno:uris, $uri)
@@ -433,7 +422,6 @@ as xs:integer {
  : @param $map A part of the $anno:uris map
  : @return All values of the lowest $map level
  :)
-(: ## tested ## :)
 declare function anno:get-all-xml-uris-for-submap($map as map())
 as xs:string* {
     let $get-values := function($key, $value){$value}
@@ -458,7 +446,6 @@ as xs:string* {
  : @param $id The node ID of the annotation. It is equivalent to generate-id($annotation)
  : @return A map containing the target information
  :)
-(: ## tested ## :)
 declare function anno:get-target-information($annotation as node(),
     $documentURI as xs:string,
     $id as xs:string)
@@ -479,7 +466,6 @@ as map(*) {
  : @param $annotation The node which serves as a basis for the annotation
  : @return The content of bodyValue.
  :)
-(: ## tested ## :)
 declare function anno:get-bodyValue($annotation as node())
 as xs:string {
     switch ($annotation/local-name())
@@ -495,7 +481,6 @@ as xs:string {
  : @param $resources The URI of the resources to be checked
  : @return true() if all resources are available
  :)
-(:  ## tested ## :)
 declare function anno:are-resources-available($resources as xs:string+)
 as xs:boolean {
     let $availability :=
@@ -517,7 +502,6 @@ as xs:boolean {
  : @param $key The key whose value is to be returned
  : @return The value of the given $key
  :)
-(: ## tested ## :)
 declare function anno:find-in-map($map as map(),
     $key as xs:string)
 as item()? {
@@ -550,7 +534,6 @@ as item()? {
  : @param $type "prev" for getting the previous page, "next" for getting the next page
  : @return 
  :)
-(: ## tested ## :)
 declare function anno:get-prev-or-next-annotationPage-ID($collection as xs:string,
     $document as xs:string,
     $type as xs:string)
@@ -560,7 +543,6 @@ as xs:string? {
         anno:get-prev-or-next($collection-keys, $document, $type)
 };
 
-(: ## tested ## :)
 declare function anno:get-prev-or-next($entities as item()+,
     $searched-for as xs:string,
     $type as xs:string)
@@ -583,7 +565,6 @@ as xs:string? {
             ()
 };
 
-(: ## tested ## :)
 declare function anno:get-prev-or-next-annotationPage-url($collection as xs:string,
     $document as xs:string?,
     $page as xs:string?,
@@ -607,7 +588,6 @@ as xs:string? {
  : @param $uri The resource's URI
  : @return true() if resources stated by $uri is a TEI/XML resource
  :)
- (: ## tested ## :)
 declare function anno:is-resource-xml($uri as xs:string) as xs:boolean {
     commons:get-document($uri, "meta")//tgmd:format = "text/xml"
 };
@@ -620,7 +600,6 @@ declare function anno:is-resource-xml($uri as xs:string) as xs:boolean {
  : @param $uri The resource's URI
  : @return true() if resources stated by $uri is an edition object
  :)
-(: ## tested ## :)
 declare function anno:is-resource-edition($map as map(),
     $uri as xs:string)
 as xs:boolean {
@@ -633,7 +612,6 @@ as xs:boolean {
  : @param $documentURI The TEI resource's URI
  : @return A sequence of all page breaks occuring in the resource
  :)
- (: ## tested ## :)
 declare function anno:get-pages-in-TEI($documentURI as xs:string) as xs:string+ {
     commons:get-document($documentURI, "data")//tei:pb[@facs]/@n/string()
 };
@@ -647,7 +625,6 @@ declare function anno:get-pages-in-TEI($documentURI as xs:string) as xs:string+
  : @param $page The @n attribute of the current page break/tei:pb
  : @param $type "prev" for the previous, "next" for the next page break
  :)
-(: ## tested ## :)
 declare function anno:get-prev-or-next-page($manifest-uri as xs:string,
     $page as xs:string, 
     $type as xs:string)
@@ -670,7 +647,6 @@ as xs:string? {
  : @param $uri The URI of the current resource. This may refer to a edition or TEI/XML.
  : @return A list of URIs that appear before the given resource in a collection 
  :)
-(: ## tested ## :)
 declare function anno:get-xmls-prev-in-collection($uri as xs:string)
 as xs:string* {
     if (anno:is-resource-xml($uri)) then
@@ -697,7 +673,6 @@ as xs:string* {
  : @param $uri The URI of the current edition
  : @return A list of all URIs of TEI resources that appear before the given edition in a collection 
  :)
-(: ## tested ## :)
 declare function anno:get-prev-xml-uris($uri as xs:string)
 as xs:string* {
     let $collection := anno:get-parent-aggregation($uri)
@@ -721,7 +696,6 @@ as xs:string* {
  : @param $uri The resource's URI
  : @return The URI of the given resource's parent aggregation
  :)
-(: ## tested ## :)
 declare function anno:get-parent-aggregation($uri as xs:string)
 as xs:string? {
     if (collection($commons:agg)[.//@rdf:resource = "textgrid:" || $uri]) then
@@ -745,7 +719,6 @@ as xs:string? {
  : an edition.
  : @return The relative position of the first annotation
  :)
-(: ## tested ## :)
 declare function anno:determine-start-index($uri as xs:string)
 as xs:integer {
     let $resourceType := commons:get-document($uri, "meta")//tgmd:format
@@ -788,7 +761,6 @@ as xs:integer {
  : @param $page The @n attribute of the current tei:pb
  : @return The relative position of the first annotation
  :)
-(: ## tested ## :)
 declare function anno:determine-start-index-for-page($uri as xs:string,
     $page as xs:string)
 as xs:integer {
-- 
GitLab


From 12e129614ccb0eb5559a747eda8e80b5ec25ad18 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 17 Nov 2020 08:12:03 +0100
Subject: [PATCH 086/155] ci: consider new test output format

---
 get-unit-test-failures-and-errors.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/get-unit-test-failures-and-errors.sh b/get-unit-test-failures-and-errors.sh
index 60b48dc..6d57802 100755
--- a/get-unit-test-failures-and-errors.sh
+++ b/get-unit-test-failures-and-errors.sh
@@ -1,13 +1,5 @@
 #!/bin/bash
 
-failures=$(xmllint --xpath '/tests/testsuites/testsuite/@failures' exist-app/test/ahikar-test-results.xml | egrep -o "[0-9]+")
-errors=$(xmllint --xpath '/tests/testsuites/testsuite/@errors' exist-app/test/ahikar-test-results.xml | egrep -o "[0-9]+")
+PROBLEMS=$(xmllint --xpath 'count(/tests/PROBLEM)' exist-app/test/ahikar-test-results.xml)
 
-problem_sum=0
-
-for FAILURE in $failures $errors
-do
-    let problem_sum+=$FAILURE
-done
-
-echo $problem_sum
+echo $PROBLEMS
-- 
GitLab


From 62c3981ac481b131ba53b8537db76ff9f15ea61f Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 17 Nov 2020 08:14:07 +0100
Subject: [PATCH 087/155] refactor: move fragment retrieval to commons

---
 .../modules/AnnotationAPI/annotations.xqm     |  3 +-
 exist-app/modules/commons.xqm                 | 58 +++++++++++++++++-
 exist-app/modules/tapi-html.xqm               | 59 +------------------
 exist-app/tests/commons-tests.xqm             | 33 +++++++++++
 exist-app/tests/tapi-html-tests.xqm           | 38 +-----------
 5 files changed, 93 insertions(+), 98 deletions(-)

diff --git a/exist-app/modules/AnnotationAPI/annotations.xqm b/exist-app/modules/AnnotationAPI/annotations.xqm
index 60204a2..146953b 100644
--- a/exist-app/modules/AnnotationAPI/annotations.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations.xqm
@@ -20,7 +20,6 @@ declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../commons.xqm";
 import module namespace functx = "http://www.functx.com";
-import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "../tapi-html.xqm";
 
 declare variable $anno:ns := "http://ahikar.sub.uni-goettingen.de/ns/annotations";
 
@@ -381,7 +380,7 @@ declare function anno:get-page-fragment($documentURI as xs:string,
 as element(tei:TEI) {
     let $nodeURI := commons:get-document($documentURI, "data")/base-uri()
     return
-        tapi-html:get-page-fragment($nodeURI, $page)
+        commons:get-page-fragment($nodeURI, $page)
 };
 
 
diff --git a/exist-app/modules/commons.xqm b/exist-app/modules/commons.xqm
index 10d92bd..470e427 100644
--- a/exist-app/modules/commons.xqm
+++ b/exist-app/modules/commons.xqm
@@ -4,6 +4,9 @@ module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons";
 
 declare namespace ore="http://www.openarchives.org/ore/terms/";
 declare namespace rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+declare namespace tei="http://www.tei-c.org/ns/1.0";
+
+import module namespace fragment="https://wiki.tei-c.org/index.php?title=Milestone-chunk.xquery" at "fragment.xqm";
 
 declare variable $commons:expath-pkg := doc("../expath-pkg.xml");
 declare variable $commons:version := $commons:expath-pkg/*/@version;
@@ -66,4 +69,57 @@ as xs:string* {
                 $unprefixed-uri
             else
                 ()
-};
\ No newline at end of file
+};
+
+declare function commons:get-page-fragment($tei-xml-base-uri as xs:string,
+    $page as xs:string)
+as element() {
+    let $node := doc($tei-xml-base-uri)/*
+        => commons:add-IDs(),
+        $start-node := $node//tei:pb[@n = $page and @facs],
+        $end-node := commons:get-end-node($start-node),
+        $wrap-in-first-common-ancestor-only := false(),
+        $include-start-and-end-nodes := true(),
+        $empty-ancestor-elements-to-include := ("")
+        
+    return
+        fragment:get-fragment-from-doc(
+            $node,
+            $start-node,
+            $end-node,
+            $wrap-in-first-common-ancestor-only,
+            $include-start-and-end-nodes,
+            $empty-ancestor-elements-to-include)
+};
+
+declare function commons:add-IDs($nodes as node()*)
+as node()* {
+    for $node in $nodes return
+        typeswitch ($node)
+        
+        case text() return
+            $node
+            
+        case comment() return
+            ()
+            
+        case processing-instruction() return
+            $node
+            
+        default return
+            element {QName("http://www.tei-c.org/ns/1.0", local-name($node))} {
+                attribute id {generate-id($node)},
+                $node/@*,
+                commons:add-IDs($node/node())
+            }
+};
+
+declare function commons:get-end-node($start-node as element(tei:pb))
+as element() {
+    let $following-pb := $start-node/following::tei:pb[1][@facs]
+    return
+        if($following-pb) then
+            $following-pb
+        else
+            $start-node/following::tei:ab[last()]
+};
diff --git a/exist-app/modules/tapi-html.xqm b/exist-app/modules/tapi-html.xqm
index 920be10..5c8bcf0 100644
--- a/exist-app/modules/tapi-html.xqm
+++ b/exist-app/modules/tapi-html.xqm
@@ -10,7 +10,6 @@ declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace xhtml="http://www.w3.org/1999/xhtml";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
-import module namespace fragment="https://wiki.tei-c.org/index.php?title=Milestone-chunk.xquery" at "fragment.xqm";
 import module namespace tei2html="http://ahikar.sub.uni-goettingen.de/ns/tei2html" at "tei2html.xqm";
 
 (:~
@@ -26,7 +25,7 @@ as element(div) {
     let $tei-xml-base-uri := $commons:data || $tei-xml-uri || ".xml"
     let $fragment :=
         if ($page) then
-            tapi-html:get-page-fragment($tei-xml-base-uri, $page)
+            commons:get-page-fragment($tei-xml-base-uri, $page)
         else
             doc($tei-xml-base-uri)/*
     return
@@ -34,62 +33,6 @@ as element(div) {
 };
 
 
-declare function tapi-html:get-page-fragment($tei-xml-base-uri as xs:string,
-    $page as xs:string)
-as element() {
-    let $node := doc($tei-xml-base-uri)/*
-        => tapi-html:add-IDs(),
-        $start-node := $node//tei:pb[@n = $page and @facs],
-        $end-node := tapi-html:get-end-node($start-node),
-        $wrap-in-first-common-ancestor-only := false(),
-        $include-start-and-end-nodes := true(),
-        $empty-ancestor-elements-to-include := ("")
-        
-    return
-        fragment:get-fragment-from-doc(
-            $node,
-            $start-node,
-            $end-node,
-            $wrap-in-first-common-ancestor-only,
-            $include-start-and-end-nodes,
-            $empty-ancestor-elements-to-include)
-};
-
-
-declare function tapi-html:add-IDs($nodes as node()*)
-as node()* {
-    for $node in $nodes return
-        typeswitch ($node)
-        
-        case text() return
-            $node
-            
-        case comment() return
-            ()
-            
-        case processing-instruction() return
-            $node
-            
-        default return
-            element {QName("http://www.tei-c.org/ns/1.0", local-name($node))} {
-                attribute id {generate-id($node)},
-                $node/@*,
-                tapi-html:add-IDs($node/node())
-            }
-};
-
-
-declare function tapi-html:get-end-node($start-node as element(tei:pb))
-as element() {
-    let $following-pb := $start-node/following::tei:pb[1][@facs]
-    return
-        if($following-pb) then
-            $following-pb
-        else
-            $start-node/following::tei:ab[last()]
-};
-
-
 declare function tapi-html:get-html-from-fragment($fragment as element())
 as element(xhtml:div) {
     (: this wrapping is necessary in order to correctly set the namespace.
diff --git a/exist-app/tests/commons-tests.xqm b/exist-app/tests/commons-tests.xqm
index 773d970..7908328 100644
--- a/exist-app/tests/commons-tests.xqm
+++ b/exist-app/tests/commons-tests.xqm
@@ -10,6 +10,7 @@ import module namespace map="http://www.w3.org/2005/xpath-functions/map";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 
 declare variable $ct:restxq := "http://0.0.0.0:8080/exist/restxq/";
+declare variable $ct:base-uri := "/db/apps/sade/textgrid/data/sample_teixml.xml";
 
 declare
     %test:args("sample_edition") %test:assertEquals("sample_teixml")
@@ -45,3 +46,35 @@ function ct:get-available-aggregates($uri as xs:string)
 as xs:string+ {
     commons:get-available-aggregates($uri)
 };
+
+declare
+    %test:assertXPath("$result//@id = 'N4'")
+function ct:add-IDs()
+as node()+ {
+    let $manifest := doc($commons:data || "sample_teixml.xml")/*
+    return
+        commons:add-IDs($manifest)
+};
+
+
+declare
+    %test:args("82a") %test:assertXPath("$result[local-name(.) = 'pb']")
+    %test:args("82a") %test:assertXPath("$result/@facs = 'textgrid:3r1p0'")
+    %test:args("82a") %test:assertXPath("$result/@n = '82b'")
+    %test:args("84a") %test:assertXPath("$result[local-name(.) = 'ab']")
+    %test:args("84a") %test:assertXPath("matches($result, 'ܢܕܢ')")
+function ct:get-end-node($page as xs:string)
+as item()+ {
+    let $node := doc($ct:base-uri)/*
+    let $start-node := $node//tei:pb[@n = $page and @facs]
+    return
+        commons:get-end-node($start-node)
+};
+
+
+declare
+    %test:args("82a") %test:assertXPath("$result//*[local-name(.) = 'add'][@place = 'margin'] = 'حقًا'")
+function ct:get-page-fragment($page as xs:string)
+as element() {
+    commons:get-page-fragment($ct:base-uri, $page)
+};
diff --git a/exist-app/tests/tapi-html-tests.xqm b/exist-app/tests/tapi-html-tests.xqm
index 166b087..9ad50bd 100644
--- a/exist-app/tests/tapi-html-tests.xqm
+++ b/exist-app/tests/tapi-html-tests.xqm
@@ -9,48 +9,12 @@ import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons"
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "../modules/tapi-html.xqm";
 
-
-declare
-    %test:assertXPath("$result//@id = 'N4'")
-function thtmlt:add-IDs()
-as node()+ {
-    let $manifest := doc($commons:data || "sample_teixml.xml")/*
-    return
-        tapi-html:add-IDs($manifest)
-};
-
-
-declare
-    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result[local-name(.) = 'pb']")
-    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result/@facs = 'textgrid:3r1p0'")
-    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result/@n = '82b'")
-    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "84a") %test:assertXPath("$result[local-name(.) = 'ab']")
-    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "84a") %test:assertXPath("matches($result, 'ܢܕܢ')")
-function thtmlt:get-end-node($tei-xml-base-uri as xs:string,
-    $page as xs:string)
-as item()+ {
-    let $node := doc($tei-xml-base-uri)/*
-    let $start-node := $node//tei:pb[@n = $page and @facs]
-    return
-        tapi-html:get-end-node($start-node)
-};
-
-
-declare
-    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result//*[local-name(.) = 'add'][@place = 'margin'] = 'حقًا'")
-function thtmlt:get-page-fragment($tei-xml-base-uri as xs:string,
-    $page as xs:string)
-as element() {
-    tapi-html:get-page-fragment($tei-xml-base-uri, $page)
-};
-    
-                        
 declare
     %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result//text()[matches(., 'حقًا')]")
 function thtmlt:transform-fragment($tei-xml-base-uri as xs:string,
     $page as xs:string)
 as element(xhtml:div) {
-    let $fragment := tapi-html:get-page-fragment($tei-xml-base-uri, $page)
+    let $fragment := commons:get-page-fragment($tei-xml-base-uri, $page)
     return
         tapi-html:get-html-from-fragment($fragment)
 };
-- 
GitLab


From 5526c629c91fa7ed989eb7854260167200205fb9 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 17 Nov 2020 08:29:06 +0100
Subject: [PATCH 088/155] chore: bump version number

---
 exist-app/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exist-app/build.properties b/exist-app/build.properties
index 3049be6..ca3035b 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=2.1.0
+project.version=2.3.0
 project.title=TextAPI for Ahikar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
-- 
GitLab


From e6d1c1ce1402602dbd98d0a33c5e8cb62bee588d Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 17 Nov 2020 09:25:12 +0100
Subject: [PATCH 089/155] ci: make YML modular to increase clarity

---
 .gitlab-ci.yml            | 68 +++------------------------------------
 ci-scripts/.api_tests.yml | 67 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 64 deletions(-)
 create mode 100644 ci-scripts/.api_tests.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bdd583..e7e807e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,10 +4,13 @@ stages:
   - package
   - deploy_docker
   - deploy_app
-  - test
+  - api_tests
   - release
   - reassign_labels
 
+include: 
+  - '/ci-scripts/.api_tests.yml'
+
 ## TEMPLATES:
 .ssh-config: &ssh
 - which ssh-agent
@@ -183,69 +186,6 @@ deploy_app-main:
   script:
     - curl --get --silent https://ahikar.sub.uni-goettingen.de/api/deploy
 
-# this serves for checking if a commit has accidentally broken the API
-test_api_status-test:
-  image: docker.gitlab.gwdg.de/mrodzis/test
-  stage: test
-  except:
-    - main
-    - tags
-    - develop
-  script:
-    - header=$(curl --head -s https://ahikar-test.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
-    - status=$(echo $header | head -n 1 | cut -d" " -f 2)
-    - echo "Current HTTP status is $status."
-    - if [[ "$status" == "200" ]]; then exit 0; else exit 1; fi
-
-test_api_status-develop:
-  image: docker.gitlab.gwdg.de/mrodzis/test
-  stage: test
-  only:
-    - develop
-  script: 
-    - header=$(curl --head -s https://ahikar-dev.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
-    - status=$(echo $header | head -n 1 | cut -d" " -f 2)
-    - echo "Current HTTP status is $status."
-    - if [[ "$status" == "200" ]]; then exit 0; else exit 1; fi
-
-test_api_status-main:
-  image: docker.gitlab.gwdg.de/mrodzis/test
-  stage: test
-  only:
-    - main
-  script: 
-    - header=$(curl --head -s https://ahikar.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
-    - status=$(echo $header | head -n 1 | cut -d" " -f 2)
-    - echo "Current HTTP status is $status."
-    - if [[ "$status" == "200" ]]; then exit 0; else exit 1; fi
-  retry: 2
-
-full_plain_text_api_status-test:
-  image: docker.gitlab.gwdg.de/mrodzis/test
-  stage: test
-  except:
-    - main
-    - tags
-    - develop
-  script:
-    - header=$(curl --head --silent https://ahikar-test.sub.uni-goettingen.de/api/content/ahikar-plain-text.zip)
-
-full_plain_text_api_status-develop:
-  image: docker.gitlab.gwdg.de/mrodzis/test
-  stage: test
-  only:
-    - develop
-  script:
-    - header=$(curl --head --silent https://ahikar-dev.sub.uni-goettingen.de/api/content/ahikar-plain-text.zip)
-
-full_plain_text_api_status-main:
-  image: docker.gitlab.gwdg.de/mrodzis/test
-  stage: test
-  only:
-    - main
-  script:
-    - header=$(curl --head --silent https://ahikar.sub.uni-goettingen.de/api/content/ahikar-plain-text.zip)
-
 # when a git flow release is made, a tag will be pushed starting this job. it
 # will keep the resulting artifact from job number one and it will set up a
 # Gitlab release at the repo. therefore the merge message starting at the release
diff --git a/ci-scripts/.api_tests.yml b/ci-scripts/.api_tests.yml
new file mode 100644
index 0000000..c856fff
--- /dev/null
+++ b/ci-scripts/.api_tests.yml
@@ -0,0 +1,67 @@
+# Templates
+
+.job_definition: &job_definition
+  image: docker.gitlab.gwdg.de/mrodzis/test
+  stage: api_test
+
+.check_HTTP_status: &check_HTTP_status
+  - status=$(echo $header | head -n 1 | cut -d" " -f 2)
+  - echo "Current HTTP status is $status."
+  - if [[ "$status" == "200" ]]; then exit 0; else exit 1; fi
+
+
+# TextAPI
+
+test_api_status-test:
+  <<: *job_definition
+  except:
+    - main
+    - tags
+    - develop
+  script:
+    - header=$(curl --head -s https://ahikar-test.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
+    - *check_HTTP_status
+
+test_api_status-develop:
+  <<: *job_definition
+  only:
+    - develop
+  script: 
+    - header=$(curl --head -s https://ahikar-dev.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
+    - *check_HTTP_status
+
+test_api_status-main:
+  <<: *job_definition
+  only:
+    - main
+  script: 
+    - header=$(curl --head -s https://ahikar.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
+    - *check_HTTP_status
+  retry: 2
+
+# AnnotationAPI
+
+# API for ZIPs
+
+full_plain_text_api_status-test:
+  <<: *job_definition
+  except:
+    - main
+    - tags
+    - develop
+  script:
+    - header=$(curl --head --silent https://ahikar-test.sub.uni-goettingen.de/api/content/ahikar-plain-text.zip)
+
+full_plain_text_api_status-develop:
+  <<: *job_definition
+  only:
+    - develop
+  script:
+    - header=$(curl --head --silent https://ahikar-dev.sub.uni-goettingen.de/api/content/ahikar-plain-text.zip)
+
+full_plain_text_api_status-main:
+  <<: *job_definition
+  only:
+    - main
+  script:
+    - header=$(curl --head --silent https://ahikar.sub.uni-goettingen.de/api/content/ahikar-plain-text.zip)
-- 
GitLab


From 1c53e4fd8809925d78955cdaa25f1a62e034588e Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 17 Nov 2020 09:27:08 +0100
Subject: [PATCH 090/155] ci: fix typo

---
 ci-scripts/.api_tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-scripts/.api_tests.yml b/ci-scripts/.api_tests.yml
index c856fff..34e178a 100644
--- a/ci-scripts/.api_tests.yml
+++ b/ci-scripts/.api_tests.yml
@@ -2,7 +2,7 @@
 
 .job_definition: &job_definition
   image: docker.gitlab.gwdg.de/mrodzis/test
-  stage: api_test
+  stage: api_tests
 
 .check_HTTP_status: &check_HTTP_status
   - status=$(echo $header | head -n 1 | cut -d" " -f 2)
-- 
GitLab


From ab0412326de7fb3668d0bf3b37b2e2072941fcb3 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 18 Nov 2020 07:19:13 +0100
Subject: [PATCH 091/155] refactor: remove surplus variables

---
 exist-app/modules/tapi-txt.xqm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/exist-app/modules/tapi-txt.xqm b/exist-app/modules/tapi-txt.xqm
index f89a4b1..bcbeacb 100644
--- a/exist-app/modules/tapi-txt.xqm
+++ b/exist-app/modules/tapi-txt.xqm
@@ -25,8 +25,6 @@ declare variable $tapi-txt:milestone-types :=
     "sayings",
     "second_narrative_section",
     "parables",
-    "parables_1",
-    "parables_2",
     "third_narrative_section");
 
 
-- 
GitLab


From 009111b57a53e9bfa3a5e14e60aedb1148947d0a Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 18 Nov 2020 08:20:39 +0100
Subject: [PATCH 092/155] feat: create txt for every narrative section

Independent of whether it exists in a manuscript or not.
---
 exist-app/modules/tapi-txt.xqm     | 45 +++++++++++++++++-------------
 exist-app/tests/tapi-txt-tests.xqm | 19 ++++++++++---
 2 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/exist-app/modules/tapi-txt.xqm b/exist-app/modules/tapi-txt.xqm
index bcbeacb..f07ed7c 100644
--- a/exist-app/modules/tapi-txt.xqm
+++ b/exist-app/modules/tapi-txt.xqm
@@ -32,13 +32,10 @@ declare function tapi-txt:main()
 as xs:string+ {
     tapi-txt:create-txt-collection-if-not-available(),
     for $text in tapi-txt:get-transcriptions-and-transliterations() return
-        for $milestone-type in tapi-txt:get-milestone-types-per-text($text) return
+        for $milestone-type in $tapi-txt:milestone-types return
             let $relevant-text := tapi-txt:get-relevant-text($text, $milestone-type)
             return
-                if (matches($relevant-text, "\w")) then
-                    xmldb:store($tapi-txt:txt, tapi-txt:make-file-name($text, $milestone-type), $relevant-text, "text/plain")
-                else
-                    ()
+                xmldb:store($tapi-txt:txt, tapi-txt:make-file-name($text, $milestone-type), $relevant-text, "text/plain")
 };
 
 declare function tapi-txt:get-milestone-types-per-text($text as element(tei:text))
@@ -135,28 +132,38 @@ declare function tapi-txt:get-relevant-text($text as element(tei:text),
     $milestone-type as xs:string)
 as xs:string {
     let $chunk := tapi-txt:get-chunk($text, $milestone-type)
+    (: this filler is needed where tapi-txt:get-relevant-text-from-chunks is
+    empty because a manuscript doesn't have any text in the section of $milestone-type.
+    nevertheless, we want this manuscript to be part of the collation in order
+    to quickly see that said text is missing. however, compress:zip does not
+    allow for empty files, so we insert at least a white space in the file. :)
+    let $filler := " "
     return
-        tapi-txt:get-relevant-text-from-chunks($chunk)
+        $filler || tapi-txt:get-relevant-text-from-chunks($chunk)
 };
 
+(:~
+ : this function returns an empty tei:TEI element if the narrative section
+ : searched for via $milestone-type does not exist in a manuscript. 
+ :)
 declare function tapi-txt:get-chunk($text as element(tei:text),
     $milestone-type as xs:string)
 as element(tei:TEI) {
     let $root := $text/root()
-    (: the positional predicate must only be provided as long as there are 
-    several milestones of the same unit in a text.
-    as soon as we have found a solution for this, this predicate should be
-    removed. :)
-    let $milestone := $text//tei:milestone[@unit = $milestone-type][1]
-    let $end-of-chunk := tapi-txt:get-end-of-chunk($milestone)
+    let $milestone := $text//tei:milestone[@unit = $milestone-type]
     return
-        fragment:get-fragment-from-doc(
-            $root,
-            $milestone,
-            $end-of-chunk,
-            false(),
-            true(),
-            (""))
+        if (exists($milestone)) then
+            let $end-of-chunk := tapi-txt:get-end-of-chunk($milestone)
+            return
+                fragment:get-fragment-from-doc(
+                    $root,
+                    $milestone,
+                    $end-of-chunk,
+                    false(),
+                    true(),
+                    (""))
+        else
+            element {QName("http://www.tei-c.org/ns/1.0", "TEI")} {text{" "}}
 };
 
 declare function tapi-txt:get-end-of-chunk($milestone as element(tei:milestone))
diff --git a/exist-app/tests/tapi-txt-tests.xqm b/exist-app/tests/tapi-txt-tests.xqm
index 455b2aa..cb90097 100644
--- a/exist-app/tests/tapi-txt-tests.xqm
+++ b/exist-app/tests/tapi-txt-tests.xqm
@@ -40,13 +40,23 @@ as element(tei:milestone)? {
 declare
     %test:assertExists
     %test:assertXPath("$result//*[local-name(.) = 'ab']")
-function ttt:get-chunk()
+function ttt:get-chunk-successs()
 as element(tei:TEI) {
     let $milestone-type := "first_narrative_section"
     return
         tapi-txt:get-chunk($ttt:sample-transliteration, $milestone-type)
 };
 
+declare
+    %test:assertExists
+    %test:assertXPath("not($result//*)")
+function ttt:get-chunk-fail()
+as element(tei:TEI) {
+    let $milestone-type := "third_narrative_section"
+    return
+        tapi-txt:get-chunk($ttt:sample-transliteration, $milestone-type)
+};
+
 
 declare
      %test:assertEquals("some text that should be used display some text without a space")
@@ -271,9 +281,10 @@ as xs:string {
 };
 
 declare
-    %test:args("first_narrative_section") %test:assertEquals("text of the first narrative section")
-    %test:args("sayings") %test:assertEquals("some sayings")
-function ttt:get-relevant-text($milestone-type as xs:string) {
+    %test:args("first_narrative_section") %test:assertEquals(" text of the first narrative section")
+    %test:args("sayings") %test:assertEquals(" some sayings")
+function ttt:get-relevant-text($milestone-type as xs:string)
+as xs:string {
     let $TEI :=
         <TEI xmlns="http://www.tei-c.org/ns/1.0">
             <text>
-- 
GitLab


From b7c524f85f3fe17309201813f5fb7d6374de4edd Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 19 Nov 2020 07:09:33 +0100
Subject: [PATCH 093/155] fix: bug in annotation server URL

---
 exist-app/modules/AnnotationAPI/annotations-rest.xqm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exist-app/modules/AnnotationAPI/annotations-rest.xqm b/exist-app/modules/AnnotationAPI/annotations-rest.xqm
index 654ed2c..1e6b614 100644
--- a/exist-app/modules/AnnotationAPI/annotations-rest.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations-rest.xqm
@@ -25,7 +25,7 @@ declare variable $anno-rest:server :=
 } catch * {
     true()
 })
-    then doc("../expath-pkg.xml")/*/@name => replace("/$", "")
+    then $commons:expath-pkg/*/@name => replace("/$", "")
     else "http://localhost:8094/exist/restxq";
 
 (:~
-- 
GitLab


From ecafa6efe2fb93cdab1e5f6563022493fd3c477d Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 19 Nov 2020 14:57:52 +0100
Subject: [PATCH 094/155] fix: consider normalization in txt creation

---
 exist-app/modules/tapi-txt.xqm                   | 2 ++
 exist-app/tests/tapi-txt-normalization-tests.xqm | 2 +-
 exist-app/tests/tests-runner.xq                  | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/exist-app/modules/tapi-txt.xqm b/exist-app/modules/tapi-txt.xqm
index f07ed7c..8bf0562 100644
--- a/exist-app/modules/tapi-txt.xqm
+++ b/exist-app/modules/tapi-txt.xqm
@@ -16,6 +16,7 @@ declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
 import module namespace fragment="https://wiki.tei-c.org/index.php?title=Milestone-chunk.xquery" at "fragment.xqm";
+import module namespace norm="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/normalization" at "tapi-txt-normalization.xqm";
 
 declare variable $tapi-txt:textgrid := "/db/apps/sade/textgrid";
 declare variable $tapi-txt:data := $tapi-txt:textgrid || "/data";
@@ -242,6 +243,7 @@ as xs:string {
     => replace(" @", "")
     => replace("[\p{P}\n+]", "")
     => replace("\s+", " ")
+    => norm:get-txt-without-diacritics()
 };
 
 
diff --git a/exist-app/tests/tapi-txt-normalization-tests.xqm b/exist-app/tests/tapi-txt-normalization-tests.xqm
index 06f84c1..504a09c 100644
--- a/exist-app/tests/tapi-txt-normalization-tests.xqm
+++ b/exist-app/tests/tapi-txt-normalization-tests.xqm
@@ -62,7 +62,7 @@ declare function local:create-and-store-test-data() {
     
     let $mix :=
         for $iii in 1 to 10 return
-            insert-before(($norm:arabic-tashkil-and-combining-marks, $norm:syriac-vowels), $iii * 3, $txt-cps[$iii])
+            insert-before(($norm:syriac-vowels), $iii * 3, $txt-cps[$iii])
     let $mix-str := codepoints-to-string($mix)
     return
         xmldb:store-as-binary("/db/tmp", "test.txt", $mix-str)
diff --git a/exist-app/tests/tests-runner.xq b/exist-app/tests/tests-runner.xq
index ee71734..a7aaa64 100644
--- a/exist-app/tests/tests-runner.xq
+++ b/exist-app/tests/tests-runner.xq
@@ -15,7 +15,7 @@ import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifes
 import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "tapi-tests.xqm";
 import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "tei2html-tests.xqm";
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "tei2html-textprocessing-tests.xqm";
-
+import module namespace ttnt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/normalization/tests" at "tapi-txt-normalization-tests.xqm";
 
 let $test-results :=
     (
@@ -27,7 +27,8 @@ let $test-results :=
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests"))
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/normalization/tests"))
     )
 
 for $result in $test-results return
-- 
GitLab


From 04610a47cc374cb020f88a49a0ac9fd677566ecc Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 3 Dec 2020 07:44:41 +0100
Subject: [PATCH 095/155] feat: update viewer name, minor corrections

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 78dbfa3..41cb2f8 100644
--- a/README.md
+++ b/README.md
@@ -114,9 +114,9 @@ docker-compose --env-file docker/.env --file docker/docker-compose.yml up --deta
 
 ## Connecting the Backend with the Frontend
 
-The corresponding frontend for the Ahiwar backend is the [EMo viewer](https://gitlab.gwdg.de/subugoe/emo/Qviewer).
+The corresponding frontend for the Ahiqar backend is [Ahiqar's version of the TIDO viewer](https://gitlab.gwdg.de/subugoe/ahiqar/frontend).
 In order to connect it with the simply has to expose a REST API that complies to the specification of the [SUB's generic TextAPI](https://subugoe.pages.gwdg.de/emo/text-api/)
-The frontend takes care of the data transfer as described in the [frontend's README](https://gitlab.gwdg.de/subugoe/emo/Qviewer/-/blob/develop/README.md#connecting-the-viewer-with-a-backend).
+The frontend takes care of the data transfer as described in [TIDO's README](https://gitlab.gwdg.de/subugoe/emo/Qviewer/-/blob/develop/README.md#connecting-the-viewer-with-a-backend).
 
 ## API documentation
 
-- 
GitLab


From de97a3929a46639b70b6133f18025d7ebacfade3 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 3 Dec 2020 13:14:24 +0100
Subject: [PATCH 096/155] feat: introduce example with Latin alphabet

---
 exist-app/data/kant_sample.xml | 97 ++++++++++++++++++++++++++++++++++
 exist-app/post-install.xq      |  3 +-
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 exist-app/data/kant_sample.xml

diff --git a/exist-app/data/kant_sample.xml b/exist-app/data/kant_sample.xml
new file mode 100644
index 0000000..3235dcc
--- /dev/null
+++ b/exist-app/data/kant_sample.xml
@@ -0,0 +1,97 @@
+
+<TEI xmlns="http://www.tei-c.org/ns/1.0">
+    <teiHeader>
+        <fileDesc>
+            <titleStmt>
+                <title type="main">The Story and Proverbs of Ahiqar the Wise</title>
+                <editor>Simon Birol</editor>
+                <editor>Aly Elrefaei</editor>
+            </titleStmt>
+            <publicationStmt>
+                <authority>Georg-August Universität Göttingen, Theologische Fakultät, Seminar für Altes Testament</authority>
+            </publicationStmt>
+            <sourceDesc>
+                <msDesc>
+                    <msIdentifier>
+                        <settlement>
+                            <country>Vatican</country>
+                        </settlement>
+                        <institution>Vatican Library</institution>
+                        <idno>Borg. ar. 201</idno>
+                    </msIdentifier>
+                    <msContents>
+                        <msItem>
+                            <colophon sameAs="#xpath(//ab[@type='colophon'])"/>
+                        </msItem>
+                    </msContents>
+                    <history>
+                        <origin>
+                            <objectType>codex</objectType>
+                            <date notAfter="1900" precision="medium" notBefore="1801">19th century</date>
+                        </origin>
+                    </history>
+                </msDesc>
+                <listBibl>
+                    <bibl>Graf, GCAL I, p. 218; Delio V. Proverbio, Turcica Vaticana. Città del Vaticano (Biblioteca Apostolica Vaticana, 2010), p. 199.</bibl>
+                    <bibl>E. Tisserant, Inventaire sommaire des manuscrits arabes du fonds Borgia à la Bibliothèque Vaticane, in Miscellanea Francesco Ehrle. Scritti di storia e paleografia pubblicati sotto gli auspici di S. S. Pio XI in occasione dell'ottantesimo natalizio dell'E.mo cardinale Francesco Ehrle, V: Biblioteca ed Archivio Vaticano. Biblioteche diverse, Roma 1924, pp. 1-34 (20).</bibl>
+                </listBibl>
+            </sourceDesc>
+        </fileDesc>
+        <profileDesc>
+            <abstract>
+                <ab>the last two sections of the story including Ahikar return to Assyria and his parables are missing from the MS.</ab>
+            </abstract>
+            <textClass>
+                <keywords>
+                    <term>proverb</term>
+                    <term>prose</term>
+                </keywords>
+            </textClass>
+            <langUsage>
+                <language ident="ara" xml:base="https://iso639-3.sil.org/code/" xml:id="ara">Arabic</language>
+                <language ident="syc" xml:base="https://iso639-3.sil.org/code/" xml:id="syr">Classical Syriac</language>
+                <language ident="eng" xml:base="https://iso639-3.sil.org/code/" xml:id="eng">English</language>
+                <language ident="lat" xml:base="https://iso639-3.sil.org/code/" xml:id="lat">Latin</language>
+                <language ident="karshuni">Karshuni</language>          
+                <language ident="syc-syrj" xml:base="https://glottolog.org/resource/languoid/id/" xml:id="west2764">Western Syriac</language>
+                <language ident="syc-syrn" xml:base="https://glottolog.org/resource/languoid/id/" xml:id="east2681">Eastern Syriac</language>
+            </langUsage>
+        </profileDesc>
+        <encodingDesc>
+            <tagsDecl>
+                <rendition scheme="css" xml:id="red">color: red;</rendition>
+                <rendition scheme="free" xml:id="font">Serto Jerusalem</rendition>
+            </tagsDecl>
+        </encodingDesc>
+        <revisionDesc>
+            <listChange>
+                <change when="2019-07-04T16:49:29.094+02:00">
+                    <ab>Convertion to specified TEI by SUB Göttingen</ab>
+                </change>
+            </listChange>
+        </revisionDesc>
+    </teiHeader>
+    <text>
+        <group>
+            <text xml:lang="eng" type="translation">
+                <body>
+                    <ab/>
+                </body>
+            </text>
+            <text xml:lang="ara" type="transcription">
+                <body>
+                    <milestone unit="first_narrative_section"/>
+                    <ab>Daß alle unsere Erkenntnis mit der Erfahrung anfange, daran </ab>
+                            
+                    <milestone unit="sayings"/>
+                    <ab>Wenn aber gleich alle unsere Erkenntnis mit der Erfahrung anhebt, so entspringt sie darum doch nicht eben</ab>
+                    
+                    
+                    <milestone unit="second_narrative_section"/>
+                    <ab>Es ist also wenigstens eine der näheren Untersuchung noch benötigte und nicht auf den</ab>                           
+                            
+                </body>
+            </text>
+        </group>
+    </text>
+</TEI>
\ No newline at end of file
diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index b8e8e62..46520c1 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -71,7 +71,8 @@ return (sm:chown($path, "admin"), sm:chmod($path, "rwsrwxr-x"))),
         "ahiqar_images.xml",
         "ahiqar_images_meta.xml",
         "ahiqar_collection.xml",
-        "ahiqar_collection_meta.xml")
+        "ahiqar_collection_meta.xml",
+        "kant_sample.xml")
     return
         ( 
             for $file in $files return
-- 
GitLab


From 440819a1bbd80e4c262b3be9ed8a3d475d997ffa Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 3 Dec 2020 13:21:39 +0100
Subject: [PATCH 097/155] fix: bug in finding the end of a chunk

---
 exist-app/modules/tapi-txt.xqm     | 11 +++--
 exist-app/tests/tapi-txt-tests.xqm | 71 +++++++++++++++++++++++++++++-
 2 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/exist-app/modules/tapi-txt.xqm b/exist-app/modules/tapi-txt.xqm
index 8bf0562..cc5ba85 100644
--- a/exist-app/modules/tapi-txt.xqm
+++ b/exist-app/modules/tapi-txt.xqm
@@ -54,8 +54,7 @@ as xs:string? {
 
 declare function tapi-txt:get-transcriptions-and-transliterations()
 as element(tei:text)+ {
-    collection($tapi-txt:data)//tei:text[@type = ("transcription", "transliteration")]
-        [tapi-txt:has-text-milestone(.)]
+    collection($tapi-txt:data)//tei:text[@type = ("transcription", "transliteration")][tapi-txt:has-text-milestone(.)]
 };
 
 declare function tapi-txt:has-text-milestone($text as element(tei:text))
@@ -168,8 +167,8 @@ as element(tei:TEI) {
 };
 
 declare function tapi-txt:get-end-of-chunk($milestone as element(tei:milestone))
-as node() {
-    if (tapi-txt:has-following-milestone($milestone)) then
+as element() {
+    if (tapi-txt:has-following-milestone($milestone)) then 
         tapi-txt:get-next-milestone($milestone)
     else
         $milestone/ancestor::tei:text[1]/tei:body/child::*[last()]
@@ -177,12 +176,12 @@ as node() {
 
 declare function tapi-txt:has-following-milestone($milestone as element(tei:milestone))
 as xs:boolean {
-    exists($milestone/following::tei:milestone[ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]])
+    exists($milestone/following::*[local-name(.) = 'milestone'][./ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]])
 };
 
 declare function tapi-txt:get-next-milestone($milestone as element(tei:milestone))
 as element(tei:milestone)? {
-    $milestone/following::tei:milestone[ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]][1]
+    $milestone/following::*[local-name(.) = 'milestone'][./ancestor::tei:text[1] = $milestone/ancestor::tei:text[1]][1]
 };
 
 declare function tapi-txt:get-relevant-text-from-chunks($chunks as element(tei:TEI)+)
diff --git a/exist-app/tests/tapi-txt-tests.xqm b/exist-app/tests/tapi-txt-tests.xqm
index cb90097..944fc51 100644
--- a/exist-app/tests/tapi-txt-tests.xqm
+++ b/exist-app/tests/tapi-txt-tests.xqm
@@ -8,10 +8,14 @@ import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons"
 import module namespace tapi-txt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt" at "../modules/tapi-txt.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 
+
 declare variable $ttt:sample-file := local:open-file("ahiqar_sample");
 declare variable $ttt:sample-transliteration := $ttt:sample-file//tei:text[@type = "transliteration"];
 declare variable $ttt:sample-transcription := $ttt:sample-file//tei:text[@type = "transcription"];
 
+declare variable $ttt:kant-sample := local:open-file("kant_sample");
+declare variable $ttt:kant-transcription := $ttt:kant-sample//tei:text[@type = "transcription"];
+
 declare
     %test:args("ahiqar_sample") %test:assertExists
     %test:args("1234") %test:assertError("org.exist.xquery.XPathException")
@@ -498,9 +502,74 @@ as xs:base64Binary {
     if (xmldb:collection-available($commons:tg-collection || "/txt")) then
         tapi-txt:compress-to-zip()
     else
-        (
+        ( 
             let $prepare := tapi-txt:main()
             return
                 tapi-txt:compress-to-zip()
         )
 };
+
+declare
+    %test:args("first_narrative_section")
+    %test:assertEquals(" Daß alle unsere Erkenntnis mit der Erfahrung anfange daran")
+    %test:args("sayings")
+    %test:assertEquals(" Wenn aber gleich alle unsere Erkenntnis mit der Erfahrung anhebt so entspringt sie darum doch nicht eben")
+    %test:args("second_narrative_section")
+    %test:assertEquals(" Es ist also wenigstens eine der näheren Untersuchung noch benötigte und nicht auf den")
+function ttt:check-contents($chunk-type as xs:string) {
+    let $serialize := tapi-txt:main()
+    let $filepath := "/db/apps/sade/textgrid/txt/arabic--kant_sample-transcription-" || $chunk-type || ".txt"
+    return
+        util:binary-doc($filepath)
+        => util:base64-decode()
+};
+
+declare
+    %test:args("first_narrative_section")
+    %test:assertXPath("$result[local-name(.) = 'milestone'][@unit = 'sayings']")
+    %test:args("sayings")
+    %test:assertXPath("$result[local-name(.) = 'milestone'][@unit = 'second_narrative_section']")
+    %test:args("second_narrative_section")
+    %test:assertXPath("$result[local-name(.) = 'ab']")
+function ttt:get-end-of-chunk-kant($type as xs:string) {
+    let $milestone := $ttt:kant-transcription//tei:milestone[@unit = $type]
+    return
+        tapi-txt:get-end-of-chunk($milestone)
+};
+
+declare
+    %test:args("first_narrative_section")
+    %test:assertXPath("$result//*[local-name(.) = 'ab'][count(../*[local-name(.) = 'ab']) = 1]/text() = 'Daß alle unsere Erkenntnis mit der Erfahrung anfange, daran '")
+    %test:args("sayings")
+    %test:assertXPath("$result//*[local-name(.) = 'ab'][count(../*[local-name(.) = 'ab']) = 1]/text() = 'Wenn aber gleich alle unsere Erkenntnis mit der Erfahrung anhebt, so entspringt sie darum doch nicht eben'")
+    %test:args("second_narrative_section")
+    %test:assertXPath("$result//*[local-name(.) = 'ab'][count(../*[local-name(.) = 'ab']) = 1]/text() = 'Es ist also wenigstens eine der näheren Untersuchung noch benötigte und nicht auf den'")
+function ttt:get-chunk-kant($type as xs:string) {
+    tapi-txt:get-chunk($ttt:kant-transcription, $type)
+};
+
+declare
+    %test:args("first_narrative_section")
+    %test:assertEquals("Daß alle unsere Erkenntnis mit der Erfahrung anfange daran")
+    %test:args("sayings")
+    %test:assertEquals("Wenn aber gleich alle unsere Erkenntnis mit der Erfahrung anhebt so entspringt sie darum doch nicht eben")
+    %test:args("second_narrative_section")
+    %test:assertEquals("Es ist also wenigstens eine der näheren Untersuchung noch benötigte und nicht auf den")
+function ttt:get-relevant-text-from-chunks($type as xs:string)
+as xs:string {
+    let $chunk := tapi-txt:get-chunk($ttt:kant-transcription, $type)
+    return
+        tapi-txt:get-relevant-text-from-chunks($chunk)
+};
+
+declare
+    %test:args("first_narrative_section")
+    %test:assertEquals(" Daß alle unsere Erkenntnis mit der Erfahrung anfange daran")
+    %test:args("sayings")
+    %test:assertEquals(" Wenn aber gleich alle unsere Erkenntnis mit der Erfahrung anhebt so entspringt sie darum doch nicht eben")
+    %test:args("second_narrative_section")
+    %test:assertEquals(" Es ist also wenigstens eine der näheren Untersuchung noch benötigte und nicht auf den")
+function ttt:get-relevant-text($type as xs:string)
+as xs:string {
+    tapi-txt:get-relevant-text($ttt:kant-transcription, $type)
+};
-- 
GitLab


From 010a6586b27b6b581b36184607f4df61905fdcf2 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 3 Dec 2020 13:55:13 +0100
Subject: [PATCH 098/155] tests: remove test data

---
 exist-app/tests/tapi-txt-tests.xqm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/exist-app/tests/tapi-txt-tests.xqm b/exist-app/tests/tapi-txt-tests.xqm
index 944fc51..1842a66 100644
--- a/exist-app/tests/tapi-txt-tests.xqm
+++ b/exist-app/tests/tapi-txt-tests.xqm
@@ -16,6 +16,23 @@ declare variable $ttt:sample-transcription := $ttt:sample-file//tei:text[@type =
 declare variable $ttt:kant-sample := local:open-file("kant_sample");
 declare variable $ttt:kant-transcription := $ttt:kant-sample//tei:text[@type = "transcription"];
 
+declare 
+    %test:tearDown
+function ttt:_test-teardown() {
+    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample-transcription-first_narrative_section.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample-transcription-sayings.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample-transcription-second_narrative_section.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample-transcription-third_narrative_section.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample-transcription-parables.txt"),
+    
+    xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-first_narrative_section.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-sayings.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-second_narrative_section.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-third_narrative_section.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-parables.txt")
+    
+};
+
 declare
     %test:args("ahiqar_sample") %test:assertExists
     %test:args("1234") %test:assertError("org.exist.xquery.XPathException")
-- 
GitLab


From 35a6ef2ef3d621ce1219d8623bc5311f412f40c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Wed, 6 Jan 2021 12:08:33 +0100
Subject: [PATCH 099/155] feat: round numeric values from TILE

---
 exist-app/modules/tapi-img.xqm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/exist-app/modules/tapi-img.xqm b/exist-app/modules/tapi-img.xqm
index be5c807..cee7052 100644
--- a/exist-app/modules/tapi-img.xqm
+++ b/exist-app/modules/tapi-img.xqm
@@ -108,10 +108,10 @@ as xs:string {
 
 declare function local:truncate($number-as-string as attribute())
 as xs:string {
-    if (matches($number-as-string, "\.")) then
-        functx:get-matches($number-as-string, "\d+\.\d{1}")
-    else
-        $number-as-string/string()
+  $number-as-string
+    => substring-before("%")
+    => xs:decimal()
+    => format-number("0.00") (: will round last number; converts to string :)
 };
 
 declare function tapi-img:get-relevant-image-section($manifest-uri as xs:string,
-- 
GitLab


From 437af3615ce3f6be027e63f31aafb23bf455ba29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Wed, 6 Jan 2021 13:10:31 +0100
Subject: [PATCH 100/155] tests: adjust for more precise sections

---
 exist-app/tests/tapi-img-tests.xqm  | 4 ++--
 exist-app/tests/tapi-item-tests.xqm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/exist-app/tests/tapi-img-tests.xqm b/exist-app/tests/tapi-img-tests.xqm
index afab48c..9e95fd4 100644
--- a/exist-app/tests/tapi-img-tests.xqm
+++ b/exist-app/tests/tapi-img-tests.xqm
@@ -80,7 +80,7 @@ as element() {
 };
 
 declare
-    %test:assertEquals("50.0,0.4,49.8,100.0")
+    %test:assertEquals("50.03,0.48,49.83,100.00")
 function t:get-svg-section-dimensions-as-string()
 as xs:string {
     let $manifest-uri := "ahiqar_agg"
@@ -92,7 +92,7 @@ as xs:string {
 };
 
 declare
-    %test:args("ahiqar_agg", "82a") %test:assertEquals("50.0,0.4,49.8,100.0")
+    %test:args("ahiqar_agg", "82a") %test:assertEquals("50.03,0.48,49.83,100.00")
 function t:get-relevant-image-section($manifest-uri as xs:string,
     $page-uri as xs:string)
 as xs:string {
diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index 901c20f..88fa5f6 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -24,7 +24,7 @@ as xs:string {
 };
 
 declare
-    %test:args("ahiqar_agg", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz/50.0,0.4,49.8,100.0")
+    %test:args("ahiqar_agg", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz/50.03,0.48,49.83,100.00")
     %test:args("ahiqar_agg_wo_tile", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz")
 function titemt:make-facsimile-id($manifest-uri as xs:string,
     $page as xs:string)
@@ -81,7 +81,7 @@ as xs:string {
 };
 
 declare
-    %test:args("3r1nz", "ahiqar_agg", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz/50.0,0.4,49.8,100.0")
+    %test:args("3r1nz", "ahiqar_agg", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz/50.03,0.48,49.83,100.00")
 function titemt:make-url-for-double-page-image($facsimile-uri as xs:string,
     $manifest-uri as xs:string,
     $page as xs:string)
-- 
GitLab


From afc0c5a8c9c66a21fdad5793681d03b098fa214a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Thu, 7 Jan 2021 12:22:10 +0100
Subject: [PATCH 101/155] fix: use external $target var to determine app
 collection

---
 exist-app/post-install.xq | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index 35eb282..2099309 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -1,11 +1,10 @@
 xquery version "3.1";
 (: the target collection into which the app is deployed :)
-declare variable $target external;
-declare variable $ahikar-base := "/db/apps/ahikar";
+declare variable $target external; (: := "/db/apps/ahikar"; :)
 declare variable $tg-base := "/db/apps/sade/textgrid";
 
 declare function local:move-and-rename($filename as xs:string) as item()* {
-    let $data-file-path := $ahikar-base || "/data/"
+    let $data-file-path := $target || "/data/"
     let $target-data-collection := $tg-base || "/data/"
     let $target-meta-collection := $tg-base || "/meta/"
     let $target-agg-collection := $tg-base || "/agg/"
@@ -49,43 +48,29 @@ declare function local:move-and-rename($filename as xs:string) as item()* {
 ),
 
 (: set owner and mode for RestXq module :)
-(let $path := $ahikar-base || "/modules/tapi.xqm"
+(let $path := $target || "/modules/tapi.xqm"
 return (sm:chown($path, "admin"), sm:chmod($path, "rwsrwxr-x"))),
 
 (: set owner and mode for deployment module :)
-(let $path := $ahikar-base || "/modules/deploy.xqm"
+(let $path := $target || "/modules/deploy.xqm"
 return (sm:chown($path, "admin"), sm:chmod($path, "rwsrwxr-x"))),
 
 (: set owner and mode for testtrigger module :)
-(let $path := $ahikar-base || "/modules/testtrigger.xqm"
+(let $path := $target || "/modules/testtrigger.xqm"
 return (sm:chown($path, "admin"), sm:chmod($path, "rwsrwxr-x"))),
 
 (: move the sample XMLs to sade/textgrid to be available in the viewer :)
 ( 
-    let $files := 
-        ( 
-        "sample_teixml.xml",
-        "sample_teixml_meta.xml",
-        "sample_edition.xml",
-        "sample_edition_meta.xml",
-        "ahiqar_images.xml",
-        "ahiqar_images_meta.xml",
-        "sample_main_edition.xml",
-        "sample_main_edition_meta.xml",
-        "sample_lang_aggregation.xml",
-        "sample_lang_aggregation_meta.xml")
-    return
-        ( 
-            for $file in $files return
-                local:move-and-rename($file)
-        )
+    
+    xmldb:get-child-resources($target || "/data")[ends-with(., ".xml")]
+    ! local:move-and-rename(.)
 ),
 
 (: make Ahikar specific OpenAPI config available to the OpenAPI app :)
 ( 
     if (xmldb:collection-available("/db/apps/openapi")) then
         (xmldb:remove("/db/apps/openapi", "openapi-config.xml"),
-        xmldb:move($ahikar-base, "/db/apps/openapi", "openapi-config.xml"))
+        xmldb:move($target, "/db/apps/openapi", "openapi-config.xml"))
     else
         ()
 )
\ No newline at end of file
-- 
GitLab


From b58acbdd5473f3d7769f163d33e6be1c418ead41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Thu, 7 Jan 2021 12:44:42 +0100
Subject: [PATCH 102/155] fix: path to module

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

diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 86c7584..9d132af 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -22,7 +22,7 @@ import module namespace thtmlt="http://ahikar.sub.uni-goettingen.de/ns/tapi/html
 import module namespace titemt="http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests" at "../tests/tapi-item-tests.xqm";
 import module namespace tmt="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests" at "../tests/tapi-manifest-tests.xqm";
 import module namespace tt="http://ahikar.sub.uni-goettingen.de/ns/tapi/tests" at "../tests/tapi-tests.xqm";
-import module namespace ttnt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/normalization/tests" at "tapi-txt-normalization-tests.xqm";
+import module namespace ttnt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/normalization/tests" at "../tests/tapi-txt-normalization-tests.xqm";
 import module namespace ttt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" at "../tests/tapi-txt-tests.xqm";
 import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "../tests/tei2html-tests.xqm";
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "../tests/tei2html-textprocessing-tests.xqm";
-- 
GitLab


From 41169c72fa18558384d56311403bbdebe1fecf3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Thu, 7 Jan 2021 12:44:56 +0100
Subject: [PATCH 103/155] fix: readd Kant sample

---
 exist-app/post-install.xq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index 2099309..e081091 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -17,7 +17,7 @@ declare function local:move-and-rename($filename as xs:string) as item()* {
                     xmldb:rename($target-meta-collection, $filename, $new-filename)
                 )
         else
-            if (matches($filename, "teixml")) then
+            if (matches($filename, "teixml|kant")) then
                 xmldb:move($data-file-path, $target-data-collection, $filename)
             else
                 xmldb:move($data-file-path, $target-agg-collection, $filename)
-- 
GitLab


From 6eda1de5cb5c3b4a72cf1fd09579e5acc8a1195c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 11 Jan 2021 09:26:43 +0100
Subject: [PATCH 104/155] fix: rename sample file according to processing in
 post-install.xq

---
 exist-app/data/{kant_sample.xml => kant_sample_teixml.xml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename exist-app/data/{kant_sample.xml => kant_sample_teixml.xml} (100%)

diff --git a/exist-app/data/kant_sample.xml b/exist-app/data/kant_sample_teixml.xml
similarity index 100%
rename from exist-app/data/kant_sample.xml
rename to exist-app/data/kant_sample_teixml.xml
-- 
GitLab


From 7295c4ff76715c10698df99d8c35d87035e0bbb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 11 Jan 2021 10:49:39 +0100
Subject: [PATCH 105/155] fix: adjust object names in tests

---
 exist-app/tests/commons-tests.xqm         |  2 +-
 exist-app/tests/tapi-collection-tests.xqm |  7 -------
 exist-app/tests/tapi-img-tests.xqm        | 16 ++++++++--------
 exist-app/tests/tapi-item-tests.xqm       |  2 ++
 exist-app/tests/tapi-manifest-tests.xqm   |  6 ------
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/exist-app/tests/commons-tests.xqm b/exist-app/tests/commons-tests.xqm
index e3a44d7..95d8a2b 100644
--- a/exist-app/tests/commons-tests.xqm
+++ b/exist-app/tests/commons-tests.xqm
@@ -80,7 +80,7 @@ as element() {
 };
 
 declare
-    %test:args("ahiqar_sample") %test:assertXPath("$result//*[local-name(.) = 'title'] = 'Beispieldatei zum Testen'")
+    %test:args("sample_teixml") %test:assertXPath("$result//*[local-name(.) = 'title'] = 'Beispieldatei zum Testen'")
 function ct:get-metadata-file($uri as xs:string)
 as document-node() {
     commons:get-metadata-file($uri)
diff --git a/exist-app/tests/tapi-collection-tests.xqm b/exist-app/tests/tapi-collection-tests.xqm
index 0d9d3d5..696a80e 100644
--- a/exist-app/tests/tapi-collection-tests.xqm
+++ b/exist-app/tests/tapi-collection-tests.xqm
@@ -156,13 +156,6 @@ function tct:get-allowed-manifest-uris-sample-input() {
         tapi-coll:get-allowed-manifest-uris($collection-metadata)
 };
 
-declare
-    %test:args("sample_main_edition") %test:assertXPath("$result[self::document-node()]")
-function tct:get-metadata-file($uri as xs:string) {
-    tapi-coll:get-metadata-file($uri)
-};
-
-
 declare
     %test:args("textgrid:1234") %test:assertEquals("1234")
     %test:args("1234") %test:assertEquals("1234")
diff --git a/exist-app/tests/tapi-img-tests.xqm b/exist-app/tests/tapi-img-tests.xqm
index 9e95fd4..7477d88 100644
--- a/exist-app/tests/tapi-img-tests.xqm
+++ b/exist-app/tests/tapi-img-tests.xqm
@@ -8,7 +8,7 @@ import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:o
 import module namespace tapi-img="http://ahikar.sub.uni-goettingen.de/ns/tapi/images" at "../modules/tapi-img.xqm";
 
 declare
-    %test:args("ahiqar_agg")
+    %test:args("sample_edition")
     %test:assertTrue
 function t:has-manifest-tile($manifest-uri) as xs:boolean {
     tapi-img:has-manifest-tile($manifest-uri)
@@ -30,7 +30,7 @@ as xs:boolean {
 };
 
 declare
-    %test:args("ahiqar_agg") %test:assertEquals("ahiqar_tile")
+    %test:args("sample_edition") %test:assertEquals("ahiqar_tile")
 function t:get-tile-uri($manifest-uri as xs:string)
 as xs:string {
     tapi-img:get-tile-uri($manifest-uri)
@@ -38,7 +38,7 @@ as xs:string {
 
 
 declare
-    %test:args("ahiqar_agg") %test:assertXPath("$result//*[local-name(.) = 'rect']")
+    %test:args("sample_edition") %test:assertXPath("$result//*[local-name(.) = 'rect']")
 function t:get-tile($manifest-uri as xs:string)
 as document-node() {
     tapi-img:get-tile($manifest-uri)
@@ -46,8 +46,8 @@ as document-node() {
 
 
 declare
-    %test:args("ahiqar_agg", "82a") %test:assertEquals("3r1nz")
-    %test:args("ahiqar_agg_wo_tile", "82b") %test:assertEquals("3r1p0")
+    %test:args("sample_edition", "82a") %test:assertEquals("3r1nz")
+(:    %test:args("ahiqar_agg_wo_tile", "82b") %test:assertEquals("3r1p0"):)
 function t:get-facsimile-uri-for-page($manifest-uri as xs:string,
     $page as xs:string)
 as xs:string {
@@ -55,7 +55,7 @@ as xs:string {
 };
 
 declare
-    %test:args("ahiqar_agg", "82a") %test:assertEquals("a1")
+    %test:args("sample_edition", "82a") %test:assertEquals("a1")
 function t:get-xml-id-for-page($manifest-uri as xs:string,
     $page as xs:string)
 as xs:string {
@@ -63,7 +63,7 @@ as xs:string {
 };
 
 declare
-    %test:args("ahiqar_agg", "a1") %test:assertEquals("shape-1")
+    %test:args("sample_edition", "a1") %test:assertEquals("shape-1")
 function t:get-shape-id($manifest-uri as xs:string,
     $page-id as xs:string)
 as xs:string {
@@ -92,7 +92,7 @@ as xs:string {
 };
 
 declare
-    %test:args("ahiqar_agg", "82a") %test:assertEquals("50.03,0.48,49.83,100.00")
+    %test:args("sample_edition", "82a") %test:assertEquals("50.03,0.48,49.83,100.00")
 function t:get-relevant-image-section($manifest-uri as xs:string,
     $page-uri as xs:string)
 as xs:string {
diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index d2b3397..698bc83 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -16,6 +16,7 @@ function titemt:_test-setup() {
     local:create-and-store-test-data()
 };
 
+(: TODO @michelle: is this still required?
 declare
     %test:args("sample_edition", "82a") %test:assertEquals("3r1nz")
 function titemt:get-facsimile-uri-for-page($manifest-uri as xs:string,
@@ -23,6 +24,7 @@ function titemt:get-facsimile-uri-for-page($manifest-uri as xs:string,
 as xs:string {
     tapi-item:get-facsimile-uri-for-page($manifest-uri, $page)
 };
+:)
 
 declare
     %test:args("sample_edition") %test:assertEquals("Arabic, Classical Syriac, Eastern Syriac, Karshuni, Western Syriac")
diff --git a/exist-app/tests/tapi-manifest-tests.xqm b/exist-app/tests/tapi-manifest-tests.xqm
index 62eb08d..05b4fa3 100644
--- a/exist-app/tests/tapi-manifest-tests.xqm
+++ b/exist-app/tests/tapi-manifest-tests.xqm
@@ -128,12 +128,6 @@ function tmt:_test-teardown() {
     xmldb:remove($commons:data, $tmt:tei3-uri)
 };
 
-declare
-    %test:args("sample_edition") %test:assertXPath("$result//* = 'textgrid:sample_edition.0'")
-function tmt:get-metadata-file($manifest-uri) {
-    tapi-mani:get-metadata-file($manifest-uri)
-};
-
 
 declare
     %test:args("sample_main_edition", "sample_edition") %test:assertXPath("$result//id[matches(., '/api/textapi/ahikar/sample_main_edition/sample_edition-82a/latest/item.json')]")
-- 
GitLab


From 3642dec88c2ef236986c37d0ad23f93d11cb369f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 11 Jan 2021 10:51:06 +0100
Subject: [PATCH 106/155] fix: take over functions to commons

potential regression! @mrodzis please check
---
 exist-app/modules/commons.xqm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/exist-app/modules/commons.xqm b/exist-app/modules/commons.xqm
index ef0bb85..57aef3d 100644
--- a/exist-app/modules/commons.xqm
+++ b/exist-app/modules/commons.xqm
@@ -124,3 +124,22 @@ as element() {
         else
             $start-node/following::tei:ab[last()]
 };
+
+(: following added by MERGE !55 feat/#52-annotation-api-tests :)
+
+declare function commons:get-metadata-file($uri as xs:string)
+as document-node() {
+    doc($commons:meta || $uri || ".xml")
+};
+
+declare function commons:get-aggregation($manifest-uri as xs:string)
+as document-node() {
+    doc($commons:agg || $manifest-uri || ".xml")
+};
+
+declare function commons:open-tei-xml($tei-xml-uri as xs:string)
+as document-node() {
+    doc($commons:data || $tei-xml-uri || ".xml")
+};
+
+
-- 
GitLab


From 4e3f6ce84f6298bb62eae6c4a3fe0daa719e77ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 11 Jan 2021 10:51:28 +0100
Subject: [PATCH 107/155] fix: switch on sample data

---
 exist-app/post-install.xq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index 6997018..e6cfdab 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -28,7 +28,7 @@ declare function local:move-and-rename($filename as xs:string) as item()* {
                     )
             case "tile" return 
                 xmldb:move($data-file-path, $target-tile-collection, $filename)
-            case "sample" return
+            case "teixml" return
                 xmldb:move($data-file-path, $target-data-collection, $filename)
             default return
                 xmldb:move($data-file-path, $target-agg-collection, $filename)
-- 
GitLab


From 6085c4bfe125771faf0cfc53557819b84c7ab106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Mon, 11 Jan 2021 11:55:14 +0100
Subject: [PATCH 108/155] fix: kant filename

---
 exist-app/tests/tapi-txt-tests.xqm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exist-app/tests/tapi-txt-tests.xqm b/exist-app/tests/tapi-txt-tests.xqm
index c14b26a..0faf708 100644
--- a/exist-app/tests/tapi-txt-tests.xqm
+++ b/exist-app/tests/tapi-txt-tests.xqm
@@ -12,7 +12,7 @@ declare variable $ttt:sample-file := local:open-file("sample_teixml");
 declare variable $ttt:sample-transliteration := $ttt:sample-file//tei:text[@type = "transliteration"];
 declare variable $ttt:sample-transcription := $ttt:sample-file//tei:text[@type = "transcription"];
 
-declare variable $ttt:kant-sample := local:open-file("kant_sample");
+declare variable $ttt:kant-sample := local:open-file("kant_sample_teixml");
 declare variable $ttt:kant-transcription := $ttt:kant-sample//tei:text[@type = "transcription"];
 
 declare 
-- 
GitLab


From 82ff70e9f59f0e583fff060a8c7b2f02a488523e Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 11 Jan 2021 15:09:59 +0100
Subject: [PATCH 109/155] fix: semantic errors

---
 CHANGELOG.md                    | 6 ++++++
 exist-app/build.properties      | 2 +-
 exist-app/post-install.xq       | 2 +-
 exist-app/tests/tests-runner.xq | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78d1d67..3a23563 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.2.] - 2021-01-11
+
+### Fixed
+
+- semantic errors that lead to the application not being installed properly.
+
 ## [2.2.1] - 2020-11-16
 
 ## Changed
diff --git a/exist-app/build.properties b/exist-app/build.properties
index e1228fd..8201e5f 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=2.2.0
+project.version=2.2.2
 project.title=TextAPI for Ahikar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index 185d374..d9d2793 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -84,7 +84,7 @@ return (sm:chown($path, "admin"), sm:chmod($path, "rwsrwxr-x"))),
         "ahiqar_collection.xml",
         "ahiqar_collection_meta.xml",
         "ahiqar_tile.xml",
-        "ahiqar_tile_meta.xml")
+        "ahiqar_tile_meta.xml",
         "kant_sample.xml")
 
     return
diff --git a/exist-app/tests/tests-runner.xq b/exist-app/tests/tests-runner.xq
index 22daeda..a048409 100644
--- a/exist-app/tests/tests-runner.xq
+++ b/exist-app/tests/tests-runner.xq
@@ -29,7 +29,7 @@ let $test-results :=
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/images/tests"))
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/images/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/normalization/tests"))
     )
 
-- 
GitLab


From 9c9a1b34cc4d35d2c7b5cc6a0dd892082df30ac4 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 13 Jan 2021 07:14:04 +0100
Subject: [PATCH 110/155] tests: adjust path to new name of Kant sample file

---
 exist-app/tests/tapi-txt-tests.xqm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/exist-app/tests/tapi-txt-tests.xqm b/exist-app/tests/tapi-txt-tests.xqm
index 0faf708..05aecef 100644
--- a/exist-app/tests/tapi-txt-tests.xqm
+++ b/exist-app/tests/tapi-txt-tests.xqm
@@ -18,11 +18,11 @@ declare variable $ttt:kant-transcription := $ttt:kant-sample//tei:text[@type = "
 declare 
     %test:tearDown
 function ttt:_test-teardown() {
-    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample-transcription-first_narrative_section.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample-transcription-sayings.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample-transcription-second_narrative_section.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample-transcription-third_narrative_section.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample-transcription-parables.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample_teixml-transcription-first_narrative_section.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample_teixml-transcription-sayings.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample_teixml-transcription-second_narrative_section.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample_teixml-transcription-third_narrative_section.txt"),
+    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample_teixml-transcription-parables.txt"),
     
     xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-first_narrative_section.txt"),
     xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-sayings.txt"),
@@ -527,7 +527,7 @@ declare
     %test:assertEquals(" Es ist also wenigstens eine der näheren Untersuchung noch benötigte und nicht auf den")
 function ttt:check-contents($chunk-type as xs:string) {
     let $serialize := tapi-txt:main()
-    let $filepath := "/db/apps/sade/textgrid/txt/arabic--kant_sample-transcription-" || $chunk-type || ".txt"
+    let $filepath := "/db/apps/sade/textgrid/txt/arabic--kant_sample_teixml-transcription-" || $chunk-type || ".txt"
     return
         util:binary-doc($filepath)
         => util:base64-decode()
-- 
GitLab


From 387df95a690cdbd93555ff640c19699a4517d605 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 13 Jan 2021 07:48:15 +0100
Subject: [PATCH 111/155] fix: adjust faux sample to current format

---
 exist-app/data/sample_edition.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exist-app/data/sample_edition.xml b/exist-app/data/sample_edition.xml
index 259105e..9f37449 100644
--- a/exist-app/data/sample_edition.xml
+++ b/exist-app/data/sample_edition.xml
@@ -1,6 +1,6 @@
 <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
     <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_edition.0">
         <ore:aggregates rdf:resource="textgrid:sample_teixml"/>
-        <ore:aggregates rdf:resource="textgrid:ahiqar_sample_faux"/>
+        <ore:aggregates rdf:resource="textgrid:faux_teixml"/>
     </rdf:Description>
 </rdf:RDF>
\ No newline at end of file
-- 
GitLab


From dd449c6306438e0fd11c08d70acde911e29c4632 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 13 Jan 2021 07:48:43 +0100
Subject: [PATCH 112/155] fix: add missing reference to TILE

---
 exist-app/data/sample_edition.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/exist-app/data/sample_edition.xml b/exist-app/data/sample_edition.xml
index 9f37449..2d293cc 100644
--- a/exist-app/data/sample_edition.xml
+++ b/exist-app/data/sample_edition.xml
@@ -2,5 +2,6 @@
     <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_edition.0">
         <ore:aggregates rdf:resource="textgrid:sample_teixml"/>
         <ore:aggregates rdf:resource="textgrid:faux_teixml"/>
+        <ore:aggregates rdf:resource="textgrid:ahiqar_tile"/>
     </rdf:Description>
 </rdf:RDF>
\ No newline at end of file
-- 
GitLab


From 332b375be5f81a17b6bc48ec9f47631aee6e5af7 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 13 Jan 2021 08:02:51 +0100
Subject: [PATCH 113/155] refactor: remove dead code, consider only availble
 TILEs

---
 exist-app/modules/tapi-img.xqm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/exist-app/modules/tapi-img.xqm b/exist-app/modules/tapi-img.xqm
index cee7052..032b45c 100644
--- a/exist-app/modules/tapi-img.xqm
+++ b/exist-app/modules/tapi-img.xqm
@@ -17,7 +17,6 @@ declare namespace svg="http://www.w3.org/2000/svg";
 declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
-import module namespace functx="http://www.functx.com";
 
 declare function tapi-img:has-manifest-tile($manifest-uri as xs:string)
 as xs:boolean {
@@ -43,8 +42,7 @@ as xs:string* {
     for $element in $aggregated return
         let $stripped-uri := substring-after($element/@rdf:resource/string(), "textgrid:")
         return
-            if (tapi-img:is-resource-tile($stripped-uri)
-            and tapi-img:is-tile-available($stripped-uri)) then
+            if (tapi-img:is-tile-available($stripped-uri)) then
                 $stripped-uri
             else
                 ()
-- 
GitLab


From bb04baf62520dc9be946e36f73bdacb22196a3d3 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 13 Jan 2021 08:17:47 +0100
Subject: [PATCH 114/155] tests: fix file names; add setup and teadown for
 clarity

The setUp and tearDown originally takes places in tapi-item-tests.xqm, which is confusing.
---
 exist-app/tests/tapi-img-tests.xqm  | 51 ++++++++++++++++++++++++++---
 exist-app/tests/tapi-item-tests.xqm | 29 ----------------
 2 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/exist-app/tests/tapi-img-tests.xqm b/exist-app/tests/tapi-img-tests.xqm
index 7477d88..b74d73d 100644
--- a/exist-app/tests/tapi-img-tests.xqm
+++ b/exist-app/tests/tapi-img-tests.xqm
@@ -4,9 +4,22 @@ module namespace t="http://ahikar.sub.uni-goettingen.de/ns/tapi/images/tests";
 
 declare namespace http = "http://expath.org/ns/http-client";
 
+import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace tapi-img="http://ahikar.sub.uni-goettingen.de/ns/tapi/images" at "../modules/tapi-img.xqm";
 
+declare
+    %test:setUp
+function t:_test-setup() {
+    local:create-and-store-test-data()
+};
+
+declare
+    %test:tearDown
+function t:_test-teardown() {
+    local:remove-test-data()
+};
+
 declare
     %test:args("sample_edition")
     %test:assertTrue
@@ -15,7 +28,7 @@ function t:has-manifest-tile($manifest-uri) as xs:boolean {
 };
 
 declare
-    %test:args("ahiqar_sample") %test:assertFalse
+    %test:args("sample_teixml") %test:assertFalse
     %test:args("ahiqar_tile") %test:assertTrue
 function t:is-resource-tile($uri) as xs:boolean {
     tapi-img:is-resource-tile($uri)
@@ -23,6 +36,7 @@ function t:is-resource-tile($uri) as xs:boolean {
 
 declare
     %test:args("ahiqar_tile") %test:assertTrue
+    (: the following is a sample for a resource that's not available in the db :)
     %test:args("ahiqar_tile-non-existent") %test:assertFalse
 function t:is-tile-available($tile-uri as xs:string)
 as xs:boolean {
@@ -47,7 +61,7 @@ as document-node() {
 
 declare
     %test:args("sample_edition", "82a") %test:assertEquals("3r1nz")
-(:    %test:args("ahiqar_agg_wo_tile", "82b") %test:assertEquals("3r1p0"):)
+    %test:args("ahiqar_agg_wo_tile", "82b") %test:assertEquals("3r1p0")
 function t:get-facsimile-uri-for-page($manifest-uri as xs:string,
     $page as xs:string)
 as xs:string {
@@ -74,7 +88,7 @@ declare
     %test:args("shape-1") %test:assertXPath("$result[@id = 'shape-1']")
 function t:get-svg-rect($shape-id as xs:string)
 as element() {
-    let $tile := tapi-img:get-tile("ahiqar_agg")
+    let $tile := tapi-img:get-tile("sample_edition")
     return
         tapi-img:get-svg-rect($tile, $shape-id)
 };
@@ -83,7 +97,7 @@ declare
     %test:assertEquals("50.03,0.48,49.83,100.00")
 function t:get-svg-section-dimensions-as-string()
 as xs:string {
-    let $manifest-uri := "ahiqar_agg"
+    let $manifest-uri := "sample_edition"
     let $shape-id := "shape-1"
     let $tile := tapi-img:get-tile($manifest-uri)
     let $svg := tapi-img:get-svg-rect($tile, $shape-id)
@@ -98,3 +112,32 @@ function t:get-relevant-image-section($manifest-uri as xs:string,
 as xs:string {
     tapi-img:get-relevant-image-section($manifest-uri, $page-uri)
 };
+
+declare function local:create-and-store-test-data()
+as xs:string+ {
+    let $agg-wo-tile :=
+        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:ahiqar_agg.0">
+                <ore:aggregates rdf:resource="textgrid:ahiqar_sample_2"/>
+            </rdf:Description>
+        </rdf:RDF>
+    let $agg-wo-tile-meta := commons:get-metadata-file("sample_edition")
+        
+    let $sample-xml-2 := commons:open-tei-xml("sample_teixml")
+    let $sample-xml-2-meta := commons:get-metadata-file("sample_teixml")
+        
+    return
+        (
+            xmldb:store("/db/apps/sade/textgrid/agg", "ahiqar_agg_wo_tile.xml", $agg-wo-tile),
+            xmldb:store("/db/apps/sade/textgrid/data", "ahiqar_sample_2.xml", $sample-xml-2),
+            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_sample_2.xml", $sample-xml-2-meta),
+            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_agg_wo_tile.xml", $agg-wo-tile-meta)
+        )
+};
+
+declare function local:remove-test-data() {
+    xmldb:remove("/db/apps/sade/textgrid/agg", "ahiqar_agg_wo_tile.xml"),
+    xmldb:remove("/db/apps/sade/textgrid/data", "ahiqar_sample_2.xml"),
+    xmldb:remove("/db/apps/sade/textgrid/meta", "ahiqar_sample_2.xml"),
+    xmldb:remove("/db/apps/sade/textgrid/meta", "ahiqar_agg_wo_tile.xml")
+};
diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index 698bc83..9189474 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -10,12 +10,6 @@ import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:o
 import module namespace tapi-item="http://ahikar.sub.uni-goettingen.de/ns/tapi/item" at "../modules/tapi-item.xqm";
 
 
-declare
-    %test:setUp
-function titemt:_test-setup() {
-    local:create-and-store-test-data()
-};
-
 (: TODO @michelle: is this still required?
 declare
     %test:args("sample_edition", "82a") %test:assertEquals("3r1nz")
@@ -101,26 +95,3 @@ function titemt:make-url-for-double-page-image($facsimile-uri as xs:string,
 as xs:string {
     tapi-item:make-url-for-double-page-image($facsimile-uri, $manifest-uri, $page, $tc:server)
 };
-
-
-declare function local:create-and-store-test-data()
-as xs:string+ {
-    let $agg-wo-tile :=
-        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:ahiqar_agg.0">
-                <ore:aggregates rdf:resource="textgrid:ahiqar_sample_2"/>
-            </rdf:Description>
-        </rdf:RDF>
-    let $agg-wo-tile-meta := commons:get-metadata-file("ahiqar_agg")
-        
-    let $sample-xml-2 := commons:open-tei-xml("ahiqar_sample")
-    let $sample-xml-2-meta := commons:get-metadata-file("ahiqar_sample")
-        
-    return
-        (
-            xmldb:store("/db/apps/sade/textgrid/agg", "ahiqar_agg_wo_tile.xml", $agg-wo-tile),
-            xmldb:store("/db/apps/sade/textgrid/data", "ahiqar_sample_2.xml", $sample-xml-2),
-            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_sample_2.xml", $sample-xml-2-meta),
-            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_agg_wo_tile.xml", $agg-wo-tile-meta)
-        )
-};
-- 
GitLab


From 22741ae5890e3396cbbe618729ca752c962af386 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 13 Jan 2021 08:22:47 +0100
Subject: [PATCH 115/155] tests: re-add test data (still needed)

---
 exist-app/tests/tapi-item-tests.xqm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index 9189474..698bc83 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -10,6 +10,12 @@ import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:o
 import module namespace tapi-item="http://ahikar.sub.uni-goettingen.de/ns/tapi/item" at "../modules/tapi-item.xqm";
 
 
+declare
+    %test:setUp
+function titemt:_test-setup() {
+    local:create-and-store-test-data()
+};
+
 (: TODO @michelle: is this still required?
 declare
     %test:args("sample_edition", "82a") %test:assertEquals("3r1nz")
@@ -95,3 +101,26 @@ function titemt:make-url-for-double-page-image($facsimile-uri as xs:string,
 as xs:string {
     tapi-item:make-url-for-double-page-image($facsimile-uri, $manifest-uri, $page, $tc:server)
 };
+
+
+declare function local:create-and-store-test-data()
+as xs:string+ {
+    let $agg-wo-tile :=
+        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:ahiqar_agg.0">
+                <ore:aggregates rdf:resource="textgrid:ahiqar_sample_2"/>
+            </rdf:Description>
+        </rdf:RDF>
+    let $agg-wo-tile-meta := commons:get-metadata-file("ahiqar_agg")
+        
+    let $sample-xml-2 := commons:open-tei-xml("ahiqar_sample")
+    let $sample-xml-2-meta := commons:get-metadata-file("ahiqar_sample")
+        
+    return
+        (
+            xmldb:store("/db/apps/sade/textgrid/agg", "ahiqar_agg_wo_tile.xml", $agg-wo-tile),
+            xmldb:store("/db/apps/sade/textgrid/data", "ahiqar_sample_2.xml", $sample-xml-2),
+            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_sample_2.xml", $sample-xml-2-meta),
+            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_agg_wo_tile.xml", $agg-wo-tile-meta)
+        )
+};
-- 
GitLab


From 712762c3c0ea0734b3380bbd1d19973ac9b027a3 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 13 Jan 2021 08:25:56 +0100
Subject: [PATCH 116/155] tests: adjust to changes in sample_edition

---
 exist-app/tests/commons-tests.xqm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exist-app/tests/commons-tests.xqm b/exist-app/tests/commons-tests.xqm
index 95d8a2b..e53f02d 100644
--- a/exist-app/tests/commons-tests.xqm
+++ b/exist-app/tests/commons-tests.xqm
@@ -40,7 +40,7 @@ as document-node()? {
 };
 
 declare
-    %test:args("sample_edition") %test:assertEquals("sample_teixml")
+    %test:args("sample_edition") %test:assertXPath("count($result) = 2 and $result = 'sample_teixml' and $result = 'ahiqar_tile'")
     %test:args("qwerty") %test:assertError("COMMONS002")
 function ct:get-available-aggregates($uri as xs:string)
 as xs:string+ {
@@ -84,4 +84,4 @@ declare
 function ct:get-metadata-file($uri as xs:string)
 as document-node() {
     commons:get-metadata-file($uri)
-};
\ No newline at end of file
+};
-- 
GitLab


From f2efa9c379c4efde994ce2db6470f75bef90fba9 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 13 Jan 2021 08:45:24 +0100
Subject: [PATCH 117/155] tests: add tearDown, fix errors caused by MR, remove
 surplus test

---
 exist-app/tests/tapi-item-tests.xqm | 39 +++++++++++++++++------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index 698bc83..9fcc3e8 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -16,15 +16,13 @@ function titemt:_test-setup() {
     local:create-and-store-test-data()
 };
 
-(: TODO @michelle: is this still required?
+
 declare
-    %test:args("sample_edition", "82a") %test:assertEquals("3r1nz")
-function titemt:get-facsimile-uri-for-page($manifest-uri as xs:string,
-    $page as xs:string)
-as xs:string {
-    tapi-item:get-facsimile-uri-for-page($manifest-uri, $page)
+    %test:tearDown
+function titemt:_test-teardown() {
+    local:remove-test-data()
 };
-:)
+
 
 declare
     %test:args("sample_edition") %test:assertEquals("Arabic, Classical Syriac, Eastern Syriac, Karshuni, Western Syriac")
@@ -33,18 +31,18 @@ as xs:string {
     tapi-item:get-language-string($manifest-uri)
 };
 
+
 declare
     %test:args("sample_edition", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz/50.03,0.48,49.83,100.00")
-(:  TODO: old name used here. dont know how to translate.
+    (: the following file is test data created by setUp :)
     %test:args("ahiqar_agg_wo_tile", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz")
-    %test:args("sample_edition", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz")
-:)
 function titemt:make-facsimile-id($manifest-uri as xs:string,
     $page as xs:string)
 as xs:string {
     tapi-item:make-facsimile-id($manifest-uri, $page, $tc:server)
 };
 
+
 declare
     %test:args("sample_edition") %test:assertEquals("The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh,
                king of Assyria and Nineveh")
@@ -66,7 +64,7 @@ declare
     (: checks if underlying pages are identified :)
     %test:assertXPath("$result//*[local-name(.) = 'content'] = 'http://0.0.0.0:8080/exist/restxq/api/content/sample_teixml-82a.html' ")
     (: checks if images connected to underlying pages are identified :)
-    %test:assertXPath("$result//*[local-name(.) = 'id'] = 'http://0.0.0.0:8080/exist/restxq/api/images/3r1nz' ")
+    %test:assertXPath("$result//*[local-name(.) = 'id'] = 'http://0.0.0.0:8080/exist/restxq/api/images/3r1nz/50.03,0.48,49.83,100.00' ")
     %test:assertXPath("$result//*[local-name(.) = 'annotationCollection'] = 'http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/sample_main_edition/sample_edition/82a/annotationCollection.json' ")
 function titemt:get-json($collection as xs:string,
     $document as xs:string,
@@ -94,7 +92,7 @@ as xs:string {
 };
 
 declare
-    %test:args("3r1nz", "ahiqar_agg", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz/50.03,0.48,49.83,100.00")
+    %test:args("3r1nz", "sample_edition", "82a") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/images/3r1nz/50.03,0.48,49.83,100.00")
 function titemt:make-url-for-double-page-image($facsimile-uri as xs:string,
     $manifest-uri as xs:string,
     $page as xs:string)
@@ -107,14 +105,14 @@ declare function local:create-and-store-test-data()
 as xs:string+ {
     let $agg-wo-tile :=
         <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:ahiqar_agg.0">
+            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_edition.0">
                 <ore:aggregates rdf:resource="textgrid:ahiqar_sample_2"/>
             </rdf:Description>
         </rdf:RDF>
-    let $agg-wo-tile-meta := commons:get-metadata-file("ahiqar_agg")
+    let $agg-wo-tile-meta := commons:get-metadata-file("sample_edition")
         
-    let $sample-xml-2 := commons:open-tei-xml("ahiqar_sample")
-    let $sample-xml-2-meta := commons:get-metadata-file("ahiqar_sample")
+    let $sample-xml-2 := commons:open-tei-xml("sample_teixml")
+    let $sample-xml-2-meta := commons:get-metadata-file("sample_teixml")
         
     return
         (
@@ -124,3 +122,12 @@ as xs:string+ {
             xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_agg_wo_tile.xml", $agg-wo-tile-meta)
         )
 };
+
+
+declare function local:remove-test-data() {
+    xmldb:remove("/db/apps/sade/textgrid/agg", "ahiqar_agg_wo_tile.xml"),
+    xmldb:remove("/db/apps/sade/textgrid/data", "ahiqar_sample_2.xml"),
+    xmldb:remove("/db/apps/sade/textgrid/meta", "ahiqar_sample_2.xml"),
+    xmldb:remove("/db/apps/sade/textgrid/meta", "ahiqar_agg_wo_tile.xml")
+};
+
-- 
GitLab


From 246e039e2b62ab93cbdd26b53b9ccc81ce7460e6 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 13 Jan 2021 08:57:59 +0100
Subject: [PATCH 118/155] chore: remove surplus comment

---
 exist-app/modules/commons.xqm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/exist-app/modules/commons.xqm b/exist-app/modules/commons.xqm
index 57aef3d..627a8bf 100644
--- a/exist-app/modules/commons.xqm
+++ b/exist-app/modules/commons.xqm
@@ -125,8 +125,6 @@ as element() {
             $start-node/following::tei:ab[last()]
 };
 
-(: following added by MERGE !55 feat/#52-annotation-api-tests :)
-
 declare function commons:get-metadata-file($uri as xs:string)
 as document-node() {
     doc($commons:meta || $uri || ".xml")
-- 
GitLab


From d77ed464b09299b122d15970b7f8dbcdb71d1b53 Mon Sep 17 00:00:00 2001
From: mrodzis <weidling@sub.uni-goettingen.de>
Date: Wed, 13 Jan 2021 14:31:40 +0100
Subject: [PATCH 119/155] Resolve "Rename App"

---
 CHANGELOG.md                   | 6 +++++-
 exist-app/build.properties     | 4 ++--
 exist-app/tests/tapi-tests.xqm | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eeb325a..8214772 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.3.0] - 2020-11-16
+## [2.4.0] - 2020-01-13
+
+- updated the eXist application's name since it was misleading
+
+## [2.3.0] - 2020-01-13
 
 ### Changed
 
diff --git a/exist-app/build.properties b/exist-app/build.properties
index ca3035b..1d96b11 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,6 +1,6 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=2.3.0
-project.title=TextAPI for Ahikar
+project.version=2.4.0
+project.title=Ahiqar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
 
diff --git a/exist-app/tests/tapi-tests.xqm b/exist-app/tests/tapi-tests.xqm
index 7eaa7ce..fa2036f 100644
--- a/exist-app/tests/tapi-tests.xqm
+++ b/exist-app/tests/tapi-tests.xqm
@@ -71,7 +71,7 @@ declare
     (: check if requests work :)
     %test:assertXPath("map:get($result, 'request') => map:get('scheme') = 'http'")
     (: check if expathpkg works :)
-    %test:assertXPath("map:get($result, 'package') => map:get('title') = 'TextAPI for Ahikar'")
+    %test:assertXPath("map:get($result, 'package') => map:get('title') = 'Ahiqar'")
     (: check if repo.xml works :)
     %test:assertXPath("map:get($result, 'meta') => map:get('target') = 'ahikar'")
 function tt:api-info()  as item() {
-- 
GitLab


From 55177bf5f6dfc7f9d2655088d5eab8c55b080c10 Mon Sep 17 00:00:00 2001
From: mrodzis <weidling@sub.uni-goettingen.de>
Date: Thu, 14 Jan 2021 08:41:39 +0100
Subject: [PATCH 120/155] tests: remove tests using removed functions

(tentative)
---
 CHANGELOG.md                        | 10 ++++++++--
 README.md                           |  2 +-
 docker/httpd/vhosts/exist.conf      |  6 +++---
 exist-app/build.properties          |  6 +-----
 exist-app/build.xml                 |  4 +---
 exist-app/expath-pkg.xml.tmpl       |  3 ++-
 exist-app/modules/commons.xqm       |  2 +-
 exist-app/modules/tapi-html.xqm     |  4 ----
 exist-app/modules/tapi-txt.xqm      |  4 ++--
 exist-app/post-install.xq           |  4 ++--
 exist-app/tests/commons-tests.xqm   |  2 +-
 exist-app/tests/tapi-html-tests.xqm |  9 ---------
 exist-app/tests/tapi-img-tests.xqm  | 17 ++++++++--------
 exist-app/tests/tapi-item-tests.xqm | 17 ++++++++--------
 exist-app/tests/tapi-txt-tests.xqm  | 31 +++++++++++++----------------
 15 files changed, 54 insertions(+), 67 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8214772..3f48461 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.4.0] - 2020-01-13
+## [2.5.0] - 2021-01-14
+
+## Changed
+
+- switched from SADE to TextGrid Connect Standalone as a means to get data from TextGrid
+
+## [2.4.0] - 2021-01-13
 
 - updated the eXist application's name since it was misleading
 
-## [2.3.0] - 2020-01-13
+## [2.3.0] - 2021-01-13
 
 ### Changed
 
diff --git a/README.md b/README.md
index 41cb2f8..daf0e06 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ To pass credentials to the container, we use the file `ahikar.env` which is not
 - TGUSER
 - TGPASS
 
-For local development this file MUST be present but can be left empty. In this case, the SADE Publish Tool may be used to import data from TextGrid.
+For local development this file MUST be present but can be left empty. In this case, TextGrid Connect Standalone may be used to import data from TextGrid.
 
 ```bash
 touch docker/ahikar.env
diff --git a/docker/httpd/vhosts/exist.conf b/docker/httpd/vhosts/exist.conf
index 1cd5370..26feba8 100644
--- a/docker/httpd/vhosts/exist.conf
+++ b/docker/httpd/vhosts/exist.conf
@@ -17,10 +17,10 @@
       ProxyPassReverse http://existdb:8080/exist/
   </Location>
 
-  <Location /sade/ >
+  <Location /textgrid-connect/ >
       ProxyPreserveHost Off
-      ProxyPass http://existdb:8080/exist/apps/sade/ retry=0
-      ProxyPassReverse http://existdb:8080/exist/apps/sade/
+      ProxyPass http://existdb:8080/exist/apps/textgrid-connect/ retry=0
+      ProxyPassReverse http://existdb:8080/exist/apps/textgrid-connect/
   </Location>
 
   <Location /rest/ >
diff --git a/exist-app/build.properties b/exist-app/build.properties
index 1d96b11..1378932 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=2.4.0
+project.version=2.5.0
 project.title=Ahiqar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
@@ -7,7 +7,3 @@ project.processorversion=5.2.0
 destfile=${build.dir}/${project.abbrev}-${project.version}.xar
 test.dir=test
 dependencies.dir=${build.dir}/dependencies
-
-sade.abbrev=SADE-develop
-assets.abbrev=sade_assets-develop
-code-viewer.abbrev=cv
diff --git a/exist-app/build.xml b/exist-app/build.xml
index 51e4a69..1512b88 100644
--- a/exist-app/build.xml
+++ b/exist-app/build.xml
@@ -56,10 +56,8 @@
 
     <target name="dependencies">
       <mkdir dir="${dependencies.dir}" />
-      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=${sade.abbrev}&amp;processor=${project.processorversion}" dest="${dependencies.dir}/sade-develop-latest.xar" ignoreerrors="true"/>
-      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=${assets.abbrev}&amp;processor=${project.processorversion}" dest="${dependencies.dir}/sade_assets-latest.xar" ignoreerrors="true"/>
-      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=${code-viewer.abbrev}&amp;processor=${project.processorversion}" dest="${dependencies.dir}/codeview-latest.xar" ignoreerrors="true"/>
       <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=openapi&amp;processor=${project.processorversion}" dest="${dependencies.dir}/openapi-latest.xar" ignoreerrors="true"/>
+      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=tg-connect-standalone&amp;processor=${project.processorversion}" dest="${dependencies.dir}/tg-connect-standalone.xar" ignoreerrors="true"/>
     </target>
 
 </project>
diff --git a/exist-app/expath-pkg.xml.tmpl b/exist-app/expath-pkg.xml.tmpl
index aa8e732..973432b 100644
--- a/exist-app/expath-pkg.xml.tmpl
+++ b/exist-app/expath-pkg.xml.tmpl
@@ -6,5 +6,6 @@
   spec="1.0">
     <title>@project.title@</title>
     <dependency processor="http://exist-db.org" semver-min="@project.processorversion@" />
-    <dependency package="http://sade.textgrid.de/ns/SADE-develop" />
+    <dependency package="http://sub.uni-goettingen.de/tg-connect-standalone" />
+    <dependency package="http://www.functx.com"/>
 </package>
diff --git a/exist-app/modules/commons.xqm b/exist-app/modules/commons.xqm
index 627a8bf..f2cf628 100644
--- a/exist-app/modules/commons.xqm
+++ b/exist-app/modules/commons.xqm
@@ -10,7 +10,7 @@ import module namespace fragment="https://wiki.tei-c.org/index.php?title=Milesto
 
 declare variable $commons:expath-pkg := doc("../expath-pkg.xml");
 declare variable $commons:version := $commons:expath-pkg/*/@version;
-declare variable $commons:tg-collection := "/db/apps/sade/textgrid";
+declare variable $commons:tg-collection := "/db/data/textgrid";
 declare variable $commons:data := $commons:tg-collection || "/data/";
 declare variable $commons:meta := $commons:tg-collection || "/meta/";
 declare variable $commons:agg := $commons:tg-collection || "/agg/";
diff --git a/exist-app/modules/tapi-html.xqm b/exist-app/modules/tapi-html.xqm
index 5c8bcf0..92a8868 100644
--- a/exist-app/modules/tapi-html.xqm
+++ b/exist-app/modules/tapi-html.xqm
@@ -1,8 +1,4 @@
 xquery version "3.1";
-(: 
- : This module is for preparing the HTML serialization of a
- : given TEI document or fragment.
- :)
 
 module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html";
 
diff --git a/exist-app/modules/tapi-txt.xqm b/exist-app/modules/tapi-txt.xqm
index f887ffa..f8c9e60 100644
--- a/exist-app/modules/tapi-txt.xqm
+++ b/exist-app/modules/tapi-txt.xqm
@@ -18,7 +18,7 @@ import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons"
 import module namespace fragment="https://wiki.tei-c.org/index.php?title=Milestone-chunk.xquery" at "fragment.xqm";
 import module namespace norm="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/normalization" at "tapi-txt-normalization.xqm";
 
-declare variable $tapi-txt:textgrid := "/db/apps/sade/textgrid";
+declare variable $tapi-txt:textgrid := "/db/data/textgrid";
 declare variable $tapi-txt:data := $tapi-txt:textgrid || "/data";
 declare variable $tapi-txt:txt := $tapi-txt:textgrid || "/txt";
 declare variable $tapi-txt:milestone-types :=
@@ -100,7 +100,7 @@ as xs:string? {
 declare function tapi-txt:create-metadata-title-for-file-name($text as element(tei:text))
 as xs:string {
     let $base-uri := tapi-txt:get-base-uri($text)
-    let $metadata := doc($base-uri => replace("/data/", "/meta/"))
+    let $metadata := doc($base-uri => replace("textgrid/data/", "textgrid/meta/"))
     return
         $metadata//tgmd:title
         => replace("[^a-zA-Z0-9]", "_")
diff --git a/exist-app/post-install.xq b/exist-app/post-install.xq
index e6cfdab..df805ad 100644
--- a/exist-app/post-install.xq
+++ b/exist-app/post-install.xq
@@ -4,7 +4,7 @@ import module namespace functx="http://www.functx.com";
 
 (: the target collection into which the app is deployed :)
 declare variable $target external; (: := "/db/apps/ahikar"; :)
-declare variable $tg-base := "/db/apps/sade/textgrid";
+declare variable $tg-base := "/db/data/textgrid";
 
 declare function local:move-and-rename($filename as xs:string) as item()* {
     let $data-file-path := $target || "/data/"
@@ -70,7 +70,7 @@ return (sm:chown($path, "admin"), sm:chmod($path, "rwsrwxr-x"))),
 (let $path := $target || "/modules/testtrigger.xqm"
 return (sm:chown($path, "admin"), sm:chmod($path, "rwsrwxr-x"))),
 
-(: move the sample XMLs to sade/textgrid to be available in the viewer :)
+(: move the sample XMLs to /db/data/textgrid to be available in the viewer :)
 ( 
     
     xmldb:get-child-resources($target || "/data")[ends-with(., ".xml")]
diff --git a/exist-app/tests/commons-tests.xqm b/exist-app/tests/commons-tests.xqm
index e53f02d..3a75ad8 100644
--- a/exist-app/tests/commons-tests.xqm
+++ b/exist-app/tests/commons-tests.xqm
@@ -10,7 +10,7 @@ import module namespace map="http://www.w3.org/2005/xpath-functions/map";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 
 declare variable $ct:restxq := "http://0.0.0.0:8080/exist/restxq/";
-declare variable $ct:base-uri := "/db/apps/sade/textgrid/data/sample_teixml.xml";
+declare variable $ct:base-uri := "/db/data/textgrid/data/sample_teixml.xml";
 
 declare
     %test:args("sample_edition") %test:assertEquals("sample_teixml")
diff --git a/exist-app/tests/tapi-html-tests.xqm b/exist-app/tests/tapi-html-tests.xqm
index 9ad50bd..00a3579 100644
--- a/exist-app/tests/tapi-html-tests.xqm
+++ b/exist-app/tests/tapi-html-tests.xqm
@@ -9,15 +9,6 @@ import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons"
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace tapi-html="http://ahikar.sub.uni-goettingen.de/ns/tapi/html" at "../modules/tapi-html.xqm";
 
-declare
-    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml", "82a") %test:assertXPath("$result//text()[matches(., 'حقًا')]")
-function thtmlt:transform-fragment($tei-xml-base-uri as xs:string,
-    $page as xs:string)
-as element(xhtml:div) {
-    let $fragment := commons:get-page-fragment($tei-xml-base-uri, $page)
-    return
-        tapi-html:get-html-from-fragment($fragment)
-};
 
 
 declare
diff --git a/exist-app/tests/tapi-img-tests.xqm b/exist-app/tests/tapi-img-tests.xqm
index b74d73d..7cbf8d9 100644
--- a/exist-app/tests/tapi-img-tests.xqm
+++ b/exist-app/tests/tapi-img-tests.xqm
@@ -128,16 +128,17 @@ as xs:string+ {
         
     return
         (
-            xmldb:store("/db/apps/sade/textgrid/agg", "ahiqar_agg_wo_tile.xml", $agg-wo-tile),
-            xmldb:store("/db/apps/sade/textgrid/data", "ahiqar_sample_2.xml", $sample-xml-2),
-            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_sample_2.xml", $sample-xml-2-meta),
-            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_agg_wo_tile.xml", $agg-wo-tile-meta)
+            xmldb:store("/db/data/textgrid/agg", "ahiqar_agg_wo_tile.xml", $agg-wo-tile),
+            xmldb:store("/db/data/textgrid/meta", "ahiqar_agg_wo_tile.xml", $agg-wo-tile-meta),
+
+            xmldb:store("/db/data/textgrid/data", "ahiqar_sample_2.xml", $sample-xml-2),
+            xmldb:store("/db/data/textgrid/meta", "ahiqar_sample_2.xml", $sample-xml-2-meta)
         )
 };
 
 declare function local:remove-test-data() {
-    xmldb:remove("/db/apps/sade/textgrid/agg", "ahiqar_agg_wo_tile.xml"),
-    xmldb:remove("/db/apps/sade/textgrid/data", "ahiqar_sample_2.xml"),
-    xmldb:remove("/db/apps/sade/textgrid/meta", "ahiqar_sample_2.xml"),
-    xmldb:remove("/db/apps/sade/textgrid/meta", "ahiqar_agg_wo_tile.xml")
+    xmldb:remove("/db/data/textgrid/agg", "ahiqar_agg_wo_tile.xml"),
+    xmldb:remove("/db/data/textgrid/data", "ahiqar_sample_2.xml"),
+    xmldb:remove("/db/data/textgrid/meta", "ahiqar_sample_2.xml"),
+    xmldb:remove("/db/data/textgrid/meta", "ahiqar_agg_wo_tile.xml")
 };
diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index 9fcc3e8..837f3c9 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -116,18 +116,19 @@ as xs:string+ {
         
     return
         (
-            xmldb:store("/db/apps/sade/textgrid/agg", "ahiqar_agg_wo_tile.xml", $agg-wo-tile),
-            xmldb:store("/db/apps/sade/textgrid/data", "ahiqar_sample_2.xml", $sample-xml-2),
-            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_sample_2.xml", $sample-xml-2-meta),
-            xmldb:store("/db/apps/sade/textgrid/meta", "ahiqar_agg_wo_tile.xml", $agg-wo-tile-meta)
+            xmldb:store("/db/data/textgrid/agg", "ahiqar_agg_wo_tile.xml", $agg-wo-tile),
+            xmldb:store("/db/data/textgrid/meta", "ahiqar_agg_wo_tile.xml", $agg-wo-tile-meta),
+
+            xmldb:store("/db/data/textgrid/data", "ahiqar_sample_2.xml", $sample-xml-2),
+            xmldb:store("/db/data/textgrid/meta", "ahiqar_sample_2.xml", $sample-xml-2-meta)
         )
 };
 
 
 declare function local:remove-test-data() {
-    xmldb:remove("/db/apps/sade/textgrid/agg", "ahiqar_agg_wo_tile.xml"),
-    xmldb:remove("/db/apps/sade/textgrid/data", "ahiqar_sample_2.xml"),
-    xmldb:remove("/db/apps/sade/textgrid/meta", "ahiqar_sample_2.xml"),
-    xmldb:remove("/db/apps/sade/textgrid/meta", "ahiqar_agg_wo_tile.xml")
+    xmldb:remove("/db/data/textgrid/agg", "ahiqar_agg_wo_tile.xml"),
+    xmldb:remove("/db/data/textgrid/data", "ahiqar_sample_2.xml"),
+    xmldb:remove("/db/data/textgrid/meta", "ahiqar_sample_2.xml"),
+    xmldb:remove("/db/data/textgrid/meta", "ahiqar_agg_wo_tile.xml")
 };
 
diff --git a/exist-app/tests/tapi-txt-tests.xqm b/exist-app/tests/tapi-txt-tests.xqm
index 05aecef..d9ad145 100644
--- a/exist-app/tests/tapi-txt-tests.xqm
+++ b/exist-app/tests/tapi-txt-tests.xqm
@@ -18,17 +18,17 @@ declare variable $ttt:kant-transcription := $ttt:kant-sample//tei:text[@type = "
 declare 
     %test:tearDown
 function ttt:_test-teardown() {
-    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample_teixml-transcription-first_narrative_section.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample_teixml-transcription-sayings.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample_teixml-transcription-second_narrative_section.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample_teixml-transcription-third_narrative_section.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "arabic--kant_sample_teixml-transcription-parables.txt"),
+    xmldb:remove("/db/data/textgrid/txt", "arabic--kant_sample_teixml-transcription-first_narrative_section.txt"),
+    xmldb:remove("/db/data/textgrid/txt", "arabic--kant_sample_teixml-transcription-sayings.txt"),
+    xmldb:remove("/db/data/textgrid/txt", "arabic--kant_sample_teixml-transcription-second_narrative_section.txt"),
+    xmldb:remove("/db/data/textgrid/txt", "arabic--kant_sample_teixml-transcription-third_narrative_section.txt"),
+    xmldb:remove("/db/data/textgrid/txt", "arabic--kant_sample_teixml-transcription-parables.txt"),
     
-    xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-first_narrative_section.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-sayings.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-second_narrative_section.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-third_narrative_section.txt"),
-    xmldb:remove("/db/apps/sade/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-parables.txt")
+    xmldb:remove("/db/data/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-first_narrative_section.txt"),
+    xmldb:remove("/db/data/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-sayings.txt"),
+    xmldb:remove("/db/data/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-second_narrative_section.txt"),
+    xmldb:remove("/db/data/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-third_narrative_section.txt"),
+    xmldb:remove("/db/data/textgrid/txt", "karshuni-Beispieldatei_zum_Testen-ahiqar_sample-transcription-parables.txt")
     
 };
 
@@ -216,10 +216,7 @@ declare
 function ttt:create-txt-collection-if-not-available() {
     let $create-collection := tapi-txt:create-txt-collection-if-not-available()
     return
-        if (xmldb:collection-available($commons:tg-collection || "/txt/")) then
-            true()
-        else
-            false()
+        xmldb:collection-available("/db/data/textgrid/txt/")
 };
 
 declare
@@ -266,7 +263,7 @@ as xs:string {
 };
 
 declare
-    %test:assertEquals("/db/apps/sade/textgrid/data/sample_teixml.xml")
+    %test:assertEquals("/db/data/textgrid/data/sample_teixml.xml")
 function ttt:get-base-uri()
 as xs:string {
     tapi-txt:get-base-uri($ttt:sample-transcription)
@@ -294,7 +291,7 @@ as xs:string {
 };
 
 declare
-    %test:args("/db/apps/sade/textgrid/data/sample_teixml.xml") %test:assertEquals("sample_teixml")
+    %test:args("/db/data/textgrid/data/sample_teixml.xml") %test:assertEquals("sample_teixml")
 function ttt:get-file-name($base-uri as xs:string)
 as xs:string {
     tapi-txt:get-file-name($base-uri)
@@ -527,7 +524,7 @@ declare
     %test:assertEquals(" Es ist also wenigstens eine der näheren Untersuchung noch benötigte und nicht auf den")
 function ttt:check-contents($chunk-type as xs:string) {
     let $serialize := tapi-txt:main()
-    let $filepath := "/db/apps/sade/textgrid/txt/arabic--kant_sample_teixml-transcription-" || $chunk-type || ".txt"
+    let $filepath := "/db/data/textgrid/txt/arabic--kant_sample_teixml-transcription-" || $chunk-type || ".txt"
     return
         util:binary-doc($filepath)
         => util:base64-decode()
-- 
GitLab


From dcf7d50a52aba74d9e31f2e4fc5796d509add4a0 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Thu, 14 Jan 2021 14:03:31 +0100
Subject: [PATCH 121/155] feat: add model for syriac and arabic-karshuni
 endpoint

---
 exist-app/data/sample_edition_arabic.xml      |   5 +
 exist-app/data/sample_edition_arabic_meta.xml |  22 +++
 exist-app/data/sample_edition_karshuni.xml    |   5 +
 .../data/sample_edition_karshuni_meta.xml     |  22 +++
 .../data/sample_lang_aggregation_arabic.xml   |   5 +
 .../sample_lang_aggregation_arabic_meta.xml   |  22 +++
 .../data/sample_lang_aggregation_karshuni.xml |   5 +
 .../sample_lang_aggregation_karshuni_meta.xml |  22 +++
 ...xml => sample_lang_aggregation_syriac.xml} |   2 +-
 ...> sample_lang_aggregation_syriac_meta.xml} |   4 +-
 exist-app/data/sample_main_edition.xml        |   2 +-
 exist-app/modules/draft-tapi-collection.xqm   | 133 ++++++++++++++++
 exist-app/modules/tapi.xqm                    |   7 +-
 exist-app/modules/testtrigger.xqm             |   4 +-
 exist-app/tests/annotation-tests.xqm          |  34 ++--
 .../tests/draft-tapi-collection-tests.xqm     | 145 ++++++++++++++++++
 exist-app/tests/tapi-collection-tests.xqm     |   8 +-
 exist-app/tests/tapi-tests.xqm                |  16 +-
 18 files changed, 426 insertions(+), 37 deletions(-)
 create mode 100644 exist-app/data/sample_edition_arabic.xml
 create mode 100644 exist-app/data/sample_edition_arabic_meta.xml
 create mode 100644 exist-app/data/sample_edition_karshuni.xml
 create mode 100644 exist-app/data/sample_edition_karshuni_meta.xml
 create mode 100644 exist-app/data/sample_lang_aggregation_arabic.xml
 create mode 100644 exist-app/data/sample_lang_aggregation_arabic_meta.xml
 create mode 100644 exist-app/data/sample_lang_aggregation_karshuni.xml
 create mode 100644 exist-app/data/sample_lang_aggregation_karshuni_meta.xml
 rename exist-app/data/{sample_lang_aggregation.xml => sample_lang_aggregation_syriac.xml} (81%)
 rename exist-app/data/{sample_lang_aggregation_meta.xml => sample_lang_aggregation_syriac_meta.xml} (90%)
 create mode 100644 exist-app/modules/draft-tapi-collection.xqm
 create mode 100644 exist-app/tests/draft-tapi-collection-tests.xqm

diff --git a/exist-app/data/sample_edition_arabic.xml b/exist-app/data/sample_edition_arabic.xml
new file mode 100644
index 0000000..9eedbe1
--- /dev/null
+++ b/exist-app/data/sample_edition_arabic.xml
@@ -0,0 +1,5 @@
+<rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_edition_arabic.0">
+        <ore:aggregates rdf:resource="textgrid:sample_teixml"/>
+    </rdf:Description>
+</rdf:RDF>
\ No newline at end of file
diff --git a/exist-app/data/sample_edition_arabic_meta.xml b/exist-app/data/sample_edition_arabic_meta.xml
new file mode 100644
index 0000000..be70bf0
--- /dev/null
+++ b/exist-app/data/sample_edition_arabic_meta.xml
@@ -0,0 +1,22 @@
+<MetadataContainerType xmlns="http://textgrid.info/namespaces/metadata/core/2010" xmlns:ns2="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <object>
+        <generic>
+            <provided>
+                <title>Beispieldatei zum Testen, Arabisch</title>
+                <format>text/tg.edition+tg.aggregation+xml</format>
+                <notes/>
+            </provided>
+            <generated>
+              <textgridUri extRef="">textgrid:sample_edition_arabic.0</textgridUri>
+            </generated>
+        </generic>
+        <edition>
+            <isEditionOf/>
+            <agent role="actor" id=""/>
+        </edition>
+        <custom>
+            <cns:templateEditor xmlns:tgs="http://www.textgrid.info/namespaces/middleware/tgsearch" xmlns:tg="http://textgrid.info/relation-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cns="http://textgrid.info/custom-namespace/2009-01-01" xmlns:ns4="http://textgrid.info/namespaces/middleware/tgcrud/services/TGCrudService" xmlns:ns3="http://textgrid.info/namespaces/metadata/core/2010"/>
+        </custom>
+        <relations/>
+    </object>
+</MetadataContainerType>
diff --git a/exist-app/data/sample_edition_karshuni.xml b/exist-app/data/sample_edition_karshuni.xml
new file mode 100644
index 0000000..1aedb68
--- /dev/null
+++ b/exist-app/data/sample_edition_karshuni.xml
@@ -0,0 +1,5 @@
+<rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_edition_karshuni.0">
+        <ore:aggregates rdf:resource="textgrid:sample_teixml"/>
+    </rdf:Description>
+</rdf:RDF>
\ No newline at end of file
diff --git a/exist-app/data/sample_edition_karshuni_meta.xml b/exist-app/data/sample_edition_karshuni_meta.xml
new file mode 100644
index 0000000..d2281ec
--- /dev/null
+++ b/exist-app/data/sample_edition_karshuni_meta.xml
@@ -0,0 +1,22 @@
+<MetadataContainerType xmlns="http://textgrid.info/namespaces/metadata/core/2010" xmlns:ns2="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <object>
+        <generic>
+            <provided>
+                <title>Beispieldatei zum Testen, Karshuni</title>
+                <format>text/tg.edition+tg.aggregation+xml</format>
+                <notes/>
+            </provided>
+            <generated>
+              <textgridUri extRef="">textgrid:sample_edition_karshuni.0</textgridUri>
+            </generated>
+        </generic>
+        <edition>
+            <isEditionOf/>
+            <agent role="actor" id=""/>
+        </edition>
+        <custom>
+            <cns:templateEditor xmlns:tgs="http://www.textgrid.info/namespaces/middleware/tgsearch" xmlns:tg="http://textgrid.info/relation-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cns="http://textgrid.info/custom-namespace/2009-01-01" xmlns:ns4="http://textgrid.info/namespaces/middleware/tgcrud/services/TGCrudService" xmlns:ns3="http://textgrid.info/namespaces/metadata/core/2010"/>
+        </custom>
+        <relations/>
+    </object>
+</MetadataContainerType>
diff --git a/exist-app/data/sample_lang_aggregation_arabic.xml b/exist-app/data/sample_lang_aggregation_arabic.xml
new file mode 100644
index 0000000..0235492
--- /dev/null
+++ b/exist-app/data/sample_lang_aggregation_arabic.xml
@@ -0,0 +1,5 @@
+<rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_arabic.0">
+        <ore:aggregates rdf:resource="textgrid:sample_edition_arabic"/>
+    </rdf:Description>
+</rdf:RDF>
\ No newline at end of file
diff --git a/exist-app/data/sample_lang_aggregation_arabic_meta.xml b/exist-app/data/sample_lang_aggregation_arabic_meta.xml
new file mode 100644
index 0000000..e0ca65a
--- /dev/null
+++ b/exist-app/data/sample_lang_aggregation_arabic_meta.xml
@@ -0,0 +1,22 @@
+<MetadataContainerType xmlns="http://textgrid.info/namespaces/metadata/core/2010" xmlns:ns2="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <object>
+        <generic>
+            <provided>
+                <title>Beispieldatei für Sprachenaggregation Arabisch</title>
+                <format>text/tg.aggregation+xml</format>
+                <notes/>
+            </provided>
+            <generated>
+              <textgridUri extRef="">textgrid:sample_lang_aggregation_arabic.0</textgridUri>
+            </generated>
+        </generic>
+        <edition>
+            <isEditionOf/>
+            <agent role="actor" id=""/>
+        </edition>
+        <custom>
+            <cns:templateEditor xmlns:tgs="http://www.textgrid.info/namespaces/middleware/tgsearch" xmlns:tg="http://textgrid.info/relation-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cns="http://textgrid.info/custom-namespace/2009-01-01" xmlns:ns4="http://textgrid.info/namespaces/middleware/tgcrud/services/TGCrudService" xmlns:ns3="http://textgrid.info/namespaces/metadata/core/2010"/>
+        </custom>
+        <relations/>
+    </object>
+</MetadataContainerType>
diff --git a/exist-app/data/sample_lang_aggregation_karshuni.xml b/exist-app/data/sample_lang_aggregation_karshuni.xml
new file mode 100644
index 0000000..e0d8c36
--- /dev/null
+++ b/exist-app/data/sample_lang_aggregation_karshuni.xml
@@ -0,0 +1,5 @@
+<rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_arabic.0">
+        <ore:aggregates rdf:resource="textgrid:sample_edition_karshuni"/>
+    </rdf:Description>
+</rdf:RDF>
\ No newline at end of file
diff --git a/exist-app/data/sample_lang_aggregation_karshuni_meta.xml b/exist-app/data/sample_lang_aggregation_karshuni_meta.xml
new file mode 100644
index 0000000..d8b0b4d
--- /dev/null
+++ b/exist-app/data/sample_lang_aggregation_karshuni_meta.xml
@@ -0,0 +1,22 @@
+<MetadataContainerType xmlns="http://textgrid.info/namespaces/metadata/core/2010" xmlns:ns2="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <object>
+        <generic>
+            <provided>
+                <title>Beispieldatei für Sprachenaggregation Karshuni</title>
+                <format>text/tg.aggregation+xml</format>
+                <notes/>
+            </provided>
+            <generated>
+              <textgridUri extRef="">textgrid:sample_lang_aggregation_karshuni.0</textgridUri>
+            </generated>
+        </generic>
+        <edition>
+            <isEditionOf/>
+            <agent role="actor" id=""/>
+        </edition>
+        <custom>
+            <cns:templateEditor xmlns:tgs="http://www.textgrid.info/namespaces/middleware/tgsearch" xmlns:tg="http://textgrid.info/relation-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cns="http://textgrid.info/custom-namespace/2009-01-01" xmlns:ns4="http://textgrid.info/namespaces/middleware/tgcrud/services/TGCrudService" xmlns:ns3="http://textgrid.info/namespaces/metadata/core/2010"/>
+        </custom>
+        <relations/>
+    </object>
+</MetadataContainerType>
diff --git a/exist-app/data/sample_lang_aggregation.xml b/exist-app/data/sample_lang_aggregation_syriac.xml
similarity index 81%
rename from exist-app/data/sample_lang_aggregation.xml
rename to exist-app/data/sample_lang_aggregation_syriac.xml
index de973ee..3dd5259 100644
--- a/exist-app/data/sample_lang_aggregation.xml
+++ b/exist-app/data/sample_lang_aggregation_syriac.xml
@@ -1,5 +1,5 @@
 <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-    <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation.0">
+    <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_syriac.0">
         <ore:aggregates rdf:resource="textgrid:sample_edition"/>
     </rdf:Description>
 </rdf:RDF>
\ No newline at end of file
diff --git a/exist-app/data/sample_lang_aggregation_meta.xml b/exist-app/data/sample_lang_aggregation_syriac_meta.xml
similarity index 90%
rename from exist-app/data/sample_lang_aggregation_meta.xml
rename to exist-app/data/sample_lang_aggregation_syriac_meta.xml
index 1752f2b..50542d0 100644
--- a/exist-app/data/sample_lang_aggregation_meta.xml
+++ b/exist-app/data/sample_lang_aggregation_syriac_meta.xml
@@ -2,12 +2,12 @@
     <object>
         <generic>
             <provided>
-                <title>Beispieldatei für Sprachenaggregation</title>
+                <title>Beispieldatei für Sprachenaggregation Syrisch</title>
                 <format>text/tg.aggregation+xml</format>
                 <notes/>
             </provided>
             <generated>
-              <textgridUri extRef="">textgrid:sample_lang_aggregation.0</textgridUri>
+              <textgridUri extRef="">textgrid:sample_lang_aggregation_syriac.0</textgridUri>
             </generated>
         </generic>
         <edition>
diff --git a/exist-app/data/sample_main_edition.xml b/exist-app/data/sample_main_edition.xml
index c5fad93..fde30f7 100644
--- a/exist-app/data/sample_main_edition.xml
+++ b/exist-app/data/sample_main_edition.xml
@@ -1,5 +1,5 @@
 <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
     <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_main_edition.0">
-        <ore:aggregates rdf:resource="textgrid:sample_lang_aggregation"/>
+        <ore:aggregates rdf:resource="textgrid:sample_lang_aggregation_syriac"/>
     </rdf:Description>
 </rdf:RDF>
diff --git a/exist-app/modules/draft-tapi-collection.xqm b/exist-app/modules/draft-tapi-collection.xqm
new file mode 100644
index 0000000..4a05722
--- /dev/null
+++ b/exist-app/modules/draft-tapi-collection.xqm
@@ -0,0 +1,133 @@
+xquery version "3.1";
+
+module namespace d="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft";
+
+declare namespace ore="http://www.openarchives.org/ore/terms/";
+declare namespace rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
+
+import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
+
+declare variable $d:uris :=
+    map {
+        "syriac": if (doc-available($commons:agg || "3r84g.xml")) then "3r84g" else "sample_lang_aggregation_syriac",
+        "arabic-karshuni": (
+            if (doc-available($commons:agg || "3r9ps.xml")) then "3r9ps" else "sample_lang_aggregation_arabic",
+            if (doc-available($commons:agg || "3r84h.xml")) then "3r84h" else "sample_lang_aggregation_karshuni")
+    };
+    
+declare function d:get-uris($collection-type as xs:string)
+as xs:string+ {
+    map:get($d:uris, $collection-type)
+};
+
+
+declare function d:get-json($collection-type as xs:string,
+    $server as xs:string)
+as item()+ {
+    let $collection-string := d:get-collection-string($collection-type)
+    let $sequence := d:make-sequence($collection-type, $server)
+    let $annotationCollection-uri := d:make-annotationCollection-uri($server, $collection-type)
+    
+    return
+        <object>
+            <textapi>{$commons:version}</textapi>
+            <title>
+                <title>The Story and Proverbs of Ahikar the Wise</title>
+                <type>main</type>
+            </title>
+            <!-- this empty title element is necessary to force JSON to
+            generate an array instead of a simple object. -->
+            <title/>
+            <collector>
+                <role>collector</role>
+                <name>Prof. Dr. theol. Kratz, Reinhard Gregor</name>
+                <idref>
+                    <base>http://d-nb.info/gnd/</base>
+                    <id>115412700</id>
+                    <type>GND</type>
+                </idref>
+            </collector>
+            <description>{$collection-string} collection for the Ahiqar project. Funded by DFG, 2019–2020. University of Göttingen</description>
+            <annotationCollection>{$annotationCollection-uri}</annotationCollection>
+            {$sequence}
+        </object>
+};
+
+declare function d:get-collection-string($collection-type as xs:string)
+as xs:string {
+    switch ($collection-type)
+        case "syriac" return "Syriac"
+        case "arabic-karshuni" return "Arabic/Karshuni"
+        default return error("D001", "Unknown collection type " || $collection-type)
+};
+
+declare function d:make-sequence($collection-type as xs:string,
+    $server as xs:string)
+as element(sequence)+ {
+    let $uris := d:get-uris($collection-type)
+    let $aggregations := d:get-aggregations($uris)
+    let $allowed-manifest-uris := d:get-allowed-manifest-uris($aggregations)
+    for $manifest-uri in $allowed-manifest-uris return
+        let $manifest-metadata :=  commons:get-metadata-file($manifest-uri)
+        let $id := d:make-id($server, $collection-type, $manifest-uri)
+        let $type := d:make-format-type($manifest-metadata)
+        return
+            <sequence>
+                <id>{$id}</id>
+                <type>{$type}</type>
+            </sequence>
+};
+
+declare function d:get-aggregations($uris as xs:string+)
+as document-node()+ {
+    for $uri in $uris return
+        doc($commons:agg || $uri || ".xml")
+};
+
+declare function d:get-allowed-manifest-uris($aggregations as node()+)
+as xs:string+ {
+    let $not-allowed :=
+        (
+            "textgrid:3vp38"
+        )
+    let $allowed := 
+        for $aggregation-file in $aggregations return
+            for $aggregate in $aggregation-file//ore:aggregates return
+                $aggregate[@rdf:resource != $not-allowed]/@rdf:resource
+    return
+        for $uri in $allowed return
+            d:remove-textgrid-prefix($uri)
+};
+
+declare function d:remove-textgrid-prefix($uri as xs:string)
+as xs:string {
+    replace($uri, "textgrid:", "")
+};
+
+declare function d:make-id($server as xs:string,
+    $collection-type as xs:string,
+    $manifest-uri as xs:string)
+as xs:string {
+    $server || "/api/textapi/ahikar/" || $collection-type || "/" || $manifest-uri || "/manifest.json"
+};
+
+declare function d:get-format-type($metadata as document-node())
+as xs:string {
+    $metadata//tgmd:format[1]/string()
+    => d:make-format-type()
+};
+
+declare function d:make-format-type($tgmd-format as xs:string)
+as xs:string {
+    switch ($tgmd-format)
+        case "text/tg.aggregation+xml" return "collection"
+        case "text/tg.edition+tg.aggregation+xml" return "manifest"
+        default return "manifest"
+};
+
+declare function d:make-annotationCollection-uri($server as xs:string,
+    $collection-type as xs:string)
+as xs:string {
+    $server || "/api/annotations/ahikar/" || $collection-type || "/annotationCollection.json"
+};
diff --git a/exist-app/modules/tapi.xqm b/exist-app/modules/tapi.xqm
index f1227ce..f3e7351 100644
--- a/exist-app/modules/tapi.xqm
+++ b/exist-app/modules/tapi.xqm
@@ -19,6 +19,7 @@ declare namespace test="http://exist-db.org/xquery/xqsuite";
 declare namespace xhtml="http://www.w3.org/1999/xhtml";
 
 import module namespace tapi-coll="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection" at "tapi-collection.xqm";
+import module namespace d="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft" at "draft-tapi-collection.xqm";
 import module namespace tapi-item="http://ahikar.sub.uni-goettingen.de/ns/tapi/item" at "tapi-item.xqm";
 import module namespace tapi-mani="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest" at "tapi-manifest.xqm";
 import module namespace tapi-txt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt" at "tapi-txt.xqm";
@@ -93,12 +94,12 @@ declare function tapi:remove-whitespaces($doc as document-node()) as document-no
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/textapi/ahikar/{$collection-uri}/collection.json")
+    %rest:path("/textapi/ahikar/{$collection-type}/collection.json")
     %output:method("json")
-function tapi:endpoint-collection($collection-uri as xs:string)
+function tapi:endpoint-collection($collection-type as xs:string)
 as item()+ {
     $commons:responseHeader200,
-    tapi-coll:get-json($collection-uri, $tapi:server)
+    d:get-json($collection-type, $tapi:server)
 };
 
 
diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 8bf1095..1cd644c 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -27,6 +27,7 @@ import module namespace ttnt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/no
 import module namespace ttt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" at "../tests/tapi-txt-tests.xqm";
 import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "../tests/tei2html-tests.xqm";
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "../tests/tei2html-textprocessing-tests.xqm";
+import module namespace t="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft/tests" at "../tests/draft-tapi-collection-tests.xqm";
 
 (:~
  : Triggers the tests for the Ahikar backend. Called by the CI.
@@ -64,10 +65,11 @@ declare function testtrigger:execute-tests()
 as element()+ {
     let $test-results :=
     (
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests")),
+        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index d468eee..18f09df 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -48,7 +48,7 @@ as xs:boolean {
 
 declare
     %test:args("sample_teixml") %test:assertEquals("sample_edition")
-    %test:args("sample_edition") %test:assertEquals("sample_lang_aggregation")
+    %test:args("sample_edition") %test:assertEquals("sample_lang_aggregation_syriac")
     %test:args("sample_main_edition") %test:assertEmpty
 function at:get-parent-aggregation($uri as xs:string)
 as xs:string? {
@@ -98,7 +98,7 @@ as map() {
 };
 
 declare
-    %test:args("sample_lang_aggregation", "sample_edition", "82a", "http://localhost:8080")
+    %test:args("sample_lang_aggregation_syriac", "sample_edition", "82a", "http://localhost:8080")
     %test:assertXPath("map:get($result, 'annotationCollection') => map:get('id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationCollection/sample_edition/82a'")
     %test:assertXPath("map:get($result, 'annotationCollection') => map:get('type') = 'AnnotationCollection'")
 function at:make-annotationCollection-for-manifest($collection as xs:string,
@@ -119,7 +119,7 @@ as element(tei:TEI) {
 
 declare
     %test:args("sample_main_edition") %test:assertEquals("66")
-    %test:args("sample_lang_aggregation") %test:assertEquals("66")
+    %test:args("sample_lang_aggregation_syriac") %test:assertEquals("66")
 function at:get-total-no-of-annotations($uri as xs:string) {
     anno:get-total-no-of-annotations($uri)
 };
@@ -130,7 +130,7 @@ function at:get-all-xml-uris-for-submap()
 as xs:string* {
     let $map :=
          map {
-            "sample_lang_aggregation":
+            "sample_lang_aggregation_syriac":
             map {
                 "sample_edition": "sample_teixml",
                 "faux_edition": "faux_teixml"
@@ -147,7 +147,7 @@ function at:find-in-map($key as xs:string)
 as item()? {
     let $map :=
         map {
-                "sample_lang_aggregation":
+                "sample_lang_aggregation_syriac":
                 map {
                     "sample_edition": "sample_teixml",
                     "faux_edition": "faux_teixml"
@@ -169,7 +169,7 @@ declare
 function at:get-prev-or-next-annotationPage-url($document as xs:string?,
     $page as xs:string?)
 as xs:string? {
-    let $collection := "sample_lang_aggregation"
+    let $collection := "sample_lang_aggregation_syriac"
     let $server := "http://localhost:8080"
     return
         anno:get-prev-or-next-annotationPage-url($collection, $document, $page, $server)
@@ -177,11 +177,11 @@ as xs:string? {
 
 declare
     %test:args("sample_edition") %test:assertTrue
-    %test:args("sample_lang_aggregation") %test:assertFalse
+    %test:args("sample_lang_aggregation_syriac") %test:assertFalse
 function at:is-resource-edition($uri as xs:string) {
     let $map := 
         map {
-                "sample_lang_aggregation":
+                "sample_lang_aggregation_syriac":
                 map {
                     "sample_edition": "sample_teixml",
                     "faux_edition": "faux_teixml"
@@ -226,7 +226,7 @@ as map() {
 };
 
 declare
-    %test:args("sample_lang_aggregation", "sample_edition", "http://localhost:8080")
+    %test:args("sample_lang_aggregation_syriac", "sample_edition", "http://localhost:8080")
     %test:assertXPath("map:get($result, 'annotationPage') => map:get('id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationPage/sample_lang_aggregation/sample_edition'")
     %test:pending
 function at:make-annotationPage($collection as xs:string, 
@@ -290,7 +290,7 @@ as xs:integer {
 };
 
 declare
-    %test:args("sample_lang_aggregation") %test:assertEquals("0")
+    %test:args("sample_lang_aggregation_syriac") %test:assertEquals("0")
     %test:args("sample_edition") %test:assertEquals("0")
     %test:args("sample_teixml") %test:assertEquals("0")
 function at:determine-start-index($uri as xs:string)
@@ -313,8 +313,8 @@ as xs:string? {
 };
 
 declare
-    %test:args("sample_lang_aggregation", "sample_edition", "next") %test:assertEmpty
-    %test:args("sample_lang_aggregation", "sample_edition", "prev") %test:assertEmpty
+    %test:args("sample_lang_aggregation_syriac", "sample_edition", "next") %test:assertEmpty
+    %test:args("sample_lang_aggregation_syriac", "sample_edition", "prev") %test:assertEmpty
 function anno:get-prev-or-next-annotationPage-ID($collection as xs:string,
     $document as xs:string,
     $type as xs:string)
@@ -323,7 +323,7 @@ as xs:string? {
 };
 
 declare
-    %test:args("sample_lang_aggregation", "sample_edition", "84a", "http://localhost:8080")
+    %test:args("sample_lang_aggregation_syriac", "sample_edition", "84a", "http://localhost:8080")
     %test:assertEquals("http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationPage/sample_lang_aggregation/sample_edition-84a")
 function at:make-annotationPage-for-manifest-id($collection as xs:string,
     $document as xs:string,
@@ -338,7 +338,7 @@ as xs:string {
 
 
 declare
-    %test:args("sample_lang_aggregation", "sample_edition", "84a", "http://localhost:8080")
+    %test:args("sample_lang_aggregation_syriac", "sample_edition", "84a", "http://localhost:8080")
     %test:assertEquals("http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationCollection/sample_edition")
 function at:make-annotationPage-for-manifest-part-of($collection as xs:string,
     $document as xs:string,
@@ -353,7 +353,7 @@ as xs:string {
 };
 
 declare
-    %test:args("sample_lang_aggregation", "http://localhost:8080")
+    %test:args("sample_lang_aggregation_syriac", "http://localhost:8080")
     %test:assertEquals("http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationPage.json")
 function at:get-information-for-collection-object($collectionURI as xs:string,
     $server as xs:string)
@@ -365,9 +365,9 @@ as xs:string {
 };
 
 declare
-    %test:args("sample_lang_aggregation", "sample_edition", "http://localhost:8080")
+    %test:args("sample_lang_aggregation_syriac", "sample_edition", "http://localhost:8080")
     %test:assertXPath("$result instance of map()")
-    %test:args("sample_lang_aggregation", "", "http://localhost:8080")
+    %test:args("sample_lang_aggregation_syriac", "", "http://localhost:8080")
     %test:assertXPath("$result instance of map()")
 function at:make-annotationCollection($collection as xs:string,
     $document as xs:string?,
diff --git a/exist-app/tests/draft-tapi-collection-tests.xqm b/exist-app/tests/draft-tapi-collection-tests.xqm
new file mode 100644
index 0000000..0857496
--- /dev/null
+++ b/exist-app/tests/draft-tapi-collection-tests.xqm
@@ -0,0 +1,145 @@
+xquery version "3.1";
+
+module namespace t="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft/tests";
+
+declare namespace http = "http://expath.org/ns/http-client";
+declare namespace tei="http://www.tei-c.org/ns/1.0";
+
+import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
+import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
+import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
+import module namespace d="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft" at "../modules/draft-tapi-collection.xqm";
+
+declare
+    %test:args("syriac") %test:assertEquals("sample_lang_aggregation_syriac")
+    %test:args("arabic-karshuni") %test:assertXPath("count($result) = 2 and $result = 'sample_lang_aggregation_arabic' and $result = 'sample_lang_aggregation_karshuni'")
+function t:get-uris($collection-type as xs:string)
+as xs:string+ {
+    d:get-uris($collection-type)
+};
+
+declare
+    %test:args("syriac") %test:assertEquals("Syriac")
+    %test:args("arabic-karshuni") %test:assertEquals("Arabic/Karshuni")
+    %test:args("misc") %test:assertError("D001")
+function t:get-collection-string($collection-type as xs:string)
+as xs:string {
+    d:get-collection-string($collection-type)
+};
+
+declare
+    %test:args("syriac") %test:assertXPath("$result//description = 'Syriac collection for the Ahiqar project. Funded by DFG, 2019–2020. University of Göttingen'")
+    %test:args("arabic-karshuni") %test:assertXPath("$result//description = 'Arabic/Karshuni collection for the Ahiqar project. Funded by DFG, 2019–2020. University of Göttingen'")
+function t:get-json($collection-type as xs:string) {
+    d:get-json($collection-type, $tc:server)
+};
+
+
+declare
+    %test:args("syriac") %test:assertXPath("$result//type[. = 'manifest']")
+    %test:args("syriac") %test:assertXPath("$result//id[contains(., 'textapi/ahikar/syriac/sample_edition/manifest.json')]")
+    %test:args("arabic-karshuni") %test:assertXPath("$result//type[. = 'manifest']")
+    %test:args("arabic-karshuni") %test:assertXPath("$result//id[contains(., 'textapi/ahikar/arabic-karshuni/sample_edition_arabic/manifest.json')]")
+    %test:args("arabic-karshuni") %test:assertXPath("$result//id[contains(., 'textapi/ahikar/arabic-karshuni/sample_edition_karshuni/manifest.json')]")
+function t:make-sequence($collection-type as xs:string) {
+    d:make-sequence($collection-type, $tc:server)
+};
+
+declare
+    %test:args("sample_lang_aggregation_syriac") %test:assertExists
+function t:get-aggregations_syriac($uris as xs:string+)
+as document-node()+ {
+    d:get-aggregations($uris)
+};
+
+declare
+    %test:assertExists
+function t:get-aggregations_arabic_karshuni()
+as document-node()+ {
+    let $uris :=
+        (
+           "sample_lang_aggregation_arabic",
+           "sample_lang_aggregation_karshuni"
+        )
+    return
+        d:get-aggregations($uris)
+};
+
+declare
+    %test:args("textgrid:1234") %test:assertEquals("1234")
+    %test:args("1234") %test:assertEquals("1234")
+function t:remove-textgrid-prefix($uri as xs:string) {
+    d:remove-textgrid-prefix($uri)
+};
+
+declare
+    %test:assertTrue
+function t:get-allowed-manifest-uris-mock-up-input-included() {
+    let $collection-metadata :=
+    (
+        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_arabic.0">
+                <ore:aggregates rdf:resource="textgrid:3rbm9"/>
+                <ore:aggregates rdf:resource="textgrid:3rbmc"/>
+                <ore:aggregates rdf:resource="textgrid:3rx14"/>
+                <ore:aggregates rdf:resource="textgrid:3vp38"/>
+            </rdf:Description>
+        </rdf:RDF>,
+        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_karshuni.0">
+                <ore:aggregates rdf:resource="textgrid:3rbm9"/>
+                <ore:aggregates rdf:resource="textgrid:3rbmc"/>
+                <ore:aggregates rdf:resource="textgrid:3rx14"/>
+                <ore:aggregates rdf:resource="textgrid:3vp38"/>
+            </rdf:Description>
+        </rdf:RDF>
+    )
+    return
+        d:get-allowed-manifest-uris($collection-metadata) = "3rx14"
+};
+
+declare
+    %test:assertFalse
+function t:get-allowed-manifest-uris-mock-up-input-excluded() {
+    let $collection-metadata :=
+        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_syriac.0">
+                <ore:aggregates rdf:resource="textgrid:3rbm9"/>
+                <ore:aggregates rdf:resource="textgrid:3rbmc"/>
+                <ore:aggregates rdf:resource="textgrid:3rx14"/>
+                <ore:aggregates rdf:resource="textgrid:3vp38"/>
+            </rdf:Description>
+        </rdf:RDF>
+    return
+        d:get-allowed-manifest-uris($collection-metadata) = "3vp38"
+};
+
+declare
+    %test:args("syriac", "sample_edition") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/syriac/sample_edition/manifest.json")
+function t:make-id($colletion-type as xs:string, $manifest-uri as xs:string)
+as xs:string {
+    d:make-id($tc:server, $colletion-type, $manifest-uri)
+};
+
+declare
+    %test:args("text/tg.aggregation+xml") %test:assertEquals("collection")
+    %test:args("text/tg.edition+tg.aggregation+xml") %test:assertEquals("manifest")
+    %test:args("test") %test:assertEquals("manifest")
+function t:make-format-type($tgmd-format as xs:string) {
+    d:make-format-type($tgmd-format)
+};
+
+declare
+    %test:assertEquals("manifest")
+function t:get-format-type() {
+    let $metadata := commons:get-metadata-file("sample_edition")
+    return
+        d:get-format-type($metadata)
+};
+
+declare
+    %test:args("arabic-karshuni") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/arabic-karshuni/annotationCollection.json")
+function t:make-annotationCollection-uri($collection-uri as xs:string)
+as xs:string {
+    d:make-annotationCollection-uri($tc:server, $collection-uri)
+};
diff --git a/exist-app/tests/tapi-collection-tests.xqm b/exist-app/tests/tapi-collection-tests.xqm
index 696a80e..0d366e4 100644
--- a/exist-app/tests/tapi-collection-tests.xqm
+++ b/exist-app/tests/tapi-collection-tests.xqm
@@ -151,7 +151,7 @@ as xs:string {
 declare
     %test:assertEquals("sample_edition")
 function tct:get-allowed-manifest-uris-sample-input() {
-    let $collection-metadata := tapi-coll:get-aggregation("sample_lang_aggregation")
+    let $collection-metadata := tapi-coll:get-aggregation("sample_lang_aggregation_syriac")
     return
         tapi-coll:get-allowed-manifest-uris($collection-metadata)
 };
@@ -182,7 +182,7 @@ function tct:get-format-type() {
 
 declare
     %test:args("sample_main_edition") %test:assertXPath("$result//type[. = 'manifest']")
-    %test:args("sample_lang_aggregation") %test:assertXPath("$result//id[matches(., 'sample_edition/manifest.json')]")
+    %test:args("sample_lang_aggregation_syriac") %test:assertXPath("$result//id[matches(., 'sample_edition/manifest.json')]")
     %test:args("testapi-collection") %test:assertXPath("$result//id[matches(., 'test-aggregation-1/manifest.json')]")
     %test:args("testapi-collection") %test:assertXPath("$result//id[matches(., 'test-aggregation-2/manifest.json')]")
 function tct:make-sequence($collection-uri as xs:string) {
@@ -198,8 +198,8 @@ as xs:string {
 
 
 declare
-    %test:args("sample_lang_aggregation") %test:assertXPath("$result//title = 'The Story and Proverbs of Ahikar the Wise'")
-    %test:args("sample_lang_aggregation") %test:assertXPath("$result//*/string() = 'http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/sample_lang_aggregation/sample_edition/manifest.json' ")
+    %test:args("sample_lang_aggregation_syriac") %test:assertXPath("$result//title = 'The Story and Proverbs of Ahikar the Wise'")
+    %test:args("sample_lang_aggregation_syriac") %test:assertXPath("$result//*/string() = 'http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/sample_lang_aggregation_syriac/sample_edition/manifest.json' ")
 function tct:get-json($collection-uri as xs:string) {
     tapi-coll:get-json($collection-uri, $tc:server)
 };
diff --git a/exist-app/tests/tapi-tests.xqm b/exist-app/tests/tapi-tests.xqm
index fa2036f..142f2f8 100644
--- a/exist-app/tests/tapi-tests.xqm
+++ b/exist-app/tests/tapi-tests.xqm
@@ -123,7 +123,7 @@ declare
      : the underlying function. :)
     %test:assertXPath("matches($result, '[\w]')")
 function tt:content-txt() as xs:string {
-    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/sample_teixml.txt"
+    let $url := $tc:server || "/textapi/ahikar/syriac/sample_teixml.txt"
     let $req := <http:request href="{$url}" method="get">
                         <http:header name="Connection" value="close"/>
                    </http:request>
@@ -140,7 +140,7 @@ function tt:is-txt-api-available() {
 };
 
 declare function tt:txt() {
-    let $url := $tc:server || "textapi/ahiqar/sample_main_edition/sample_teixml.txt"
+    let $url := $tc:server || "textapi/ahiqar/syriac/sample_teixml.txt"
     let $req := tc:make-request($url)
     return http:send-request($req)[2] => util:base64-decode()
 };
@@ -157,7 +157,7 @@ function tt:remove-whitespaces() as document-node() {
 declare
     %test:assertTrue
 function tt:is-collection-endpoint-http200() {
-    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/collection.json"
+    let $url := $tc:server || "/textapi/ahikar/arabic-karshuni/collection.json"
     return
         tc:is-endpoint-http200($url)
 };
@@ -173,7 +173,7 @@ declare
     %test:assertXPath("map:contains($result, 'sequence')")
 function tt:endpoint-collection()
 as item() {
-    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/collection.json"
+    let $url := $tc:server || "/textapi/ahikar/arabic-karshuni/collection.json"
     let $req := <http:request href="{$url}" method="get">
                         <http:header name="Connection" value="close"/>
                    </http:request>
@@ -183,7 +183,7 @@ as item() {
 declare
     %test:assertTrue
 function tt:is-manifest-endpoint-http200() {
-    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/sample_edition/manifest.json"
+    let $url := $tc:server || "/textapi/ahikar/arabic-karshuni/sample_edition_arabic/manifest.json"
     return
         tc:is-endpoint-http200($url)
 };
@@ -204,7 +204,7 @@ declare
     %test:assertXPath("map:contains($result, 'sequence')")
 function tt:endpoint-manifest()
 as item() {
-    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/sample_edition/manifest.json"
+    let $url := $tc:server || "/textapi/ahikar/syriac/sample_edition/manifest.json"
     let $req := tc:make-request($url)
     return
         http:send-request($req)[2]
@@ -215,7 +215,7 @@ as item() {
 declare
     %test:assertTrue
 function tt:is-item-endpoint-http200() {
-    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/sample_edition-82a/latest/item.json"
+    let $url := $tc:server || "/textapi/ahikar/syriac/sample_edition-82a/latest/item.json"
     return
         tc:is-endpoint-http200($url)
 };
@@ -234,7 +234,7 @@ declare
     %test:assertXPath("map:contains($result, 'langAlt')")
     %test:assertXPath("map:contains($result, 'image')")
 function tt:endpoint-item() as item() {
-    let $url := $tc:server || "/textapi/ahikar/sample_main_edition/sample_edition-82a/latest/item.json"
+    let $url := $tc:server || "/textapi/ahikar/syriac/sample_edition-82a/latest/item.json"
     let $req := tc:make-request($url)
     return http:send-request($req)[2]
         => util:base64-decode()
-- 
GitLab


From 9a337bcef5cc4e2943977b9d9cf069501bc6e3fc Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 09:10:14 +0100
Subject: [PATCH 122/155] fix: complete test data setup

---
 exist-app/data/sample_edition_arabic.xml   |   2 +-
 exist-app/data/sample_edition_karshuni.xml |   2 +-
 exist-app/data/sample_teixml_2.xml         | 821 +++++++++++++++++++++
 exist-app/data/sample_teixml_2_meta.xml    |  19 +
 exist-app/data/sample_teixml_3.xml         | 821 +++++++++++++++++++++
 exist-app/data/sample_teixml_3_meta.xml    |  19 +
 6 files changed, 1682 insertions(+), 2 deletions(-)
 create mode 100644 exist-app/data/sample_teixml_2.xml
 create mode 100644 exist-app/data/sample_teixml_2_meta.xml
 create mode 100644 exist-app/data/sample_teixml_3.xml
 create mode 100644 exist-app/data/sample_teixml_3_meta.xml

diff --git a/exist-app/data/sample_edition_arabic.xml b/exist-app/data/sample_edition_arabic.xml
index 9eedbe1..e56ab68 100644
--- a/exist-app/data/sample_edition_arabic.xml
+++ b/exist-app/data/sample_edition_arabic.xml
@@ -1,5 +1,5 @@
 <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
     <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_edition_arabic.0">
-        <ore:aggregates rdf:resource="textgrid:sample_teixml"/>
+        <ore:aggregates rdf:resource="textgrid:sample_teixml_2"/>
     </rdf:Description>
 </rdf:RDF>
\ No newline at end of file
diff --git a/exist-app/data/sample_edition_karshuni.xml b/exist-app/data/sample_edition_karshuni.xml
index 1aedb68..87c749b 100644
--- a/exist-app/data/sample_edition_karshuni.xml
+++ b/exist-app/data/sample_edition_karshuni.xml
@@ -1,5 +1,5 @@
 <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
     <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_edition_karshuni.0">
-        <ore:aggregates rdf:resource="textgrid:sample_teixml"/>
+        <ore:aggregates rdf:resource="textgrid:sample_teixml_3"/>
     </rdf:Description>
 </rdf:RDF>
\ No newline at end of file
diff --git a/exist-app/data/sample_teixml_2.xml b/exist-app/data/sample_teixml_2.xml
new file mode 100644
index 0000000..983463a
--- /dev/null
+++ b/exist-app/data/sample_teixml_2.xml
@@ -0,0 +1,821 @@
+<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?><?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml"
+	schematypens="http://purl.oclc.org/dsdl/schematron"?><!-- 
+# INTRODUCTION TO AND PURPOSE OF THIS FILE
+   
+The following document is a sample for the Ahiqar project.
+It should display all encoding phenomena that can occur in the project.
+Thus it may serve as a basis for further developing the front end, especially the content of the text panel.
+
+Codex Mingana syr. 133 (textgrid:3r8m5) serves as a basis for this file.
+It has been enhanced by a dummy text in order to add encoding.
+
+From <pn n="83b"/> on the file presents a collation of interesting phenomena that stem from the original data.
+To achieve this the sources have been analyzed systematically.
+A source for the respective encoding is provided in a commentary directly before the encoding.
+
+All suggestions regarding the rendering of certain encoding are marked with ###.
+The proposed ideas aren't normative and can be altered completely.
+Ideas (or parts of ideas) that have bee marked with LC refer to the Leiden Conventions (https://en.wikipedia.org/wiki/Leiden_Conventions) which are common for critical editions
+-->
+<TEI xmlns="http://www.tei-c.org/ns/1.0">
+   <teiHeader>
+      <fileDesc>
+         <titleStmt>
+            <title type="main">The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh,
+               king of Assyria and Nineveh</title>
+            <editor>Simon Birol</editor>
+            <editor>Aly Elrefaei</editor>
+         </titleStmt>
+         <publicationStmt>
+            <authority>Georg-August Universität Göttingen, Theologische Fakultät, Seminar für Altes
+               Testament</authority>
+         </publicationStmt>
+         <sourceDesc>
+            <msDesc>
+               <msIdentifier>
+                  <settlement>
+                     <country>Great Britain</country>
+                  </settlement>
+                  <institution>University of Cambridge - Cambridge University Library</institution>
+                  <idno>Add. 2020</idno>
+               </msIdentifier>
+               <msContents>
+                  <msItem>
+                     <textLang>Classical Syriac</textLang>
+                  </msItem>
+               </msContents>
+               <history>
+                  <origin>
+                     <objectType>codex</objectType>
+                     <country>Iraq</country>
+                     <placeName>Alqosh</placeName>
+                     <date precision="high">18.10.1697</date>
+                  </origin>
+               </history>
+            </msDesc>
+            <listBibl>
+               <bibl>Wright, William: A catalogue of the Syriac manuscripts preserved in the library
+                  of the University of Cambridge, vol. 2, Cambridge 1901, p. 583-9.</bibl>
+            </listBibl>
+         </sourceDesc>
+      </fileDesc>
+      <profileDesc>
+         <abstract>
+            <ab>East Syriac script</ab>
+         </abstract>
+         <textClass>
+            <keywords>
+               <term>proverbs</term>
+               <term>prose</term>
+            </keywords>
+         </textClass>
+         <langUsage>
+           <language ident="ara" xml:base="https://iso639-3.sil.org/code/" xml:id="ara">Arabic</language>
+           <language ident="syc" xml:base="https://iso639-3.sil.org/code/" xml:id="syr">Classical Syriac</language>
+           <language ident="karshuni">Karshuni</language>          
+           <language ident="syc-syrj" xml:base="https://glottolog.org/resource/languoid/id/" xml:id="west2764">Western Syriac</language>
+           <language ident="syc-syrn" xml:base="https://glottolog.org/resource/languoid/id/" xml:id="east2681">Eastern Syriac</language>
+        </langUsage>
+      </profileDesc>
+      <encodingDesc>
+         <tagsDecl>
+            <rendition xml:id="red" scheme="css">color: red;</rendition>
+            <rendition xml:id="font" scheme="free">Serto Jerusalem</rendition>
+         </tagsDecl>
+      </encodingDesc>
+      <revisionDesc>
+         <listChange>
+            <change>
+               <ab>Conversion to specified TEI by SUB Göttingen</ab>
+            </change>
+         </listChange>
+      </revisionDesc>
+   </teiHeader>
+   <text>
+      <group>
+         <text xml:lang="ara" type="transliteration">
+            <body>
+               <pb n="82a"/>
+               <!-- ### tei:cb marks the beginning of a column.
+               most manuscripts have 2 columns.
+               the serialization should imitate this layout.
+               the actual encoding has a column number. -->
+               <cb/>
+               <!-- ### tei:head marks a heading.
+               this should be visually emphasized.
+               ideas: larger font size -->
+               <!-- ### glosses (tei:add in different places) are mostly additions to the running text.
+               NOTE: these suggestions hold for all type of additions, regardless of their place.
+               it should be visually set apart from the rest of the text to indicate that it's an addition.
+               ideas: text framed by \.../ (LC) in lighter color, maybe a panel could display more information about the gloss?-->
+               <head>
+                        <supplied>.</supplied>
+                        <add place="margin">حقًا</add>حيث تبدأ القصة
+                  <g>✓</g>
+                    </head>
+               <ab>نبتدي بعون الباري<add place="interlinear">اختبار</add> تعالى جل اسمه</ab>
+               <!-- ### tei:lb[@break = 'no'] describes that a word has begun in the line before and is continued in the current line.
+               this mostly lacks hyphenation.
+               users should understand by a visual clue that these parts belong together. 
+               ideas: bracket at the bottom that opens in line 1 and closes in line 2 -->
+               <ab>
+                        <lb break="no"/>وتعالى ذكره الى الابد. ونكتب خبر</ab>
+               <ab>الحكيم الماهر الفليوس الشاطر</ab>
+               <!-- ### users should have the opportunity to highlight all persons and/or places on a page.
+               since we're currently working on annotations which will influence this serialization, this isn't a high priority task. -->
+               <!-- ### unclear passages should be marked in some way
+               idea: dotted underlining (LC) -->
+               <ab>وزير <persName>سنحاريب</persName> ابن <persName>سرحادوم</persName> ملك <unclear reason="illegible">
+                            <placeName>اتور</placeName>
+                        </unclear>
+               </ab>
+               <milestone unit="first_narrative_section"/>
+               <ab>
+                  <placeName>ونينوى</placeName>
+                  <placeName>والموصل</placeName> . وما جرا منه ومن</ab>
+               <ab>ابن اخته <persName>نادان</persName> . كان في ايام الملك ابن
+                     <persName>سرحادوم</persName>
+               </ab>
+               <ab>ملك ارض <placeName>اتور</placeName>
+                  <placeName>ونينوى</placeName> وبلادها. رجل حكيم يقال</ab>
+               <ab>له <persName>حيقار</persName> . وكان وزير الملك <persName>سنحاريب</persName>
+                  وكاتبه وكان</ab>
+               <ab>ذو مال جزيل ورزق كثير. وكان ماهر حكيم فيلسوف</ab>
+               <ab>ذو معرفه وراي وتدبير. وكان قد تزوج ستين امراه</ab>
+                <milestone unit="second_narrative_section"/>
+               <cb/>
+               <!-- ### tei:ab[@type = 'head'] marks head-like structures.
+               users should understand that this is something LIKE a heading, but it's not a regular heading. 
+               idea: larger font size, but not as large as a regular heading; centered? -->
+               <ab type="head">رأس <add place="header">اختبار</add>متقاطع</ab>
+               <ab>وبنى لكل واحده منهن مقصوره. ومع هذا كله</ab>
+               <ab>لم يكن له ولد يرثه. وكان كثير الهم لاجل ذلك</ab>
+               <ab>وانه في ذات يوم جمع المنجمين والسحره</ab>
+               <ab>والعارفين. واشكا لهم حاله وامر 
+               <!-- ### tei:choice with tei:sic and tei:corr marks faulty text and its correction.
+               the text in tei:sic is wrong in some way and corrected by tei:corr.
+               corrections without @resp should be distinguished from the ones that have it (it marks corrections by modern editors).
+               both the text of tei:sic and tei:corr should be provided, while it should be clear that the one of tei:sic is invalid.
+               idea: striked through text of tei:sic and corrected text in regular styling
+               -->
+               <choice>
+                     <sic>بعقوريته</sic>
+                     <corr>عقوريته</corr>
+                  </choice>
+                  <choice>
+                     <sic>بعقوريته</sic>
+                     <corr resp="#sb">عقوريته</corr>
+                  </choice>
+               </ab>
+               <ab>فقالوا له ادخل ادبح للالهه واستجير بهم</ab>
+               <ab>لعلهم يرزقوك ولدًا. ففعل كما قالوا له. وقدم</ab>
+               <ab>القرابين للاصنام واستغاث بهم. وتضرّع اليهم</ab>
+               <ab>بالطلبه والدعا. فلم يجيبوه بكلمه. فخرج</ab>
+               <ab>يحزان ندمان خايب وانصرف متالم القلب. ورجع</ab>
+               <ab>بالتضرع الى الله تعالى. وامن واستعان به بحرقة</ab>
+               <ab>قلب قايلًا. يا الاه السما والارض. يا خالق</ab>
+               <!-- ### lines of verse should be distinguished from the running text.
+               a common way to mark this some kind of margin on the top and bottom as well as on the side. 
+               idea: a blank line before and after the line groups with padding on the side (side depends on reading direction?) -->
+               <lg>
+                  <l>هل <add place="below">اختبار</add> أقارنك بيوم صيفي؟</l>
+                  <l>انت أكثر جميلة وأكثر اعتدالا<surplus>:</surplus>
+                        </l>
+               </lg>
+               <!-- ### colophons should be set apart and emphasized visually from the regular text.
+               idea: different colour. -->
+               <ab>
+                        <seg type="colophon">. نهاية<add place="footer">اختبار</add>
+                  النص</seg>وماتت.</ab>
+
+               <!-- ### it should be somehow clear for users that they're viewing a vacant page (i.e. a page without content).
+               otherwise they'll assume that something went wrong.
+               in printed editions a common way of indicating that a text (such as "vacant page") isn't part of the edition is to make it italic or the like.
+               of course other styling is possible.
+               however, it should be clear that this is editorial text, not text of the manuscript. 
+               idea: text "[vacat]"" in italics -->
+               <pb n="82b"/>
+               <pb n="83a"/>
+               <!-- ### quotes should marked by a visual cue.
+               however, simply inserting glyphs like quotation marks isn't possible since it could indicate that these are part of the text.
+               this doesn't hold if (by some means) it is clear to the user that these glyphs aren't part of the running text.
+               idea: quotation marks in lighter color -->
+               <ab>الخلايق كلها.<quote>كان كذلك ، لذا لم يكن كذلك.</quote> انا اطلب اليك ان
+                  توهبني</ab>
+               <!-- ### @rend says it all. -->
+               <ab>
+                        <del rend="strikethrough">ولدًا حتى اتعزا به ويرثني ويحضر بموتي</del>
+                    </ab>
+               <ab>ويغمض عيناي ويدفنني. فعند ذلك اتاه صوت</ab>
+               <ab/>
+               <ab>من السما قايلا. بحيث اتكلت اولًا على الاصنام</ab>
+               <ab>المنحوته. وقدمت لهم القرابين. لذلك</ab>
+               <ab>تبقا بلا ولد. بل ان <persName>نادان</persName> ابن اختك خذه</ab>
+               <!-- ### @rend says it all. -->
+               <ab rend="margin-top">واجعله لك ولدًا. وعلمه علمك وادبك وحكمتك</ab>
+               <ab>وهو يرثك. عند ذلك اخذ <persName>نادان</persName> ابن اخته وكان</ab>
+               <ab>صغير يرضع. فسلمه الى تمانية نسا مرضعات</ab>
+               <ab>ليرضعوه ويربوه. فربوه بالاكل الطيب والبسوه</ab>
+               <ab>الحرير والارجوان والقرمز وكان جلوسه على</ab>
+               <ab>الطنافس الحرير. فلما كبر <persName>نادان</persName> ومشى ونمى</ab>
+               <ab>مثل الارز العالي فعلمه الكتابه والقرااه</ab>
+               <ab>والتاديب والفلسفه. فلما كان بعض الايام</ab>
+               <ab>نظر <persName>سنحاريب</persName> الملك فراى <persName>حيقار</persName> وزيره</ab>
+               <ab>وكاتبه وهو قد بقى رجل شيخ كبير</ab>
+               <ab>فقال له ايها الصاحب المحب المكرم</ab>
+               <ab>الماهر المدبر الحكيم كاتبي ووزيري وكاتم</ab>
+               <ab>سري ومدبر دولتي. ها قد كبرت وطعنت في</ab>
+               <ab>السن<add place="interlinear">اختبار</add> وشخت. وقرب وقت موتك ووفاتك. فقول</ab>
+               <!-- ### tei:persName[@next] describes that a name begins at the end of a line and is continued at the beginning of the next line.
+               same holds for place names.
+               when highlighting entities these should be treated as one entity. -->
+               <ab>
+                        <persName next="#ms1">أ</persName>لي من يقوم في خدمتي بعدك. فقال له </ab>
+               <ab>
+                        <persName xml:id="ms1">حقر</persName>
+                    </ab>
+               <ab type="colophon">هذا حيث ينتهي النص.</ab>
+
+
+               <!-- @@@@ The following encoding has been taken directly from the source material. 
+               In case there are Karshuni passages, tei:seg has been added in order to comply with tei:text/@xml:lang @@@@ -->
+               <pb n="83b"/>
+
+
+               <!-- @@@ Brit.Mus._cod._Add._7209_Transcrip.karsh.3r14z.1.xml -->
+               <!-- persName spanning over two lines -->
+               <ab>وقال للسياف كان اسمه <persName next="#Brit.Mus_7209_2">يبوس</persName>
+                    </ab>
+               <ab>
+                        <persName xml:id="Brit.Mus_7209_2">ميكمسكينكنتي</persName> قوم خد
+                     <persName>حيقر</persName> وامضي</ab>
+
+               <!-- rubricated place and person names -->
+               <!-- ### CSS for renditions is stated in the TEI header -->
+               <ab>
+                        <hi rendition="#red">
+                            <placeName>مصر</placeName> الى عند
+                        <persName>فرعون</persName> الملك </hi> ولما</ab>
+
+               <!-- colophon -->
+               <ab type="colophon">والان كملت قصت <persName>حيقر</persName> الحكيم الفارسي</ab>
+
+
+
+               <!-- @@@ Brit._Libr._Or._2326.3r9pr.0.xml -->
+               <!-- illegible text -->
+               <ab>فتركهم وحزن وتالم <unclear reason="illegible">ܘܟܓܪܒ</unclear> بقوله</ab>
+
+
+
+               <!-- @@@ Cod._Add._2886._Transcript._karsh.3r1dp.1.xml -->
+               <!-- word spanning over two lines -->
+               <ab>وختمهم بختم خاله <persName>حيقار</persName> . واما</ab>
+               <ab>
+                        <lb break="no"/> هم في دار الملك ثم مضا ايضا وكتب</ab>
+
+               <!-- deletion, marginal gloss with entities -->
+               <ab>
+                  <del rend="strikethrough">صوته فيطرحون</del>
+                  <add place="margin">صهل في بلاد <placeName>اتور</placeName>
+                     <placeName>ونينوا</placeName> فسمعوا خيلنا صوته فطرحوا</add> فلما سمع
+                     <persName>حيقار</persName>
+               </ab>
+
+               <!-- gloss: above -->
+               <ab>قيل بالامثال من <add place="above">لا</add> يسمع من اذنيه</ab>
+
+
+
+               <!-- @@@ MS_orient_2652.Transcrip._karsh.3r1r2.1.xml -->
+               <!-- a colophon in verse. tei:lg is missing. -->
+               <l type="colophon">فيا سادتي رقّوا لعبدًا</l>
+               <l type="colophon">في ذنوبا لا يعدوا</l>
+               <l type="colophon">جا بالتقصير يسال</l>
+               <l type="colophon">ان تروا عيبا فسدّوا</l>
+
+
+
+               <!-- @@@ Mingana_Syriac_258.Transcrip._karsh.3r1pq.1.xml -->
+               <!-- gloss: inline -->
+               <ab>الرعيَّه. يا <add place="inline">ابني</add> اربعةً اخر العاقل والاحمق</ab>
+
+               <!-- untyped unclear, untyped damage -->
+               <!-- ### damaged passages can sometimes contain (reconstructed) text, other times the text is complete lost.
+               damages should be visible by the user as a part that is missing.
+               idea: background color, lighter text, ... -->
+               <ab>
+                  <add place="margin">هذا</add>
+                  <unclear>سطين</unclear> الحجر قدَّ حتى اخيط لكم هذا الحجر <damage>...</damage>
+               </ab>
+
+
+
+               <!-- @@@ Vat._sir._159._ff.293rb-299va._Transcrip.Karsh.3r1sv.1.xml -->
+               <!-- a page (shortened) with two columns (incl. numbering)-->
+               <pb n="297v"/>
+               <cb n="1"/>
+               <ab>بالعطاي وكبره وبعد يوم انا</ab>
+               <ab>
+                  <persName>حيقار</persName> بعثت الى <persName>اشفغني</persName> زوجتي</ab>
+               <ab>وقلت لها حال وصول اليكي</ab>
+               <ab>امري قولي للصيادين ان يصيدوا</ab>
+               <ab>لنا فرخين نسورا وقولي لصناع</ab>
+               <ab>القطن ان يفتلوا لنا شريطين</ab>
+               <ab>يكونوا غليظ صبع وطول الفين</ab>
+               <ab>ذراع والنجارين حتى ينجرون صناديق</ab>
+               <ab>كبار واعطي <persName>نبوحال</persName>
+                  <persName>وطبوليم</persName>
+               </ab>
+               <ab>لسبعة نسا مرضعة حتى يربوهم</ab>
+               <ab>واذبحي كليوم خاروف للنسورا</ab>
+               <ab>...</ab>
+
+               <cb n="2"/>
+               <ab>
+                  <persName>فرعون</persName> اكابره ان يلبسون ثياب</ab>
+               <ab>البرفير الاحمار والملك لبس</ab>
+               <ab>ثوب ارجاونى وجلس على كرسيه</ab>
+               <ab>وكل عظاماه قيام قدامه وامر</ab>
+               <ab>ادخلوني اليه قال لى يا <persName>ابيشام</persName>
+               </ab>
+               <ab>لمن اشبه انا واكابرى لمن</ab>
+               <ab>يشبهون قلت له تشبه انت</ab>
+               <ab>لبيل الصنم واكابرك يشبهون</ab>
+               <ab>لخدامه فقال لى امضي الى</ab>
+               <ab>منزلك وايضا قال اكابره بالغد</ab>
+               <ab>البسوا كلكم ثياب احمر وتجوا</ab>
+               <ab>...</ab>
+            </body>
+         </text>
+
+         <text xml:lang="karshuni" type="transcription">
+            <body>
+               <pb facs="textgrid:3r1nz" n="82a" xml:id="a1"/>
+               <cb/>
+               <!-- ### supplied text is text that modern editors have inserted.
+               it is usually marked with square brackets (LC).
+               idea: square brackets + lighter color -->
+               <head>
+                        <seg xml:lang="ara">
+                            <supplied>.</supplied>
+                            <add place="margin">حقًا</add>
+                        </seg>
+                        <g>✓</g>
+                  <!-- this rubrication can be found in BnF_434_rev.3r676.4.xml -->
+                  <hi rend="color(red)"> ܀ ܬܘܒ ܒܚܹܝܠ 
+                  <!-- ### since the abbreviated text is the running text, this should be rendered.
+                  the expansion should be accessible to users too, though.
+                  idea: insert icon after tei:abbr to indicate it's clickable + display expansion in another panel / modal -->
+                  <choice>
+                        <abbr>ܝܗ̈ܿ</abbr>
+                        <expan>ܝܗ</expan>
+                     </choice> ܟܿܬܒܢܐ ܩܲܠܝܼܠ ܡܼܢ ܡ̈ܬܼܠܐ <persName>ܕܐܚܝܼܩܲܪ܆</persName>
+                  </hi>
+                    </head>
+               <ab>ܢܒܬܕܝ ܒܥܘܢ ܐܠܒܐܪܝ<add place="interlinear">اختبار</add> ܬܥܐܠܝ ܓܠ ܐܣܡܗ</ab>
+               <ab>
+                        <lb break="no"/>ܘܬܥܐܠܝ ܕܟܪܗ ܐܠܝ ܐܠܐܒܕ. ܘܢܟܬܒ ܟܒܪ</ab>
+               <ab>ܐܠܚܟܝܡ ܐܠܡܐܗܪ <choice>
+                     <sic>ܐܠܦܠܝܘܣ</sic>
+                     <corr>ܐܠܦܠܝܣܘܦ</corr>
+                  </choice> ܐܠܫܐܛܪ</ab>
+               <ab>ܘܙܝܪ <persName>ܣܢܚܐܪܝܒ</persName> ܐܒܢ <persName>ܣܪܚܐܘܕܡ</persName> ܡܠܟ
+                     <placeName>ܐܬܘܪ</placeName>
+               </ab>
+               <ab>
+                  <placeName>ܘܢܝܢܘܝ</placeName>
+                  <placeName>ܘܐܠܡܘܨܠ</placeName> ܘܡܐ ܓܪܐ ܡܥܗ ܘܡܢ</ab>
+               <ab>ܐܒܢ ܐܟܬܗ <persName>ܢܐܕܐܢ</persName> . ܟܐܢ ܦܝ ܐܝܐܡ ܐܠܡܠܟ ܐܒܢ ܣܪܚܐܕܘܡ</ab>
+               <ab>ܡܠܟ ܐܪܜ <unclear reason="illegible">
+                            <placeName>ܐܬܘܪ</placeName>
+                        </unclear>
+                  <placeName>ܘܢܝܢܘܝ</placeName> ܘܒܠܐܕܗܐ. ܪܓܠ ܚܟܝܡ ܝܩܐܠ </ab>
+               <ab>ܠܗ <persName>ܚܝܩܐܪ</persName> ܘܟܐܢ ܘܙܝܪ ܐܠܡܠܟ <persName>ܣܢܚܐܪܝܒ</persName> ܘܟܐܬܒܗ
+                  ܘܟܐܢ</ab>
+               <ab>ܕܘ ܡܐܠ ܓܙܝܠ ܘܪܙܩ ܟܬܝܪ. ܘܟܐܢ ܡܐܗܪ ܚܟܝܡ ܦܝܠܣܘܦ</ab>
+
+               <cb/>
+               <ab type="head">
+                        <seg xml:lang="ara">رأس <add place="header">اختبار</add>متقاطع</seg>
+                    </ab>
+               <ab>ܕܘ ܡܥܪܦܗ ܘܪܐܝ ܘܬܕܒܝܪ. ܘܟܐܢ ܩܕ ܬܙܘܓ ܣܬܝܢ ܐܡܪܐܗ</ab>
+               <ab>ܘܒܢܝ ܠܟܠ ܘܐܚܕܗ ܡܢܗܢ ܡܩܨܘܪܗ. ܘܡܥ ܗܕܐ ܟܠܗ</ab>
+               <ab>ܠܡ ܝܟܢ ܠܗ ܘܠܕ ܝܪܬܗ. ܘܟܐܢ ܟܬܝܪ ܐܠܗܡ ܠܐܓܠ ܕܠܟ</ab>
+               <ab>ܘܐܢܗ ܦܝ ܕܐܬ ܝܘܡ ܓܡܥ ܐܠܡܢܓܡܝܢ ܘܐܠܣܚܪܗ</ab>
+               <ab>ܘܐܠܥܐܪܦܝܢ. ܘܐܫܟܐ ܠܗܡ ܚܐܠܗ ܘܐܡܪ <choice>
+                     <sic>ܒܥܩܘܪܝܬܗ</sic>
+                     <corr>ܥܩܘܪܝܬܗ</corr>
+                  </choice>
+                  <choice>
+                     <sic>ܒܥܩܘܪܝܬܗ</sic>
+                     <corr resp="#sb">ܥܩܘܪܝܬܗ</corr>
+                  </choice>
+               </ab>
+               <ab>ܦܩܐܠܘܐ ܠܗ ܐܕܟܠ ܐܕܒܚ ܠܠܐܠܗܗ ܘܐܣܬܓܝܪ ܒܗܡ</ab>
+               <ab>ܠܥܠܗܡ ܝܪܙܩܘܟ ܘܠܕܐ. ܦܦܥܠ ܟܡܐ ܩܐܠܘܐ ܠܗ. ܘܩܕܡ</ab>
+               <ab>ܐܠܩܪܐܒܝܢ ܠܠܐܨܢܐܡ ܘܐܣܬܓܐܬ ܒܗܡ. ܘܬܜܪܥ ܐܠܝܗܡ</ab>
+               <ab>ܒܐܠܛܠܒܗ ܘܐܠܕܥܐ. ܦܠܡ ܝܓܝܒܘܗ ܒܟܠܡܗ. ܦܟܪܓ</ab>
+               <ab>ܝܚܙܐܢ ܢܕܡܐܢ ܟܐܝܒ ܘܐܢܨܪܦ ܡܬܐܠܡ ܐܠܩܠܒ. ܘܪܓܥ</ab>
+               <ab>ܒܐܠܬܜܪܥ ܐܠܝ ܐܠܠܗ ܬܥܐܠܝ. ܘܐܡܢ ܘܐܣܬܥܐܢ ܒܗ ܒܚܪܩܗ̈</ab>
+               <ab>ܩܠܒ ܩܐܝܠܐ. ܝܐ ܐܠܐܗ ܐܠܣܡܐ ܘܐܠܐܪܜ. ܝܐ ܟܐܠܩ</ab>
+               <lg>
+                  <l>ܩܠܒ <add place="interlinear">اختبار</add> ܩܐܝܠܐ</l>
+                  <!-- ### surplus text should be set apart visually.
+                  a common way is setting the text in curly braces, but in addition to that other cues are possible (another color, different contrast?)
+                  idea: curly braces (LC) + lighter color, e.g. {some text} -->
+                  <l>ܩܠܒ ܩܐܝܠܐ <surplus>:</surplus>
+                        </l>
+               </lg>
+               <ab xml:lang="ara">
+                        <seg type="colophon">. نهاية<add place="footer">اختبار</add>
+                     النص</seg>وماتت.</ab>
+
+               <!-- ### catchwords should be set apart from the running text and de-emphasized. 
+               idea: lighter/other color-->
+               <ab>
+                        <catchwords>الخلايق كلها</catchwords>
+                    </ab>
+
+
+               <!-- random facsimile for invented empty page -->
+               <pb facs="textgrid:3r1p0" n="82b"/>
+               <pb facs="textgrid:3r1nz" n="83a" xml:id="a2"/>
+               <ab>ܐܠܟܠܐܝܩ ܟܠܗܐ.<quote>
+                            <seg xml:lang="ara">كان كذلك ، لذا لم يكن كذلك.</seg>
+                        </quote>
+                  ܐܢܐ ܐܛܠܒ ܐܠܝܟ ܐܢ ܬܘܗܒܢܝ</ab>
+               <ab>
+                        <del rend="strikethrough">ܘܠܕܐ ܚܬܝ ܐܬܥܙܐ ܒܗ ܘܝܪܬܢܝ ܘܝܚܜܪ ܒܡܘܬܝ</del>
+                    </ab>
+               <ab>ܘܝܓܡܜ ܥܝܢܐܝ ܘܝܕܦܢܢܝ. ܦܥܢܕ ܕܠܟ ܐܬܐܗ ܨܘܬ</ab>
+               <ab/>
+               <ab>ܡܢ ܐܠܣܡܐ ܩܐܝܠܐ. ܒܚܝܬ ܐܬܟܠܬ ܐܘܠܐ ܥܠܝ ܐܠܐܨܢܐܡ</ab>
+               <ab>ܐܠܡܢܚܘܬܗ. ܘܩܕܡܬ ܠܗܡ ܐܠܩܪܐܒܝܢ. ܠܕܠܟ </ab>
+               <ab>ܬܒܩܐ ܒܠܐ ܘܠܕ. ܒܠ ܐܢ <persName>ܢܐܕܐܢ</persName> ܐܒܢ ܐܟܬܟ ܟܕܗ</ab>
+               <ab rend="margin-top">ܘܐܓܥܠܗ ܠܟ ܘܠܕܐ. ܘܥܠܡܗ ܥܠܡܟ ܘܐܕܒܟ ܘܚܟܡܬܟ</ab>
+               <ab>ܘܗܘ ܝܪܬܟ. ܥܢܕ ܕܠܟ ܐܟܕ <persName>ܢܐܕܐܢ</persName> ܐܒܢ ܐܟܬܗ ܘܟܐܢ </ab>
+               <ab>ܨܓܝܪ ܝܪܜܥ. ܦܣܠܡܗ ܐܠܝ ܬܡܐܢܝܗ̈ ܢܣܐ ܡܪܜܥܐܬ</ab>
+               <ab>ܠܝܪܜܥܘܗ ܘܝܪܒܘܗ. ܦܪܒܘܗ ܒܐܠܐܟܠ ܐܠܛܝܒ ܘܐܠܒܣܘܗ</ab>
+               <ab>ܐܠܚܪܝܪ ܘܐܠܐܪܓܘܐܢ ܘܐܠܩܪܡܙ ܘܟܐܢ ܓܠܘܣܗ ܥܠܝ</ab>
+               <ab>ܐܠܛܢܐܦܣ ܐܠܚܪܝܪ. ܦܠܡܐ ܟܒܪ <persName>ܢܐܕܐܢ</persName> ܘܡܫܝ ܘܢܡܝ</ab>
+               <ab>ܡܬܠ ܐܠܐܪܙ ܐܠܥܐܠܝ ܦܥܠܡܗ ܐܠܟܬܐܒܗ ܘܐܠܩܪܐܐܗ</ab>
+               <ab>ܘܐܠܬܐܕܝܒ ܘܐܠܦܠܣܦܗ. ܦܠܡܐ ܟܐܢ ܒܥܜ ܐܠܐܝܐܡ</ab>
+               <ab>ܢܜܪ <persName>ܣܢܚܐܪܝܒ</persName> ܐܠܡܠܟ ܦܪܐܝ <persName>ܚܝܩܐܪ</persName> ܘܙܝܪܗ </ab>
+               <ab>ܘܟܐܬܒܗ ܘܗܘ ܩܕ ܒܩܝ ܪܓܠ ܫܝܟ ܟܒܝܪ</ab>
+               <ab>ܦܩܐܠ ܠܗ ܐܝܗܐ ܐܠܨܐܚܒ ܐܠܡܚܒ ܐܠܡܟܪܡ</ab>
+               <ab>ܐܠܡܐܗܪ ܐܠܡܕܒܪ ܐܠܚܟܝܡ ܟܐܬܒܝ ܘܘܙܝܪܝ ܘܟܐܬܡ</ab>
+               <ab>ܣܪܝ ܘܡܕܒܪ ܕܘܠܬܝ. ܗܐ ܩܕ ܟܒܪܬ ܘܛܥܢܬ ܦܝ </ab>
+               <ab>ܐܠܣܢ ܘܫܟܬ.<add place="interlinear">اختبار</add> ܘܩܪܒ ܘܩܬ ܡܘܬܟ ܘܘܦܐܬܟ. ܦܩܘܠ</ab>
+               <ab>ܠܝ ܡܢ ܝܩܘܡ ܦܝ ܟܕܡܬܝ ܒܥܕܟ. ܦܩܐܠ ܠܗ</ab>
+               <ab type="colophon">
+                        <seg xml:lang="ara">هذا حيث ينتهي النص.</seg>
+                    </ab>
+                <milestone unit="examples"/>
+
+               <!-- @@@@ The following encoding has been taken directly from the source
+                  material. In case there are Arabic passages, tei:seg with/or @xml:id has been added 
+                  in order to comply with tei:text/@xml:lang @@@@ -->
+               <!-- inserted random facsimile just to provide one -->
+               <pb facs="textgrid:3r85q" n="83b"/>
+
+               <!-- @@@ BnF_434_rev.3r676.4.xml -->
+               <!-- different type of rubrication -->
+               <ab>♰ <hi rend="color(red)">ܬܘܼܒ</hi>♰</ab>
+
+
+               <!-- @@@ Borg._Arab._201.3r7vv.0.xml -->
+               <!-- correction of a word -->
+               <ab xml:lang="ara">خدمتني وخدمت ابي <persName>سرحادوم</persName> كذلك يكون هذا ولدك
+                     <del rend="strikethrough">يكرمني</del>
+                  <add place="above">يخدمني</add>
+               </ab>
+
+
+
+               <!-- @@@ Brit._Lib._Add._7200.3r131.1.xml -->
+               <!-- damaged text with supplied -->
+               <!--- ### since the text in tei:orig is the running text, it should be displayed.
+               the text of supplied should, however, be available, too.
+               idea: cf. tei:abbr/tei:expan? -->
+               <ab>
+                        <damage>
+                     <orig>[܂]ܢܬ [܂܂܂]ܡܪ</orig>
+                     <supplied>ܫܢܬ ܐܬܐܡܪ</supplied> ܗܼܘܐ ܠܝܼ܂ </damage>
+               </ab>
+
+               <!-- several damaged words in a line -->
+               <ab>
+                  <damage>
+                     <orig>unclear</orig>
+                     <supplied>ܘܬܚܙܐ ܐܢܬܬܐ ܕܣܩܝܠܐ</supplied>
+                  </damage> ܘܡܨܒܬܐ܇ <damage>
+                     <orig>ܠ[܂] ܬܪܓܝ[܂]</orig>
+                     <supplied>ܠܐ ܬܪܓܝܗܿ</supplied>
+                  </damage>
+               </ab>
+
+
+
+               <!-- @@@ Brit._Libr._Or._2326.3r9pr.0.xml -->
+               <!-- rubrication with switiching language -->
+               <ab>
+                  <hi rendition="#red">
+                     <seg xml:lang="ara"> نبتدي بعون الله </seg> ܘܢܟܬܒ ܩܨܗ̈</hi>
+               </ab>
+
+
+               <!-- @@@ Cambridge_Add._2020.3r82k.1.xml -->
+               <!-- omitted text -->
+               <!-- ### there is probably no need to indicate the reason for the supplied text.
+               it could be serialized as tei:supplied without an attribute -->
+               <ab> ܥܲܝܢܹܗ ܢܕܲܒܲܪ ܒܲܝܬܹܿܗ܀ ܒܹܪܝ ܛܵܒܼ ܥܘܝܼܪ <supplied rend="omission">ܒܥܲܝܢ̈ܘܗܝ</supplied> ܡܼܢ ܗܵܘܿ ܕܲܥܘܝܼܪ </ab>
+
+               <!-- gloss: below -->
+               <ab> ܠܲܝܬܿ ܠܹܗ܂ ܘܛܵܒܼܘܼ ܩܵܠܐ ܕܐܘܼܠ̈ܝܬܼܵܐ ܒܐܹܕ̈ܢܲܝ ܣܲܟܼܠܵܐ܉ <add place="below">ܡܢ</add> ܙܡܵܪܵܐ </ab>
+
+               <!-- damaged text with entity and illegible text -->
+               <ab>
+                  <damage>
+                     <persName>ܣܿܢܚܹܪܝܼܒܼ</persName> ܡܵܪܝ <unclear reason="illegible">ܠ܂܂܂</unclear>
+                     <unclear reason="illegible">܂܂܂܂</unclear> ܘܪܵܘܪ̈ܒܼܵܢܵܘܗܝ ܠܒܲܪ̈ܩܹܐ </damage>
+               </ab>
+
+
+
+               <!-- @@@ Cambrigde_Add_3497.3rb41.0.xml -->
+               <!-- place name spanning over two lines -->
+               <ab xml:lang="ara">والعساكر وانطلقوا الى الصحره الى <placeName next="#Cambrigde_Add_3497_1">بقعة</placeName>
+               </ab>
+               <ab xml:lang="ara">
+                  <placeName xml:id="Cambrigde_Add_3497_1">نسرين</placeName> فلما وصلوا فنظر الملك
+                  الى <persName>حيقار</persName>
+               </ab>
+
+
+
+               <!-- @@@ Cod._Add._2886._Transcript._karsh.3r1dp.1.xml -->
+               <!-- head-like line -->
+               <ab type="head">ܟܪܐܣ ܥܐܫܪ</ab>
+
+
+
+               <!-- @@@ DFM_00614.3rbm8.0.xml -->
+               <!-- several corrections in a line -->
+               <ab xml:lang="ara">والأن <del rend="strikethrough">فبقي</del>
+                  <add place="below">بقى</add>
+                  <del rend="strikethrough">أمرادني</del>
+                  <add place="below">اريد</add> منك <del rend="strikethrough">حتى</del>
+                  <add place="below">ان</add> تبني <del rend="strikethrough">لك</del>
+                  <add place="below">لي</add>
+               </ab>
+
+
+
+               <!-- @@@ GCAA_00486.3rbmb.0.xml -->
+               <!-- rubricated supplied -->
+               <!-- ### while the text within tei:hi should be rubricated, the potential sigla ([...]) should not. -->
+               <ab xml:lang="ara">
+                  <supplied>
+                     <hi rendition="#red">يا بني</hi>
+                  </supplied> لا تكون مثل شجرة اللوز لانها</ab>
+
+               <!-- usage of tei:gap -->
+               <!-- ### tei:gap indicates some white space on a page.
+               idea: add standardized white space (15px?) when rendering this element-->
+               <ab xml:lang="ara">ولا تبادر برد الجواب <gap reason="invisible"/> لا</ab>
+
+               <!-- usage of tei:gap -->
+               <ab>
+                  <gap reason="lost"/>
+               </ab>
+
+
+
+               <!-- @@@ MS_orient_2652.Transcrip._karsh.3r1r2.1.xml -->
+               <!-- addition within rubrication -->
+               <!-- ### as in GCAA_00486.3rbmb.0.xml, potential sigla that created while serializing tei:add shouldn't be rubricated -->
+               <ab>
+                  <hi rendition="#red">ܦܩܐܠ ܠܗ ܣܝܕܝ <add place="margin">ܝܫܒܗ</add> ܐܠܐܗ ܐܠܣܡܐ
+                     ܘܐܟܐܒܪܗ</hi>
+               </ab>
+
+
+
+               <!-- @@@ Mingana_Arabic_Christian_93_(84).3r7tv.1.xml -->
+               <!-- choice within colophon -->
+               <ab type="colophon" xml:lang="ara">فيها هكذا وجدنا وكتبنا والله <choice>
+                     <sic>لهو</sic>
+                     <corr>له</corr>
+                  </choice> المجد والشكر الي الابد امين</ab>
+
+
+
+               <!-- @@@ Mingana_Syriac_258.Transcrip._karsh.3r1pq.1.xml -->
+               <!-- choice within marginal gloss -->
+               <ab>
+                  <add place="margin">
+                     <choice>
+                        <sic>ܦܫܐܚܬܗ</sic>
+                        <corr>ܦܚܐܫܬܗ</corr>
+                     </choice>
+                  </add> ܐܠܪܕܝܗ ܝܐ ܐܒܢܝ ܐܩܬܢܝ ܠܟ ܬܘܪ</ab>
+
+
+
+               <!-- @@@ Mingana_Syriac_433.3r8m5.0.xml -->
+               <!-- unclear with @reason -->
+               <!-- ### the reason for an unclear passage could be part of the annotations.
+               if not, it shouldn't be rendered in a special way.
+               idea: cf. regular tei:unclear -->
+               <ab>ܘܟܼܠܡܿܢ ܕܢܹܥܒܲܪ ܥܠܸܝܗܿ <unclear reason="eccentric_ductus">ܘܕܵܐܹܫ</unclear> ܠܵܗܿ
+                  ܐܵܟܹܿܠ ܡܼܢ </ab>
+
+               <!-- choice within entity -->
+               <ab>ܠܙܿܠܝܼܩܵܘ̈ܗܝ܂ ܘܬܼܘܼܒܼ ܐܡܼܪ ܠܝܼ܂ ܙܸܠ <persName>
+                     <choice>
+                        <sic>ܐܲܒܼܝܼܩܵܡ܂</sic>
+                        <corr resp="#sb">ܐܲܒܼܝܼܩܲܡ܂</corr>
+                     </choice>
+                  </persName>
+               </ab>
+
+
+
+               <!-- @@@ Nau.3r9f0.0.xml -->
+               <!-- damage with orig/supplied -->
+               <ab>ܫܬܿܝܼܢ܂ ܘܲܒܼܢܝܹܬ ܠܗܹܝܢ ܒܝܼܪ̈ܬܼܵܐ <damage>
+                     <orig>[܂܂܂]ܢ܂</orig>
+                     <supplied>ܫܬܝܢ܂</supplied>
+                  </damage>
+               </ab>
+
+               <!-- gloss: footer -->
+               <ab>ܗܘܹ̇ܝܬܿ ܠܝܼ <add rend="footer">ܐܲܝܟܼ</add> ܐܲܪܝܵܐ ܕܲܚܙܵܐ ܚܡܵܪܵܐ ܒܥܸܕܵܢ ܨܲܦ </ab>
+
+               <!-- damaged catchwords -->
+               <ab>ܨܠܘܿܬܼܵܟܼ܂ ܘܠܵܐ ܢܫܲܠܸܡ ܥܲܡܵܟ ܒܛܲܒܼܬܼܵܐ܂ ܐܘܿ ܒܹܪܝ <catchwords>
+                     <damage extent="two words">
+                        <supplied>ܗܘܿܝܬ ܠܝ</supplied>
+                     </damage>
+                  </catchwords>
+               </ab>
+
+
+
+               <!-- @@@ Paris._ar._3656.3r9wg.1.xml -->
+               <!-- usage of tei:space -->
+               <!-- ### idea_ cf. tei:gap -->
+               <l type="colophon" xml:lang="ara">ساداتي رقوا لعبدٍ<space> </space>في ذنوب لا يعدوا</l>
+
+
+
+               <!-- @@@ Paris_BnF_422.3r8qp.0.xml -->
+               <!-- colophon with catchwords following -->
+               <ab>ܘܡܹܚܑܼܓܲܪ ܒܗܵܘܬܼܵܐ ܫܝܘܿܠܵܝܬܿܐ܇ <seg type="colophon">ܗܵܪܟܿܐ</seg>
+                  <catchwords>ܫܸܠܡܲܬܸ</catchwords>
+               </ab>
+
+
+
+               <!-- @@@ SCAA_7229.3r677.1.xml -->
+               <!-- tei:add with @xml:lang. this actually appears within a heading which
+               has been altered to tei:ab to be compliant with the schema. -->
+               <ab> ܦܘܩܕ̈ܢܐ <persName>ܕܚܝܩܪ</persName> ܚܟܝܡܐ ܕܠܘܬ <persName>ܢܵܕܵܢ</persName> ܒܪ ܚܬܗ
+                     <add xml:lang="ara">النقط مكان تفويت</add>
+               </ab>
+
+
+
+               <!-- @@@ Sado_9_Ahiqar_Transkr.3r670.2.xml -->
+               <!-- damage with sic/supplied -->
+               <ab> ܒܼܪܵܐ ܠܵܐ܇ ܒܢܲܝܢܲܫ̈ܐܵ܇ ܕܗܵܐ ܠܵܡ <persName>ܐܲܚܝܼܩܲܪ</persName> ܟܐܹܢܵܐ ܘܛܵܒܼܵܐ
+                  ܘܲܦܠܲܚ <damage>
+                     <sic>ܠܐܲܠܗܵ</sic>
+                     <supplied>ܠܐܲܠܗܵܐ</supplied>
+                  </damage>
+               </ab>
+
+               <!-- addition with @cause -->
+               <!-- ### reasons or causes that are (in)directly stated as XML attributes shouldn't be rendered in a special way.
+               they are potential material for annotations but too specific to be rendered.
+               this also holds for the following elements. -->
+               <ab>
+                  <damage> ܒܝܼܪܬܵܐ ܚܕܵܐ ܐܝܼܬ ܠܝܼ <add cause="handshift" place="below"> ܒܝܪܬܐ ܚܕܐ
+                     </add>
+                  </damage> ܕܐܸܒܢܸܐ ܒܲܫܡܲܝܵܐ ܠܐܲܪܥܵܐ ܚܙܝܼ ܫܲܕܲܪ ܠܝܼ ܓܲܒܼܪܵܐ </ab>
+
+               <!-- complex damage -->
+               <ab> ܡܼܢ <damage>
+                     <choice>
+                        <sic>unclear</sic>
+                        <corr>
+                           <add cause="handshift" place="below">ܕܘܼܟܝܿܬܗ̈ܝܢ </add>
+                        </corr>
+                     </choice>
+                  </damage> ܘܫܛܘܝܬ <choice>
+                     <sic>ܓܓܠܐ</sic>
+                     <corr>ܓܝܓܠܐ</corr>
+                  </choice> ܒܪܹ̈ܓܠܝܼܗܘܢ ܒܡܫܘܚܬܐ ܐܪܟܐܼ </ab>
+
+
+
+               <!-- @@@ Sbath_25_ff._1v-46r.3r7sj.0.xml -->
+               <!-- usage of @reason = 'faded' -->
+               <ab xml:lang="ara">الذي رفع السماء <unclear reason="faded">ما</unclear> يقدر يبني</ab>
+
+               <!-- surplus with @reason -->
+               <ab xml:lang="ara">عنَّا <surplus reason="repeated">اعجلوا الينا في الحجاره</surplus>
+               </ab>
+
+
+
+               <!-- @@@ Transcr_BL_Or_2313.3r688.0.xml -->
+               <!-- complex damage -->
+               <ab>
+                  <damage>
+                     <orig>[܂܂]ܛܿܪܬ</orig>
+                     <supplied>unknown</supplied> ܓܪ̈ܓܐ <choice>
+                        <sic>ܒܪܓܠܝܗܘܢ܂</sic>
+                        <corr resp="#sb">ܒܪ̈ܓܠܝܗܘܢ܂</corr>
+                     </choice>
+                  </damage>
+               </ab>
+
+               <!-- complex damage -->
+               <ab>
+                  <damage>
+                     <orig>ܐܙ[܂܂]</orig>
+                     <supplied>unknown</supplied>
+                     <add place="above">ܗܘ</add> ܕܝܢ ܗܼܒ ܠܝ ܡܠܟܐ </damage>
+               </ab>
+
+
+
+               <!-- @@@ Transcription_Harv_80_complete.3r674.2.xml -->
+               <!-- note added as margin gloss -->
+               <!-- ### notes should be marked in some way since they have been added to the text later.
+               sometimes different scribes can be distinguished.
+               this is indicated by the @hand attribute.
+               idea: different color per hand -->
+               <ab> ܘܪܒܼܐ ܒܪܝ ܘܫܘܼܚ ܐܝܟ ܐܪܢܐ܂ <add place="margin">
+                     <note>ܟܬܘܒܼܐ ܡܬܼܚܫܒ ܠܗܿ ܐܪܢܐ ܐܘ ܐܪܙܐ</note>
+                  </add> ܘܟܼܕ ܪܒܼܐ ܐܠܦܬܿܗ </ab>
+
+               <!-- two notes by different writers in margin gloss -->
+               <ab>
+                  <persName>ܣܪܚܕܘܡ</persName>
+                  <add place="below">
+                     <note>ܒܐܨܚܬܐ ܐܚܪܝܬܐ ܣܲܪܚܵܠܝܼܡ܂</note>
+                     <note hand="S5">ܣܒ ܚܠܝܡ</note>
+                  </add> ܐܒܼܝ܆ ܘܩܕܡܝ ܐܬܼܦܪܥ܂ ܘܐܩܝܡ </ab>
+
+               <!-- three notes by different writers in gloss below -->
+               <ab> ܠܐ ܬܣܪܘܚ܆ ܘܥܡ ܣܪܘܚܐ ܬܬܼܚܟܡ܂ <add place="below">
+                     <note>ܒܐܨ܆ ܐܚܪ܆ ܠܐ ܬܬܼܚܟܡܼ</note>
+                     <!-- I think this has to be encoded with tei:seg@xml:lang = 'la' -->
+                     <note hand="S4">om.</note>
+                     <note hand="S6">habet</note>
+                  </add> ܒܪܝ </ab>
+
+               <!-- marginal gloss with note and some more text -->
+               <ab> ܘܪܘܪ̈ܒܼܢܝܟ <add place="margin">
+                     <note>ܡܢܗܿ܂ ܥܠ ܗܕܐ ܟܬܼܒܬܼ ܠܗ ܡܼܢ ܐܨܚܬܐ ܐܚܪܬܐ܂</note>
+                  </add> ܠܟܼܘܟܒܼ̈ܐ܀ ܘܐܡܼܪ ܠܝ ܙܠ <persName>ܐܒܿܝܩܡ</persName> ܘܠܨܦܪܐ </ab>
+
+
+
+               <!-- @@@ Transkription_Sachau_162_neu.3r672.1.xml -->
+               <!-- supplying an entity -->
+               <ab> ܒܫ̈ܢܝ <persName>ܣܢܚܪܝܒ</persName> ܡܠܟܐ <placeName>ܕܐܬܘܪ</placeName>
+                  <damage>
+                     <orig>ܘܕܢ</orig>
+                     <supplied>
+                        <placeName>ܘܕܢܝܢܘܐ</placeName>
+                     </supplied>
+                  </damage>
+               </ab>
+
+               <!-- usage of tei:g -->
+               <!-- ### for tei:g[@type = 'quotation-mark'] said glyph should be provided -->
+               <ab> ܡܢ ܕܠܡܠܦܘ ܠܒܪܝ <persName>ܢܕܢ܂</persName> ܥܕܡܐ <g type="quotation-mark"/>
+               </ab>
+
+               <!-- usage of tei:g in damaged area-->
+               <ab>ܠܘܙܐ ܕܠܘܩܕܡ ܡܦܪܥ ܘܠܚܪܬܐ <damage>
+                     <g type="quotation-mark"/>
+                  </damage>
+                    </ab>
+
+               <!-- addition with unknown type -->
+               <ab> ܘܗܦܟܬ ܛܥܢܬ ܐܰܒܵܪܐ ܘܠܐ ܐܝܼܩܰܪ ܥܠܝ <add place="sidelong">ܐܝܟ</add>
+               </ab>
+               
+               <pb facs="textgrid:3r85r" n="84a"/>
+               <ab>some test text</ab>
+              <ab>some test<persName>ܢܕܢ܂</persName></ab>
+            </body>
+         </text>
+      </group>
+   </text>
+</TEI>
\ No newline at end of file
diff --git a/exist-app/data/sample_teixml_2_meta.xml b/exist-app/data/sample_teixml_2_meta.xml
new file mode 100644
index 0000000..69132f1
--- /dev/null
+++ b/exist-app/data/sample_teixml_2_meta.xml
@@ -0,0 +1,19 @@
+<MetadataContainerType xmlns="http://textgrid.info/namespaces/metadata/core/2010" xmlns:ns2="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <object>
+        <generic>
+            <provided>
+                <title>Beispieldatei zum Testen</title>
+                <format>text/xml</format>
+                <notes/>
+            </provided>
+            <generated>
+              <textgridUri extRef="">textgrid:sample_teixml.0</textgridUri>
+            </generated>
+        </generic>
+        <item/>
+        <custom>
+            <cns:templateEditor xmlns:tgs="http://www.textgrid.info/namespaces/middleware/tgsearch" xmlns:tg="http://textgrid.info/relation-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cns="http://textgrid.info/custom-namespace/2009-01-01" xmlns:ns4="http://textgrid.info/namespaces/middleware/tgcrud/services/TGCrudService" xmlns:ns3="http://textgrid.info/namespaces/metadata/core/2010"/>
+        </custom>
+        <relations/>
+    </object>
+</MetadataContainerType>
diff --git a/exist-app/data/sample_teixml_3.xml b/exist-app/data/sample_teixml_3.xml
new file mode 100644
index 0000000..983463a
--- /dev/null
+++ b/exist-app/data/sample_teixml_3.xml
@@ -0,0 +1,821 @@
+<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?><?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml"
+	schematypens="http://purl.oclc.org/dsdl/schematron"?><!-- 
+# INTRODUCTION TO AND PURPOSE OF THIS FILE
+   
+The following document is a sample for the Ahiqar project.
+It should display all encoding phenomena that can occur in the project.
+Thus it may serve as a basis for further developing the front end, especially the content of the text panel.
+
+Codex Mingana syr. 133 (textgrid:3r8m5) serves as a basis for this file.
+It has been enhanced by a dummy text in order to add encoding.
+
+From <pn n="83b"/> on the file presents a collation of interesting phenomena that stem from the original data.
+To achieve this the sources have been analyzed systematically.
+A source for the respective encoding is provided in a commentary directly before the encoding.
+
+All suggestions regarding the rendering of certain encoding are marked with ###.
+The proposed ideas aren't normative and can be altered completely.
+Ideas (or parts of ideas) that have bee marked with LC refer to the Leiden Conventions (https://en.wikipedia.org/wiki/Leiden_Conventions) which are common for critical editions
+-->
+<TEI xmlns="http://www.tei-c.org/ns/1.0">
+   <teiHeader>
+      <fileDesc>
+         <titleStmt>
+            <title type="main">The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh,
+               king of Assyria and Nineveh</title>
+            <editor>Simon Birol</editor>
+            <editor>Aly Elrefaei</editor>
+         </titleStmt>
+         <publicationStmt>
+            <authority>Georg-August Universität Göttingen, Theologische Fakultät, Seminar für Altes
+               Testament</authority>
+         </publicationStmt>
+         <sourceDesc>
+            <msDesc>
+               <msIdentifier>
+                  <settlement>
+                     <country>Great Britain</country>
+                  </settlement>
+                  <institution>University of Cambridge - Cambridge University Library</institution>
+                  <idno>Add. 2020</idno>
+               </msIdentifier>
+               <msContents>
+                  <msItem>
+                     <textLang>Classical Syriac</textLang>
+                  </msItem>
+               </msContents>
+               <history>
+                  <origin>
+                     <objectType>codex</objectType>
+                     <country>Iraq</country>
+                     <placeName>Alqosh</placeName>
+                     <date precision="high">18.10.1697</date>
+                  </origin>
+               </history>
+            </msDesc>
+            <listBibl>
+               <bibl>Wright, William: A catalogue of the Syriac manuscripts preserved in the library
+                  of the University of Cambridge, vol. 2, Cambridge 1901, p. 583-9.</bibl>
+            </listBibl>
+         </sourceDesc>
+      </fileDesc>
+      <profileDesc>
+         <abstract>
+            <ab>East Syriac script</ab>
+         </abstract>
+         <textClass>
+            <keywords>
+               <term>proverbs</term>
+               <term>prose</term>
+            </keywords>
+         </textClass>
+         <langUsage>
+           <language ident="ara" xml:base="https://iso639-3.sil.org/code/" xml:id="ara">Arabic</language>
+           <language ident="syc" xml:base="https://iso639-3.sil.org/code/" xml:id="syr">Classical Syriac</language>
+           <language ident="karshuni">Karshuni</language>          
+           <language ident="syc-syrj" xml:base="https://glottolog.org/resource/languoid/id/" xml:id="west2764">Western Syriac</language>
+           <language ident="syc-syrn" xml:base="https://glottolog.org/resource/languoid/id/" xml:id="east2681">Eastern Syriac</language>
+        </langUsage>
+      </profileDesc>
+      <encodingDesc>
+         <tagsDecl>
+            <rendition xml:id="red" scheme="css">color: red;</rendition>
+            <rendition xml:id="font" scheme="free">Serto Jerusalem</rendition>
+         </tagsDecl>
+      </encodingDesc>
+      <revisionDesc>
+         <listChange>
+            <change>
+               <ab>Conversion to specified TEI by SUB Göttingen</ab>
+            </change>
+         </listChange>
+      </revisionDesc>
+   </teiHeader>
+   <text>
+      <group>
+         <text xml:lang="ara" type="transliteration">
+            <body>
+               <pb n="82a"/>
+               <!-- ### tei:cb marks the beginning of a column.
+               most manuscripts have 2 columns.
+               the serialization should imitate this layout.
+               the actual encoding has a column number. -->
+               <cb/>
+               <!-- ### tei:head marks a heading.
+               this should be visually emphasized.
+               ideas: larger font size -->
+               <!-- ### glosses (tei:add in different places) are mostly additions to the running text.
+               NOTE: these suggestions hold for all type of additions, regardless of their place.
+               it should be visually set apart from the rest of the text to indicate that it's an addition.
+               ideas: text framed by \.../ (LC) in lighter color, maybe a panel could display more information about the gloss?-->
+               <head>
+                        <supplied>.</supplied>
+                        <add place="margin">حقًا</add>حيث تبدأ القصة
+                  <g>✓</g>
+                    </head>
+               <ab>نبتدي بعون الباري<add place="interlinear">اختبار</add> تعالى جل اسمه</ab>
+               <!-- ### tei:lb[@break = 'no'] describes that a word has begun in the line before and is continued in the current line.
+               this mostly lacks hyphenation.
+               users should understand by a visual clue that these parts belong together. 
+               ideas: bracket at the bottom that opens in line 1 and closes in line 2 -->
+               <ab>
+                        <lb break="no"/>وتعالى ذكره الى الابد. ونكتب خبر</ab>
+               <ab>الحكيم الماهر الفليوس الشاطر</ab>
+               <!-- ### users should have the opportunity to highlight all persons and/or places on a page.
+               since we're currently working on annotations which will influence this serialization, this isn't a high priority task. -->
+               <!-- ### unclear passages should be marked in some way
+               idea: dotted underlining (LC) -->
+               <ab>وزير <persName>سنحاريب</persName> ابن <persName>سرحادوم</persName> ملك <unclear reason="illegible">
+                            <placeName>اتور</placeName>
+                        </unclear>
+               </ab>
+               <milestone unit="first_narrative_section"/>
+               <ab>
+                  <placeName>ونينوى</placeName>
+                  <placeName>والموصل</placeName> . وما جرا منه ومن</ab>
+               <ab>ابن اخته <persName>نادان</persName> . كان في ايام الملك ابن
+                     <persName>سرحادوم</persName>
+               </ab>
+               <ab>ملك ارض <placeName>اتور</placeName>
+                  <placeName>ونينوى</placeName> وبلادها. رجل حكيم يقال</ab>
+               <ab>له <persName>حيقار</persName> . وكان وزير الملك <persName>سنحاريب</persName>
+                  وكاتبه وكان</ab>
+               <ab>ذو مال جزيل ورزق كثير. وكان ماهر حكيم فيلسوف</ab>
+               <ab>ذو معرفه وراي وتدبير. وكان قد تزوج ستين امراه</ab>
+                <milestone unit="second_narrative_section"/>
+               <cb/>
+               <!-- ### tei:ab[@type = 'head'] marks head-like structures.
+               users should understand that this is something LIKE a heading, but it's not a regular heading. 
+               idea: larger font size, but not as large as a regular heading; centered? -->
+               <ab type="head">رأس <add place="header">اختبار</add>متقاطع</ab>
+               <ab>وبنى لكل واحده منهن مقصوره. ومع هذا كله</ab>
+               <ab>لم يكن له ولد يرثه. وكان كثير الهم لاجل ذلك</ab>
+               <ab>وانه في ذات يوم جمع المنجمين والسحره</ab>
+               <ab>والعارفين. واشكا لهم حاله وامر 
+               <!-- ### tei:choice with tei:sic and tei:corr marks faulty text and its correction.
+               the text in tei:sic is wrong in some way and corrected by tei:corr.
+               corrections without @resp should be distinguished from the ones that have it (it marks corrections by modern editors).
+               both the text of tei:sic and tei:corr should be provided, while it should be clear that the one of tei:sic is invalid.
+               idea: striked through text of tei:sic and corrected text in regular styling
+               -->
+               <choice>
+                     <sic>بعقوريته</sic>
+                     <corr>عقوريته</corr>
+                  </choice>
+                  <choice>
+                     <sic>بعقوريته</sic>
+                     <corr resp="#sb">عقوريته</corr>
+                  </choice>
+               </ab>
+               <ab>فقالوا له ادخل ادبح للالهه واستجير بهم</ab>
+               <ab>لعلهم يرزقوك ولدًا. ففعل كما قالوا له. وقدم</ab>
+               <ab>القرابين للاصنام واستغاث بهم. وتضرّع اليهم</ab>
+               <ab>بالطلبه والدعا. فلم يجيبوه بكلمه. فخرج</ab>
+               <ab>يحزان ندمان خايب وانصرف متالم القلب. ورجع</ab>
+               <ab>بالتضرع الى الله تعالى. وامن واستعان به بحرقة</ab>
+               <ab>قلب قايلًا. يا الاه السما والارض. يا خالق</ab>
+               <!-- ### lines of verse should be distinguished from the running text.
+               a common way to mark this some kind of margin on the top and bottom as well as on the side. 
+               idea: a blank line before and after the line groups with padding on the side (side depends on reading direction?) -->
+               <lg>
+                  <l>هل <add place="below">اختبار</add> أقارنك بيوم صيفي؟</l>
+                  <l>انت أكثر جميلة وأكثر اعتدالا<surplus>:</surplus>
+                        </l>
+               </lg>
+               <!-- ### colophons should be set apart and emphasized visually from the regular text.
+               idea: different colour. -->
+               <ab>
+                        <seg type="colophon">. نهاية<add place="footer">اختبار</add>
+                  النص</seg>وماتت.</ab>
+
+               <!-- ### it should be somehow clear for users that they're viewing a vacant page (i.e. a page without content).
+               otherwise they'll assume that something went wrong.
+               in printed editions a common way of indicating that a text (such as "vacant page") isn't part of the edition is to make it italic or the like.
+               of course other styling is possible.
+               however, it should be clear that this is editorial text, not text of the manuscript. 
+               idea: text "[vacat]"" in italics -->
+               <pb n="82b"/>
+               <pb n="83a"/>
+               <!-- ### quotes should marked by a visual cue.
+               however, simply inserting glyphs like quotation marks isn't possible since it could indicate that these are part of the text.
+               this doesn't hold if (by some means) it is clear to the user that these glyphs aren't part of the running text.
+               idea: quotation marks in lighter color -->
+               <ab>الخلايق كلها.<quote>كان كذلك ، لذا لم يكن كذلك.</quote> انا اطلب اليك ان
+                  توهبني</ab>
+               <!-- ### @rend says it all. -->
+               <ab>
+                        <del rend="strikethrough">ولدًا حتى اتعزا به ويرثني ويحضر بموتي</del>
+                    </ab>
+               <ab>ويغمض عيناي ويدفنني. فعند ذلك اتاه صوت</ab>
+               <ab/>
+               <ab>من السما قايلا. بحيث اتكلت اولًا على الاصنام</ab>
+               <ab>المنحوته. وقدمت لهم القرابين. لذلك</ab>
+               <ab>تبقا بلا ولد. بل ان <persName>نادان</persName> ابن اختك خذه</ab>
+               <!-- ### @rend says it all. -->
+               <ab rend="margin-top">واجعله لك ولدًا. وعلمه علمك وادبك وحكمتك</ab>
+               <ab>وهو يرثك. عند ذلك اخذ <persName>نادان</persName> ابن اخته وكان</ab>
+               <ab>صغير يرضع. فسلمه الى تمانية نسا مرضعات</ab>
+               <ab>ليرضعوه ويربوه. فربوه بالاكل الطيب والبسوه</ab>
+               <ab>الحرير والارجوان والقرمز وكان جلوسه على</ab>
+               <ab>الطنافس الحرير. فلما كبر <persName>نادان</persName> ومشى ونمى</ab>
+               <ab>مثل الارز العالي فعلمه الكتابه والقرااه</ab>
+               <ab>والتاديب والفلسفه. فلما كان بعض الايام</ab>
+               <ab>نظر <persName>سنحاريب</persName> الملك فراى <persName>حيقار</persName> وزيره</ab>
+               <ab>وكاتبه وهو قد بقى رجل شيخ كبير</ab>
+               <ab>فقال له ايها الصاحب المحب المكرم</ab>
+               <ab>الماهر المدبر الحكيم كاتبي ووزيري وكاتم</ab>
+               <ab>سري ومدبر دولتي. ها قد كبرت وطعنت في</ab>
+               <ab>السن<add place="interlinear">اختبار</add> وشخت. وقرب وقت موتك ووفاتك. فقول</ab>
+               <!-- ### tei:persName[@next] describes that a name begins at the end of a line and is continued at the beginning of the next line.
+               same holds for place names.
+               when highlighting entities these should be treated as one entity. -->
+               <ab>
+                        <persName next="#ms1">أ</persName>لي من يقوم في خدمتي بعدك. فقال له </ab>
+               <ab>
+                        <persName xml:id="ms1">حقر</persName>
+                    </ab>
+               <ab type="colophon">هذا حيث ينتهي النص.</ab>
+
+
+               <!-- @@@@ The following encoding has been taken directly from the source material. 
+               In case there are Karshuni passages, tei:seg has been added in order to comply with tei:text/@xml:lang @@@@ -->
+               <pb n="83b"/>
+
+
+               <!-- @@@ Brit.Mus._cod._Add._7209_Transcrip.karsh.3r14z.1.xml -->
+               <!-- persName spanning over two lines -->
+               <ab>وقال للسياف كان اسمه <persName next="#Brit.Mus_7209_2">يبوس</persName>
+                    </ab>
+               <ab>
+                        <persName xml:id="Brit.Mus_7209_2">ميكمسكينكنتي</persName> قوم خد
+                     <persName>حيقر</persName> وامضي</ab>
+
+               <!-- rubricated place and person names -->
+               <!-- ### CSS for renditions is stated in the TEI header -->
+               <ab>
+                        <hi rendition="#red">
+                            <placeName>مصر</placeName> الى عند
+                        <persName>فرعون</persName> الملك </hi> ولما</ab>
+
+               <!-- colophon -->
+               <ab type="colophon">والان كملت قصت <persName>حيقر</persName> الحكيم الفارسي</ab>
+
+
+
+               <!-- @@@ Brit._Libr._Or._2326.3r9pr.0.xml -->
+               <!-- illegible text -->
+               <ab>فتركهم وحزن وتالم <unclear reason="illegible">ܘܟܓܪܒ</unclear> بقوله</ab>
+
+
+
+               <!-- @@@ Cod._Add._2886._Transcript._karsh.3r1dp.1.xml -->
+               <!-- word spanning over two lines -->
+               <ab>وختمهم بختم خاله <persName>حيقار</persName> . واما</ab>
+               <ab>
+                        <lb break="no"/> هم في دار الملك ثم مضا ايضا وكتب</ab>
+
+               <!-- deletion, marginal gloss with entities -->
+               <ab>
+                  <del rend="strikethrough">صوته فيطرحون</del>
+                  <add place="margin">صهل في بلاد <placeName>اتور</placeName>
+                     <placeName>ونينوا</placeName> فسمعوا خيلنا صوته فطرحوا</add> فلما سمع
+                     <persName>حيقار</persName>
+               </ab>
+
+               <!-- gloss: above -->
+               <ab>قيل بالامثال من <add place="above">لا</add> يسمع من اذنيه</ab>
+
+
+
+               <!-- @@@ MS_orient_2652.Transcrip._karsh.3r1r2.1.xml -->
+               <!-- a colophon in verse. tei:lg is missing. -->
+               <l type="colophon">فيا سادتي رقّوا لعبدًا</l>
+               <l type="colophon">في ذنوبا لا يعدوا</l>
+               <l type="colophon">جا بالتقصير يسال</l>
+               <l type="colophon">ان تروا عيبا فسدّوا</l>
+
+
+
+               <!-- @@@ Mingana_Syriac_258.Transcrip._karsh.3r1pq.1.xml -->
+               <!-- gloss: inline -->
+               <ab>الرعيَّه. يا <add place="inline">ابني</add> اربعةً اخر العاقل والاحمق</ab>
+
+               <!-- untyped unclear, untyped damage -->
+               <!-- ### damaged passages can sometimes contain (reconstructed) text, other times the text is complete lost.
+               damages should be visible by the user as a part that is missing.
+               idea: background color, lighter text, ... -->
+               <ab>
+                  <add place="margin">هذا</add>
+                  <unclear>سطين</unclear> الحجر قدَّ حتى اخيط لكم هذا الحجر <damage>...</damage>
+               </ab>
+
+
+
+               <!-- @@@ Vat._sir._159._ff.293rb-299va._Transcrip.Karsh.3r1sv.1.xml -->
+               <!-- a page (shortened) with two columns (incl. numbering)-->
+               <pb n="297v"/>
+               <cb n="1"/>
+               <ab>بالعطاي وكبره وبعد يوم انا</ab>
+               <ab>
+                  <persName>حيقار</persName> بعثت الى <persName>اشفغني</persName> زوجتي</ab>
+               <ab>وقلت لها حال وصول اليكي</ab>
+               <ab>امري قولي للصيادين ان يصيدوا</ab>
+               <ab>لنا فرخين نسورا وقولي لصناع</ab>
+               <ab>القطن ان يفتلوا لنا شريطين</ab>
+               <ab>يكونوا غليظ صبع وطول الفين</ab>
+               <ab>ذراع والنجارين حتى ينجرون صناديق</ab>
+               <ab>كبار واعطي <persName>نبوحال</persName>
+                  <persName>وطبوليم</persName>
+               </ab>
+               <ab>لسبعة نسا مرضعة حتى يربوهم</ab>
+               <ab>واذبحي كليوم خاروف للنسورا</ab>
+               <ab>...</ab>
+
+               <cb n="2"/>
+               <ab>
+                  <persName>فرعون</persName> اكابره ان يلبسون ثياب</ab>
+               <ab>البرفير الاحمار والملك لبس</ab>
+               <ab>ثوب ارجاونى وجلس على كرسيه</ab>
+               <ab>وكل عظاماه قيام قدامه وامر</ab>
+               <ab>ادخلوني اليه قال لى يا <persName>ابيشام</persName>
+               </ab>
+               <ab>لمن اشبه انا واكابرى لمن</ab>
+               <ab>يشبهون قلت له تشبه انت</ab>
+               <ab>لبيل الصنم واكابرك يشبهون</ab>
+               <ab>لخدامه فقال لى امضي الى</ab>
+               <ab>منزلك وايضا قال اكابره بالغد</ab>
+               <ab>البسوا كلكم ثياب احمر وتجوا</ab>
+               <ab>...</ab>
+            </body>
+         </text>
+
+         <text xml:lang="karshuni" type="transcription">
+            <body>
+               <pb facs="textgrid:3r1nz" n="82a" xml:id="a1"/>
+               <cb/>
+               <!-- ### supplied text is text that modern editors have inserted.
+               it is usually marked with square brackets (LC).
+               idea: square brackets + lighter color -->
+               <head>
+                        <seg xml:lang="ara">
+                            <supplied>.</supplied>
+                            <add place="margin">حقًا</add>
+                        </seg>
+                        <g>✓</g>
+                  <!-- this rubrication can be found in BnF_434_rev.3r676.4.xml -->
+                  <hi rend="color(red)"> ܀ ܬܘܒ ܒܚܹܝܠ 
+                  <!-- ### since the abbreviated text is the running text, this should be rendered.
+                  the expansion should be accessible to users too, though.
+                  idea: insert icon after tei:abbr to indicate it's clickable + display expansion in another panel / modal -->
+                  <choice>
+                        <abbr>ܝܗ̈ܿ</abbr>
+                        <expan>ܝܗ</expan>
+                     </choice> ܟܿܬܒܢܐ ܩܲܠܝܼܠ ܡܼܢ ܡ̈ܬܼܠܐ <persName>ܕܐܚܝܼܩܲܪ܆</persName>
+                  </hi>
+                    </head>
+               <ab>ܢܒܬܕܝ ܒܥܘܢ ܐܠܒܐܪܝ<add place="interlinear">اختبار</add> ܬܥܐܠܝ ܓܠ ܐܣܡܗ</ab>
+               <ab>
+                        <lb break="no"/>ܘܬܥܐܠܝ ܕܟܪܗ ܐܠܝ ܐܠܐܒܕ. ܘܢܟܬܒ ܟܒܪ</ab>
+               <ab>ܐܠܚܟܝܡ ܐܠܡܐܗܪ <choice>
+                     <sic>ܐܠܦܠܝܘܣ</sic>
+                     <corr>ܐܠܦܠܝܣܘܦ</corr>
+                  </choice> ܐܠܫܐܛܪ</ab>
+               <ab>ܘܙܝܪ <persName>ܣܢܚܐܪܝܒ</persName> ܐܒܢ <persName>ܣܪܚܐܘܕܡ</persName> ܡܠܟ
+                     <placeName>ܐܬܘܪ</placeName>
+               </ab>
+               <ab>
+                  <placeName>ܘܢܝܢܘܝ</placeName>
+                  <placeName>ܘܐܠܡܘܨܠ</placeName> ܘܡܐ ܓܪܐ ܡܥܗ ܘܡܢ</ab>
+               <ab>ܐܒܢ ܐܟܬܗ <persName>ܢܐܕܐܢ</persName> . ܟܐܢ ܦܝ ܐܝܐܡ ܐܠܡܠܟ ܐܒܢ ܣܪܚܐܕܘܡ</ab>
+               <ab>ܡܠܟ ܐܪܜ <unclear reason="illegible">
+                            <placeName>ܐܬܘܪ</placeName>
+                        </unclear>
+                  <placeName>ܘܢܝܢܘܝ</placeName> ܘܒܠܐܕܗܐ. ܪܓܠ ܚܟܝܡ ܝܩܐܠ </ab>
+               <ab>ܠܗ <persName>ܚܝܩܐܪ</persName> ܘܟܐܢ ܘܙܝܪ ܐܠܡܠܟ <persName>ܣܢܚܐܪܝܒ</persName> ܘܟܐܬܒܗ
+                  ܘܟܐܢ</ab>
+               <ab>ܕܘ ܡܐܠ ܓܙܝܠ ܘܪܙܩ ܟܬܝܪ. ܘܟܐܢ ܡܐܗܪ ܚܟܝܡ ܦܝܠܣܘܦ</ab>
+
+               <cb/>
+               <ab type="head">
+                        <seg xml:lang="ara">رأس <add place="header">اختبار</add>متقاطع</seg>
+                    </ab>
+               <ab>ܕܘ ܡܥܪܦܗ ܘܪܐܝ ܘܬܕܒܝܪ. ܘܟܐܢ ܩܕ ܬܙܘܓ ܣܬܝܢ ܐܡܪܐܗ</ab>
+               <ab>ܘܒܢܝ ܠܟܠ ܘܐܚܕܗ ܡܢܗܢ ܡܩܨܘܪܗ. ܘܡܥ ܗܕܐ ܟܠܗ</ab>
+               <ab>ܠܡ ܝܟܢ ܠܗ ܘܠܕ ܝܪܬܗ. ܘܟܐܢ ܟܬܝܪ ܐܠܗܡ ܠܐܓܠ ܕܠܟ</ab>
+               <ab>ܘܐܢܗ ܦܝ ܕܐܬ ܝܘܡ ܓܡܥ ܐܠܡܢܓܡܝܢ ܘܐܠܣܚܪܗ</ab>
+               <ab>ܘܐܠܥܐܪܦܝܢ. ܘܐܫܟܐ ܠܗܡ ܚܐܠܗ ܘܐܡܪ <choice>
+                     <sic>ܒܥܩܘܪܝܬܗ</sic>
+                     <corr>ܥܩܘܪܝܬܗ</corr>
+                  </choice>
+                  <choice>
+                     <sic>ܒܥܩܘܪܝܬܗ</sic>
+                     <corr resp="#sb">ܥܩܘܪܝܬܗ</corr>
+                  </choice>
+               </ab>
+               <ab>ܦܩܐܠܘܐ ܠܗ ܐܕܟܠ ܐܕܒܚ ܠܠܐܠܗܗ ܘܐܣܬܓܝܪ ܒܗܡ</ab>
+               <ab>ܠܥܠܗܡ ܝܪܙܩܘܟ ܘܠܕܐ. ܦܦܥܠ ܟܡܐ ܩܐܠܘܐ ܠܗ. ܘܩܕܡ</ab>
+               <ab>ܐܠܩܪܐܒܝܢ ܠܠܐܨܢܐܡ ܘܐܣܬܓܐܬ ܒܗܡ. ܘܬܜܪܥ ܐܠܝܗܡ</ab>
+               <ab>ܒܐܠܛܠܒܗ ܘܐܠܕܥܐ. ܦܠܡ ܝܓܝܒܘܗ ܒܟܠܡܗ. ܦܟܪܓ</ab>
+               <ab>ܝܚܙܐܢ ܢܕܡܐܢ ܟܐܝܒ ܘܐܢܨܪܦ ܡܬܐܠܡ ܐܠܩܠܒ. ܘܪܓܥ</ab>
+               <ab>ܒܐܠܬܜܪܥ ܐܠܝ ܐܠܠܗ ܬܥܐܠܝ. ܘܐܡܢ ܘܐܣܬܥܐܢ ܒܗ ܒܚܪܩܗ̈</ab>
+               <ab>ܩܠܒ ܩܐܝܠܐ. ܝܐ ܐܠܐܗ ܐܠܣܡܐ ܘܐܠܐܪܜ. ܝܐ ܟܐܠܩ</ab>
+               <lg>
+                  <l>ܩܠܒ <add place="interlinear">اختبار</add> ܩܐܝܠܐ</l>
+                  <!-- ### surplus text should be set apart visually.
+                  a common way is setting the text in curly braces, but in addition to that other cues are possible (another color, different contrast?)
+                  idea: curly braces (LC) + lighter color, e.g. {some text} -->
+                  <l>ܩܠܒ ܩܐܝܠܐ <surplus>:</surplus>
+                        </l>
+               </lg>
+               <ab xml:lang="ara">
+                        <seg type="colophon">. نهاية<add place="footer">اختبار</add>
+                     النص</seg>وماتت.</ab>
+
+               <!-- ### catchwords should be set apart from the running text and de-emphasized. 
+               idea: lighter/other color-->
+               <ab>
+                        <catchwords>الخلايق كلها</catchwords>
+                    </ab>
+
+
+               <!-- random facsimile for invented empty page -->
+               <pb facs="textgrid:3r1p0" n="82b"/>
+               <pb facs="textgrid:3r1nz" n="83a" xml:id="a2"/>
+               <ab>ܐܠܟܠܐܝܩ ܟܠܗܐ.<quote>
+                            <seg xml:lang="ara">كان كذلك ، لذا لم يكن كذلك.</seg>
+                        </quote>
+                  ܐܢܐ ܐܛܠܒ ܐܠܝܟ ܐܢ ܬܘܗܒܢܝ</ab>
+               <ab>
+                        <del rend="strikethrough">ܘܠܕܐ ܚܬܝ ܐܬܥܙܐ ܒܗ ܘܝܪܬܢܝ ܘܝܚܜܪ ܒܡܘܬܝ</del>
+                    </ab>
+               <ab>ܘܝܓܡܜ ܥܝܢܐܝ ܘܝܕܦܢܢܝ. ܦܥܢܕ ܕܠܟ ܐܬܐܗ ܨܘܬ</ab>
+               <ab/>
+               <ab>ܡܢ ܐܠܣܡܐ ܩܐܝܠܐ. ܒܚܝܬ ܐܬܟܠܬ ܐܘܠܐ ܥܠܝ ܐܠܐܨܢܐܡ</ab>
+               <ab>ܐܠܡܢܚܘܬܗ. ܘܩܕܡܬ ܠܗܡ ܐܠܩܪܐܒܝܢ. ܠܕܠܟ </ab>
+               <ab>ܬܒܩܐ ܒܠܐ ܘܠܕ. ܒܠ ܐܢ <persName>ܢܐܕܐܢ</persName> ܐܒܢ ܐܟܬܟ ܟܕܗ</ab>
+               <ab rend="margin-top">ܘܐܓܥܠܗ ܠܟ ܘܠܕܐ. ܘܥܠܡܗ ܥܠܡܟ ܘܐܕܒܟ ܘܚܟܡܬܟ</ab>
+               <ab>ܘܗܘ ܝܪܬܟ. ܥܢܕ ܕܠܟ ܐܟܕ <persName>ܢܐܕܐܢ</persName> ܐܒܢ ܐܟܬܗ ܘܟܐܢ </ab>
+               <ab>ܨܓܝܪ ܝܪܜܥ. ܦܣܠܡܗ ܐܠܝ ܬܡܐܢܝܗ̈ ܢܣܐ ܡܪܜܥܐܬ</ab>
+               <ab>ܠܝܪܜܥܘܗ ܘܝܪܒܘܗ. ܦܪܒܘܗ ܒܐܠܐܟܠ ܐܠܛܝܒ ܘܐܠܒܣܘܗ</ab>
+               <ab>ܐܠܚܪܝܪ ܘܐܠܐܪܓܘܐܢ ܘܐܠܩܪܡܙ ܘܟܐܢ ܓܠܘܣܗ ܥܠܝ</ab>
+               <ab>ܐܠܛܢܐܦܣ ܐܠܚܪܝܪ. ܦܠܡܐ ܟܒܪ <persName>ܢܐܕܐܢ</persName> ܘܡܫܝ ܘܢܡܝ</ab>
+               <ab>ܡܬܠ ܐܠܐܪܙ ܐܠܥܐܠܝ ܦܥܠܡܗ ܐܠܟܬܐܒܗ ܘܐܠܩܪܐܐܗ</ab>
+               <ab>ܘܐܠܬܐܕܝܒ ܘܐܠܦܠܣܦܗ. ܦܠܡܐ ܟܐܢ ܒܥܜ ܐܠܐܝܐܡ</ab>
+               <ab>ܢܜܪ <persName>ܣܢܚܐܪܝܒ</persName> ܐܠܡܠܟ ܦܪܐܝ <persName>ܚܝܩܐܪ</persName> ܘܙܝܪܗ </ab>
+               <ab>ܘܟܐܬܒܗ ܘܗܘ ܩܕ ܒܩܝ ܪܓܠ ܫܝܟ ܟܒܝܪ</ab>
+               <ab>ܦܩܐܠ ܠܗ ܐܝܗܐ ܐܠܨܐܚܒ ܐܠܡܚܒ ܐܠܡܟܪܡ</ab>
+               <ab>ܐܠܡܐܗܪ ܐܠܡܕܒܪ ܐܠܚܟܝܡ ܟܐܬܒܝ ܘܘܙܝܪܝ ܘܟܐܬܡ</ab>
+               <ab>ܣܪܝ ܘܡܕܒܪ ܕܘܠܬܝ. ܗܐ ܩܕ ܟܒܪܬ ܘܛܥܢܬ ܦܝ </ab>
+               <ab>ܐܠܣܢ ܘܫܟܬ.<add place="interlinear">اختبار</add> ܘܩܪܒ ܘܩܬ ܡܘܬܟ ܘܘܦܐܬܟ. ܦܩܘܠ</ab>
+               <ab>ܠܝ ܡܢ ܝܩܘܡ ܦܝ ܟܕܡܬܝ ܒܥܕܟ. ܦܩܐܠ ܠܗ</ab>
+               <ab type="colophon">
+                        <seg xml:lang="ara">هذا حيث ينتهي النص.</seg>
+                    </ab>
+                <milestone unit="examples"/>
+
+               <!-- @@@@ The following encoding has been taken directly from the source
+                  material. In case there are Arabic passages, tei:seg with/or @xml:id has been added 
+                  in order to comply with tei:text/@xml:lang @@@@ -->
+               <!-- inserted random facsimile just to provide one -->
+               <pb facs="textgrid:3r85q" n="83b"/>
+
+               <!-- @@@ BnF_434_rev.3r676.4.xml -->
+               <!-- different type of rubrication -->
+               <ab>♰ <hi rend="color(red)">ܬܘܼܒ</hi>♰</ab>
+
+
+               <!-- @@@ Borg._Arab._201.3r7vv.0.xml -->
+               <!-- correction of a word -->
+               <ab xml:lang="ara">خدمتني وخدمت ابي <persName>سرحادوم</persName> كذلك يكون هذا ولدك
+                     <del rend="strikethrough">يكرمني</del>
+                  <add place="above">يخدمني</add>
+               </ab>
+
+
+
+               <!-- @@@ Brit._Lib._Add._7200.3r131.1.xml -->
+               <!-- damaged text with supplied -->
+               <!--- ### since the text in tei:orig is the running text, it should be displayed.
+               the text of supplied should, however, be available, too.
+               idea: cf. tei:abbr/tei:expan? -->
+               <ab>
+                        <damage>
+                     <orig>[܂]ܢܬ [܂܂܂]ܡܪ</orig>
+                     <supplied>ܫܢܬ ܐܬܐܡܪ</supplied> ܗܼܘܐ ܠܝܼ܂ </damage>
+               </ab>
+
+               <!-- several damaged words in a line -->
+               <ab>
+                  <damage>
+                     <orig>unclear</orig>
+                     <supplied>ܘܬܚܙܐ ܐܢܬܬܐ ܕܣܩܝܠܐ</supplied>
+                  </damage> ܘܡܨܒܬܐ܇ <damage>
+                     <orig>ܠ[܂] ܬܪܓܝ[܂]</orig>
+                     <supplied>ܠܐ ܬܪܓܝܗܿ</supplied>
+                  </damage>
+               </ab>
+
+
+
+               <!-- @@@ Brit._Libr._Or._2326.3r9pr.0.xml -->
+               <!-- rubrication with switiching language -->
+               <ab>
+                  <hi rendition="#red">
+                     <seg xml:lang="ara"> نبتدي بعون الله </seg> ܘܢܟܬܒ ܩܨܗ̈</hi>
+               </ab>
+
+
+               <!-- @@@ Cambridge_Add._2020.3r82k.1.xml -->
+               <!-- omitted text -->
+               <!-- ### there is probably no need to indicate the reason for the supplied text.
+               it could be serialized as tei:supplied without an attribute -->
+               <ab> ܥܲܝܢܹܗ ܢܕܲܒܲܪ ܒܲܝܬܹܿܗ܀ ܒܹܪܝ ܛܵܒܼ ܥܘܝܼܪ <supplied rend="omission">ܒܥܲܝܢ̈ܘܗܝ</supplied> ܡܼܢ ܗܵܘܿ ܕܲܥܘܝܼܪ </ab>
+
+               <!-- gloss: below -->
+               <ab> ܠܲܝܬܿ ܠܹܗ܂ ܘܛܵܒܼܘܼ ܩܵܠܐ ܕܐܘܼܠ̈ܝܬܼܵܐ ܒܐܹܕ̈ܢܲܝ ܣܲܟܼܠܵܐ܉ <add place="below">ܡܢ</add> ܙܡܵܪܵܐ </ab>
+
+               <!-- damaged text with entity and illegible text -->
+               <ab>
+                  <damage>
+                     <persName>ܣܿܢܚܹܪܝܼܒܼ</persName> ܡܵܪܝ <unclear reason="illegible">ܠ܂܂܂</unclear>
+                     <unclear reason="illegible">܂܂܂܂</unclear> ܘܪܵܘܪ̈ܒܼܵܢܵܘܗܝ ܠܒܲܪ̈ܩܹܐ </damage>
+               </ab>
+
+
+
+               <!-- @@@ Cambrigde_Add_3497.3rb41.0.xml -->
+               <!-- place name spanning over two lines -->
+               <ab xml:lang="ara">والعساكر وانطلقوا الى الصحره الى <placeName next="#Cambrigde_Add_3497_1">بقعة</placeName>
+               </ab>
+               <ab xml:lang="ara">
+                  <placeName xml:id="Cambrigde_Add_3497_1">نسرين</placeName> فلما وصلوا فنظر الملك
+                  الى <persName>حيقار</persName>
+               </ab>
+
+
+
+               <!-- @@@ Cod._Add._2886._Transcript._karsh.3r1dp.1.xml -->
+               <!-- head-like line -->
+               <ab type="head">ܟܪܐܣ ܥܐܫܪ</ab>
+
+
+
+               <!-- @@@ DFM_00614.3rbm8.0.xml -->
+               <!-- several corrections in a line -->
+               <ab xml:lang="ara">والأن <del rend="strikethrough">فبقي</del>
+                  <add place="below">بقى</add>
+                  <del rend="strikethrough">أمرادني</del>
+                  <add place="below">اريد</add> منك <del rend="strikethrough">حتى</del>
+                  <add place="below">ان</add> تبني <del rend="strikethrough">لك</del>
+                  <add place="below">لي</add>
+               </ab>
+
+
+
+               <!-- @@@ GCAA_00486.3rbmb.0.xml -->
+               <!-- rubricated supplied -->
+               <!-- ### while the text within tei:hi should be rubricated, the potential sigla ([...]) should not. -->
+               <ab xml:lang="ara">
+                  <supplied>
+                     <hi rendition="#red">يا بني</hi>
+                  </supplied> لا تكون مثل شجرة اللوز لانها</ab>
+
+               <!-- usage of tei:gap -->
+               <!-- ### tei:gap indicates some white space on a page.
+               idea: add standardized white space (15px?) when rendering this element-->
+               <ab xml:lang="ara">ولا تبادر برد الجواب <gap reason="invisible"/> لا</ab>
+
+               <!-- usage of tei:gap -->
+               <ab>
+                  <gap reason="lost"/>
+               </ab>
+
+
+
+               <!-- @@@ MS_orient_2652.Transcrip._karsh.3r1r2.1.xml -->
+               <!-- addition within rubrication -->
+               <!-- ### as in GCAA_00486.3rbmb.0.xml, potential sigla that created while serializing tei:add shouldn't be rubricated -->
+               <ab>
+                  <hi rendition="#red">ܦܩܐܠ ܠܗ ܣܝܕܝ <add place="margin">ܝܫܒܗ</add> ܐܠܐܗ ܐܠܣܡܐ
+                     ܘܐܟܐܒܪܗ</hi>
+               </ab>
+
+
+
+               <!-- @@@ Mingana_Arabic_Christian_93_(84).3r7tv.1.xml -->
+               <!-- choice within colophon -->
+               <ab type="colophon" xml:lang="ara">فيها هكذا وجدنا وكتبنا والله <choice>
+                     <sic>لهو</sic>
+                     <corr>له</corr>
+                  </choice> المجد والشكر الي الابد امين</ab>
+
+
+
+               <!-- @@@ Mingana_Syriac_258.Transcrip._karsh.3r1pq.1.xml -->
+               <!-- choice within marginal gloss -->
+               <ab>
+                  <add place="margin">
+                     <choice>
+                        <sic>ܦܫܐܚܬܗ</sic>
+                        <corr>ܦܚܐܫܬܗ</corr>
+                     </choice>
+                  </add> ܐܠܪܕܝܗ ܝܐ ܐܒܢܝ ܐܩܬܢܝ ܠܟ ܬܘܪ</ab>
+
+
+
+               <!-- @@@ Mingana_Syriac_433.3r8m5.0.xml -->
+               <!-- unclear with @reason -->
+               <!-- ### the reason for an unclear passage could be part of the annotations.
+               if not, it shouldn't be rendered in a special way.
+               idea: cf. regular tei:unclear -->
+               <ab>ܘܟܼܠܡܿܢ ܕܢܹܥܒܲܪ ܥܠܸܝܗܿ <unclear reason="eccentric_ductus">ܘܕܵܐܹܫ</unclear> ܠܵܗܿ
+                  ܐܵܟܹܿܠ ܡܼܢ </ab>
+
+               <!-- choice within entity -->
+               <ab>ܠܙܿܠܝܼܩܵܘ̈ܗܝ܂ ܘܬܼܘܼܒܼ ܐܡܼܪ ܠܝܼ܂ ܙܸܠ <persName>
+                     <choice>
+                        <sic>ܐܲܒܼܝܼܩܵܡ܂</sic>
+                        <corr resp="#sb">ܐܲܒܼܝܼܩܲܡ܂</corr>
+                     </choice>
+                  </persName>
+               </ab>
+
+
+
+               <!-- @@@ Nau.3r9f0.0.xml -->
+               <!-- damage with orig/supplied -->
+               <ab>ܫܬܿܝܼܢ܂ ܘܲܒܼܢܝܹܬ ܠܗܹܝܢ ܒܝܼܪ̈ܬܼܵܐ <damage>
+                     <orig>[܂܂܂]ܢ܂</orig>
+                     <supplied>ܫܬܝܢ܂</supplied>
+                  </damage>
+               </ab>
+
+               <!-- gloss: footer -->
+               <ab>ܗܘܹ̇ܝܬܿ ܠܝܼ <add rend="footer">ܐܲܝܟܼ</add> ܐܲܪܝܵܐ ܕܲܚܙܵܐ ܚܡܵܪܵܐ ܒܥܸܕܵܢ ܨܲܦ </ab>
+
+               <!-- damaged catchwords -->
+               <ab>ܨܠܘܿܬܼܵܟܼ܂ ܘܠܵܐ ܢܫܲܠܸܡ ܥܲܡܵܟ ܒܛܲܒܼܬܼܵܐ܂ ܐܘܿ ܒܹܪܝ <catchwords>
+                     <damage extent="two words">
+                        <supplied>ܗܘܿܝܬ ܠܝ</supplied>
+                     </damage>
+                  </catchwords>
+               </ab>
+
+
+
+               <!-- @@@ Paris._ar._3656.3r9wg.1.xml -->
+               <!-- usage of tei:space -->
+               <!-- ### idea_ cf. tei:gap -->
+               <l type="colophon" xml:lang="ara">ساداتي رقوا لعبدٍ<space> </space>في ذنوب لا يعدوا</l>
+
+
+
+               <!-- @@@ Paris_BnF_422.3r8qp.0.xml -->
+               <!-- colophon with catchwords following -->
+               <ab>ܘܡܹܚܑܼܓܲܪ ܒܗܵܘܬܼܵܐ ܫܝܘܿܠܵܝܬܿܐ܇ <seg type="colophon">ܗܵܪܟܿܐ</seg>
+                  <catchwords>ܫܸܠܡܲܬܸ</catchwords>
+               </ab>
+
+
+
+               <!-- @@@ SCAA_7229.3r677.1.xml -->
+               <!-- tei:add with @xml:lang. this actually appears within a heading which
+               has been altered to tei:ab to be compliant with the schema. -->
+               <ab> ܦܘܩܕ̈ܢܐ <persName>ܕܚܝܩܪ</persName> ܚܟܝܡܐ ܕܠܘܬ <persName>ܢܵܕܵܢ</persName> ܒܪ ܚܬܗ
+                     <add xml:lang="ara">النقط مكان تفويت</add>
+               </ab>
+
+
+
+               <!-- @@@ Sado_9_Ahiqar_Transkr.3r670.2.xml -->
+               <!-- damage with sic/supplied -->
+               <ab> ܒܼܪܵܐ ܠܵܐ܇ ܒܢܲܝܢܲܫ̈ܐܵ܇ ܕܗܵܐ ܠܵܡ <persName>ܐܲܚܝܼܩܲܪ</persName> ܟܐܹܢܵܐ ܘܛܵܒܼܵܐ
+                  ܘܲܦܠܲܚ <damage>
+                     <sic>ܠܐܲܠܗܵ</sic>
+                     <supplied>ܠܐܲܠܗܵܐ</supplied>
+                  </damage>
+               </ab>
+
+               <!-- addition with @cause -->
+               <!-- ### reasons or causes that are (in)directly stated as XML attributes shouldn't be rendered in a special way.
+               they are potential material for annotations but too specific to be rendered.
+               this also holds for the following elements. -->
+               <ab>
+                  <damage> ܒܝܼܪܬܵܐ ܚܕܵܐ ܐܝܼܬ ܠܝܼ <add cause="handshift" place="below"> ܒܝܪܬܐ ܚܕܐ
+                     </add>
+                  </damage> ܕܐܸܒܢܸܐ ܒܲܫܡܲܝܵܐ ܠܐܲܪܥܵܐ ܚܙܝܼ ܫܲܕܲܪ ܠܝܼ ܓܲܒܼܪܵܐ </ab>
+
+               <!-- complex damage -->
+               <ab> ܡܼܢ <damage>
+                     <choice>
+                        <sic>unclear</sic>
+                        <corr>
+                           <add cause="handshift" place="below">ܕܘܼܟܝܿܬܗ̈ܝܢ </add>
+                        </corr>
+                     </choice>
+                  </damage> ܘܫܛܘܝܬ <choice>
+                     <sic>ܓܓܠܐ</sic>
+                     <corr>ܓܝܓܠܐ</corr>
+                  </choice> ܒܪܹ̈ܓܠܝܼܗܘܢ ܒܡܫܘܚܬܐ ܐܪܟܐܼ </ab>
+
+
+
+               <!-- @@@ Sbath_25_ff._1v-46r.3r7sj.0.xml -->
+               <!-- usage of @reason = 'faded' -->
+               <ab xml:lang="ara">الذي رفع السماء <unclear reason="faded">ما</unclear> يقدر يبني</ab>
+
+               <!-- surplus with @reason -->
+               <ab xml:lang="ara">عنَّا <surplus reason="repeated">اعجلوا الينا في الحجاره</surplus>
+               </ab>
+
+
+
+               <!-- @@@ Transcr_BL_Or_2313.3r688.0.xml -->
+               <!-- complex damage -->
+               <ab>
+                  <damage>
+                     <orig>[܂܂]ܛܿܪܬ</orig>
+                     <supplied>unknown</supplied> ܓܪ̈ܓܐ <choice>
+                        <sic>ܒܪܓܠܝܗܘܢ܂</sic>
+                        <corr resp="#sb">ܒܪ̈ܓܠܝܗܘܢ܂</corr>
+                     </choice>
+                  </damage>
+               </ab>
+
+               <!-- complex damage -->
+               <ab>
+                  <damage>
+                     <orig>ܐܙ[܂܂]</orig>
+                     <supplied>unknown</supplied>
+                     <add place="above">ܗܘ</add> ܕܝܢ ܗܼܒ ܠܝ ܡܠܟܐ </damage>
+               </ab>
+
+
+
+               <!-- @@@ Transcription_Harv_80_complete.3r674.2.xml -->
+               <!-- note added as margin gloss -->
+               <!-- ### notes should be marked in some way since they have been added to the text later.
+               sometimes different scribes can be distinguished.
+               this is indicated by the @hand attribute.
+               idea: different color per hand -->
+               <ab> ܘܪܒܼܐ ܒܪܝ ܘܫܘܼܚ ܐܝܟ ܐܪܢܐ܂ <add place="margin">
+                     <note>ܟܬܘܒܼܐ ܡܬܼܚܫܒ ܠܗܿ ܐܪܢܐ ܐܘ ܐܪܙܐ</note>
+                  </add> ܘܟܼܕ ܪܒܼܐ ܐܠܦܬܿܗ </ab>
+
+               <!-- two notes by different writers in margin gloss -->
+               <ab>
+                  <persName>ܣܪܚܕܘܡ</persName>
+                  <add place="below">
+                     <note>ܒܐܨܚܬܐ ܐܚܪܝܬܐ ܣܲܪܚܵܠܝܼܡ܂</note>
+                     <note hand="S5">ܣܒ ܚܠܝܡ</note>
+                  </add> ܐܒܼܝ܆ ܘܩܕܡܝ ܐܬܼܦܪܥ܂ ܘܐܩܝܡ </ab>
+
+               <!-- three notes by different writers in gloss below -->
+               <ab> ܠܐ ܬܣܪܘܚ܆ ܘܥܡ ܣܪܘܚܐ ܬܬܼܚܟܡ܂ <add place="below">
+                     <note>ܒܐܨ܆ ܐܚܪ܆ ܠܐ ܬܬܼܚܟܡܼ</note>
+                     <!-- I think this has to be encoded with tei:seg@xml:lang = 'la' -->
+                     <note hand="S4">om.</note>
+                     <note hand="S6">habet</note>
+                  </add> ܒܪܝ </ab>
+
+               <!-- marginal gloss with note and some more text -->
+               <ab> ܘܪܘܪ̈ܒܼܢܝܟ <add place="margin">
+                     <note>ܡܢܗܿ܂ ܥܠ ܗܕܐ ܟܬܼܒܬܼ ܠܗ ܡܼܢ ܐܨܚܬܐ ܐܚܪܬܐ܂</note>
+                  </add> ܠܟܼܘܟܒܼ̈ܐ܀ ܘܐܡܼܪ ܠܝ ܙܠ <persName>ܐܒܿܝܩܡ</persName> ܘܠܨܦܪܐ </ab>
+
+
+
+               <!-- @@@ Transkription_Sachau_162_neu.3r672.1.xml -->
+               <!-- supplying an entity -->
+               <ab> ܒܫ̈ܢܝ <persName>ܣܢܚܪܝܒ</persName> ܡܠܟܐ <placeName>ܕܐܬܘܪ</placeName>
+                  <damage>
+                     <orig>ܘܕܢ</orig>
+                     <supplied>
+                        <placeName>ܘܕܢܝܢܘܐ</placeName>
+                     </supplied>
+                  </damage>
+               </ab>
+
+               <!-- usage of tei:g -->
+               <!-- ### for tei:g[@type = 'quotation-mark'] said glyph should be provided -->
+               <ab> ܡܢ ܕܠܡܠܦܘ ܠܒܪܝ <persName>ܢܕܢ܂</persName> ܥܕܡܐ <g type="quotation-mark"/>
+               </ab>
+
+               <!-- usage of tei:g in damaged area-->
+               <ab>ܠܘܙܐ ܕܠܘܩܕܡ ܡܦܪܥ ܘܠܚܪܬܐ <damage>
+                     <g type="quotation-mark"/>
+                  </damage>
+                    </ab>
+
+               <!-- addition with unknown type -->
+               <ab> ܘܗܦܟܬ ܛܥܢܬ ܐܰܒܵܪܐ ܘܠܐ ܐܝܼܩܰܪ ܥܠܝ <add place="sidelong">ܐܝܟ</add>
+               </ab>
+               
+               <pb facs="textgrid:3r85r" n="84a"/>
+               <ab>some test text</ab>
+              <ab>some test<persName>ܢܕܢ܂</persName></ab>
+            </body>
+         </text>
+      </group>
+   </text>
+</TEI>
\ No newline at end of file
diff --git a/exist-app/data/sample_teixml_3_meta.xml b/exist-app/data/sample_teixml_3_meta.xml
new file mode 100644
index 0000000..69132f1
--- /dev/null
+++ b/exist-app/data/sample_teixml_3_meta.xml
@@ -0,0 +1,19 @@
+<MetadataContainerType xmlns="http://textgrid.info/namespaces/metadata/core/2010" xmlns:ns2="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <object>
+        <generic>
+            <provided>
+                <title>Beispieldatei zum Testen</title>
+                <format>text/xml</format>
+                <notes/>
+            </provided>
+            <generated>
+              <textgridUri extRef="">textgrid:sample_teixml.0</textgridUri>
+            </generated>
+        </generic>
+        <item/>
+        <custom>
+            <cns:templateEditor xmlns:tgs="http://www.textgrid.info/namespaces/middleware/tgsearch" xmlns:tg="http://textgrid.info/relation-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cns="http://textgrid.info/custom-namespace/2009-01-01" xmlns:ns4="http://textgrid.info/namespaces/middleware/tgcrud/services/TGCrudService" xmlns:ns3="http://textgrid.info/namespaces/metadata/core/2010"/>
+        </custom>
+        <relations/>
+    </object>
+</MetadataContainerType>
-- 
GitLab


From 0f60ff657b1b49f890e9a395f35f3464179efb81 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 10:57:49 +0100
Subject: [PATCH 123/155] fix: file names

---
 exist-app/data/{sample_teixml_2.xml => sample_2_teixml.xml}     | 0
 .../data/{sample_teixml_2_meta.xml => sample_2_teixml_meta.xml} | 0
 exist-app/data/{sample_teixml_3.xml => sample_3_teixml.xml}     | 0
 .../data/{sample_teixml_3_meta.xml => sample_3_teixml_meta.xml} | 0
 exist-app/data/sample_edition_arabic.xml                        | 2 +-
 exist-app/data/sample_edition_karshuni.xml                      | 2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename exist-app/data/{sample_teixml_2.xml => sample_2_teixml.xml} (100%)
 rename exist-app/data/{sample_teixml_2_meta.xml => sample_2_teixml_meta.xml} (100%)
 rename exist-app/data/{sample_teixml_3.xml => sample_3_teixml.xml} (100%)
 rename exist-app/data/{sample_teixml_3_meta.xml => sample_3_teixml_meta.xml} (100%)

diff --git a/exist-app/data/sample_teixml_2.xml b/exist-app/data/sample_2_teixml.xml
similarity index 100%
rename from exist-app/data/sample_teixml_2.xml
rename to exist-app/data/sample_2_teixml.xml
diff --git a/exist-app/data/sample_teixml_2_meta.xml b/exist-app/data/sample_2_teixml_meta.xml
similarity index 100%
rename from exist-app/data/sample_teixml_2_meta.xml
rename to exist-app/data/sample_2_teixml_meta.xml
diff --git a/exist-app/data/sample_teixml_3.xml b/exist-app/data/sample_3_teixml.xml
similarity index 100%
rename from exist-app/data/sample_teixml_3.xml
rename to exist-app/data/sample_3_teixml.xml
diff --git a/exist-app/data/sample_teixml_3_meta.xml b/exist-app/data/sample_3_teixml_meta.xml
similarity index 100%
rename from exist-app/data/sample_teixml_3_meta.xml
rename to exist-app/data/sample_3_teixml_meta.xml
diff --git a/exist-app/data/sample_edition_arabic.xml b/exist-app/data/sample_edition_arabic.xml
index e56ab68..7f5d48e 100644
--- a/exist-app/data/sample_edition_arabic.xml
+++ b/exist-app/data/sample_edition_arabic.xml
@@ -1,5 +1,5 @@
 <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
     <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_edition_arabic.0">
-        <ore:aggregates rdf:resource="textgrid:sample_teixml_2"/>
+        <ore:aggregates rdf:resource="textgrid:sample_2_teixml"/>
     </rdf:Description>
 </rdf:RDF>
\ No newline at end of file
diff --git a/exist-app/data/sample_edition_karshuni.xml b/exist-app/data/sample_edition_karshuni.xml
index 87c749b..bbb86e5 100644
--- a/exist-app/data/sample_edition_karshuni.xml
+++ b/exist-app/data/sample_edition_karshuni.xml
@@ -1,5 +1,5 @@
 <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
     <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_edition_karshuni.0">
-        <ore:aggregates rdf:resource="textgrid:sample_teixml_3"/>
+        <ore:aggregates rdf:resource="textgrid:sample_3_teixml"/>
     </rdf:Description>
 </rdf:RDF>
\ No newline at end of file
-- 
GitLab


From 2a0bd55b4c5705e1548e06a10fe3d28f145982bf Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 11:09:33 +0100
Subject: [PATCH 124/155] feat: adjust map to views (syriac or arabic-karshuni)

---
 .../modules/AnnotationAPI/annotations.xqm     | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/exist-app/modules/AnnotationAPI/annotations.xqm b/exist-app/modules/AnnotationAPI/annotations.xqm
index 146953b..590a6bd 100644
--- a/exist-app/modules/AnnotationAPI/annotations.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations.xqm
@@ -29,6 +29,14 @@ declare variable $anno:annotationElements :=
         "persName"
     );
 
+declare variable $anno:lang-aggs := 
+    map {
+        "syriac": if (doc-available($commons:agg || "3r84g.xml")) then "3r84g" else "sample_lang_aggregation_syriac",
+        "arabic-karshuni":
+            if (doc-available($commons:agg || "3r84h.xml")
+            and doc-available($commons:agg || "3r9ps.xml")) then ("3r84h", "3r9ps") else ("sample_lang_aggregation_arabic", "sample_lang_aggregation_karshuni")
+    };
+
 (: this variable holds a map with the complete project structure (excluding images) :)
 declare variable $anno:uris :=
     let $main-edition-object := 
@@ -38,14 +46,16 @@ declare variable $anno:uris :=
         else
             "sample_main_edition"
     
-    let $language-aggs := commons:get-available-aggregates($main-edition-object)
+    let $views := ("syriac", "arabic-karshuni")
     return
         map { $main-edition-object:
                 (: level 1: language aggregations :)
-                map:merge(for $lang in $language-aggs return
-                map:entry($lang, 
+                map:merge(for $view in $views return
+                map:entry($view, 
                     (: level 2 (key): editions associated to a language aggregation :)
                     map:merge(
+                        let $language-aggregates := anno:get-lang-aggregation-uris($view)
+                            for $lang in $language-aggregates return
                             let $editions := commons:get-available-aggregates($lang)
                             for $uri in $editions return
                                 (: level 2 (value): XML associated with edition :)
@@ -61,6 +71,11 @@ declare variable $anno:uris :=
         }
 ;
 
+declare function anno:get-lang-aggregation-uris($collection-type as xs:string)
+as xs:string+ {
+    $anno:lang-aggs?($collection-type)
+};
+
 (:~
  : A generic function for creating an W3C compliant Annotation Collection for a given resource.
  : 
-- 
GitLab


From 3928b51d5e9f4134de5ce2eaf615abbe11aabccf Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 11:12:42 +0100
Subject: [PATCH 125/155] tests: adjust to new data

---
 exist-app/tests/annotation-tests.xqm | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index 18f09df..815c33c 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -118,8 +118,8 @@ as element(tei:TEI) {
 };
 
 declare
-    %test:args("sample_main_edition") %test:assertEquals("66")
-    %test:args("sample_lang_aggregation_syriac") %test:assertEquals("66")
+    %test:args("sample_main_edition") %test:assertEquals("198")
+    %test:args("syriac") %test:assertEquals("66")
 function at:get-total-no-of-annotations($uri as xs:string) {
     anno:get-total-no-of-annotations($uri)
 };
@@ -161,9 +161,9 @@ as item()? {
 
 declare
     %test:args("sample_edition", "11")
-    %test:assertEquals("http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation/sample_edition/11/annotationPage.json")
+    %test:assertEquals("http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation_syriac/sample_edition/11/annotationPage.json")
     %test:args("sample_edition", "")
-    %test:assertEquals("http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationPage.json")
+    %test:assertEquals("http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation_syriac/sample_edition/annotationPage.json")
     %test:args("", "")
     %test:assertEmpty
 function at:get-prev-or-next-annotationPage-url($document as xs:string?,
@@ -213,8 +213,8 @@ as xs:string {
 declare
     %test:args("sample_edition", 
         "Beispieledition", 
-        "http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation/sample_edition/82a/annotationPage.json", 
-        "http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation/sample_edition/83b/annotationPage.json")
+        "http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation_syriac/sample_edition/82a/annotationPage.json", 
+        "http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation_syriac/sample_edition/83b/annotationPage.json")
     %test:assertXPath("map:get($result, 'annotationCollection') => map:get('label') = 'Ahikar annotations for textgrid:sample_edition: Beispieledition'")
     %test:assertXPath("map:get($result, 'annotationCollection') => map:get('x-creator') = 'Simon Birol, Aly Elrefaei'")
 function at:make-annotationCollection-map($uri as xs:string,
@@ -227,7 +227,7 @@ as map() {
 
 declare
     %test:args("sample_lang_aggregation_syriac", "sample_edition", "http://localhost:8080")
-    %test:assertXPath("map:get($result, 'annotationPage') => map:get('id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationPage/sample_lang_aggregation/sample_edition'")
+    %test:assertXPath("map:get($result, 'annotationPage') => map:get('id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationPage/sample_lang_aggregation_syriac/sample_edition'")
     %test:pending
 function at:make-annotationPage($collection as xs:string, 
     $manifest as xs:string,
@@ -324,7 +324,7 @@ as xs:string? {
 
 declare
     %test:args("sample_lang_aggregation_syriac", "sample_edition", "84a", "http://localhost:8080")
-    %test:assertEquals("http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationPage/sample_lang_aggregation/sample_edition-84a")
+    %test:assertEquals("http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationPage/sample_lang_aggregation_syriac/sample_edition-84a")
 function at:make-annotationPage-for-manifest-id($collection as xs:string,
     $document as xs:string,
     $page as xs:string,
@@ -354,7 +354,7 @@ as xs:string {
 
 declare
     %test:args("sample_lang_aggregation_syriac", "http://localhost:8080")
-    %test:assertEquals("http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationPage.json")
+    %test:assertEquals("http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation_syriac/sample_edition/annotationPage.json")
 function at:get-information-for-collection-object($collectionURI as xs:string,
     $server as xs:string)
 as xs:string {
@@ -390,3 +390,11 @@ function at:get-xmls-prev-in-collection($uri as xs:string)
 as xs:string* {
     anno:get-xmls-prev-in-collection($uri)
 };
+
+declare
+    %test:args("syriac") %test:assertEquals("sample_lang_aggregation_syriac")
+    %test:args("arabic-karshuni") %test:assertXPath("count($result) = 2 and $result = 'sample_lang_aggregation_arabic' and $result = 'sample_lang_aggregation_karshuni'")
+function at:get-lang-aggregation-uris($collection-type as xs:string)
+as xs:string+ {
+    anno:get-lang-aggregation-uris($collection-type)
+};
-- 
GitLab


From 5084e365e48a0b128bb869378d686e6e35ebad8e Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 11:14:17 +0100
Subject: [PATCH 126/155] tests: test for amount of annotations in
 arabic-karshuni

---
 exist-app/tests/annotation-tests.xqm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index 815c33c..794b66a 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -120,6 +120,7 @@ as element(tei:TEI) {
 declare
     %test:args("sample_main_edition") %test:assertEquals("198")
     %test:args("syriac") %test:assertEquals("66")
+    %test:args("arabic-karshuni") %test:assertEquals("132")
 function at:get-total-no-of-annotations($uri as xs:string) {
     anno:get-total-no-of-annotations($uri)
 };
@@ -397,4 +398,4 @@ declare
 function at:get-lang-aggregation-uris($collection-type as xs:string)
 as xs:string+ {
     anno:get-lang-aggregation-uris($collection-type)
-};
+};
\ No newline at end of file
-- 
GitLab


From 05cf264ed83769dd9af20eebaaeacb9456fc6ad5 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 11:16:12 +0100
Subject: [PATCH 127/155] refactor: update variable name

---
 exist-app/modules/AnnotationAPI/annotations.xqm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/exist-app/modules/AnnotationAPI/annotations.xqm b/exist-app/modules/AnnotationAPI/annotations.xqm
index 590a6bd..a811340 100644
--- a/exist-app/modules/AnnotationAPI/annotations.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations.xqm
@@ -124,22 +124,22 @@ as map() {
  : @see https://www.w3.org/TR/annotation-model/#annotation-collection
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
  : 
- : @param $collectionURI The URI of the current Collection Object
+ : @param $collection-type The type of the current Collection Object (syriac or arabic-karshuni)
  : @param The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  : @return A map with all information necessary for the Annotation Collection
  :)
-declare function anno:get-information-for-collection-object($collectionURI as xs:string,
+declare function anno:get-information-for-collection-object($collection-type as xs:string,
     $server as xs:string)
 as map() {
-    let $child-keys := anno:find-in-map($anno:uris, $collectionURI) => map:keys()
+    let $child-keys := anno:find-in-map($anno:uris, $collection-type) => map:keys()
     let $first := $child-keys[1]
     let $last := $child-keys[last()]
-    let $title := anno:get-metadata-title($collectionURI)
-    let $first-entry := $server || "/api/annotations/ahikar/" || $collectionURI || "/" || $first || "/annotationPage.json"
-    let $last-entry := $server || "/api/annotations/ahikar/" || $collectionURI || "/" || $last || "/annotationPage.json"
+    let $title := anno:get-metadata-title($collection-type)
+    let $first-entry := $server || "/api/annotations/ahikar/" || $collection-type || "/" || $first || "/annotationPage.json"
+    let $last-entry := $server || "/api/annotations/ahikar/" || $collection-type || "/" || $last || "/annotationPage.json"
 
     return
-        anno:make-annotationCollection-map($collectionURI, $title, $first-entry, $last-entry)
+        anno:make-annotationCollection-map($collection-type, $title, $first-entry, $last-entry)
 };
 
 
-- 
GitLab


From acd161cb730b147c6b6b28375fb3f526d9965d4a Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 11:31:12 +0100
Subject: [PATCH 128/155] feat: adjust AnnotationCollection Object title to new
 map structure

---
 exist-app/modules/AnnotationAPI/annotations.xqm | 10 +++++++++-
 exist-app/tests/annotation-tests.xqm            | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/exist-app/modules/AnnotationAPI/annotations.xqm b/exist-app/modules/AnnotationAPI/annotations.xqm
index a811340..459747e 100644
--- a/exist-app/modules/AnnotationAPI/annotations.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations.xqm
@@ -134,7 +134,7 @@ as map() {
     let $child-keys := anno:find-in-map($anno:uris, $collection-type) => map:keys()
     let $first := $child-keys[1]
     let $last := $child-keys[last()]
-    let $title := anno:get-metadata-title($collection-type)
+    let $title := anno:make-collection-object-title($collection-type)
     let $first-entry := $server || "/api/annotations/ahikar/" || $collection-type || "/" || $first || "/annotationPage.json"
     let $last-entry := $server || "/api/annotations/ahikar/" || $collection-type || "/" || $last || "/annotationPage.json"
 
@@ -142,6 +142,14 @@ as map() {
         anno:make-annotationCollection-map($collection-type, $title, $first-entry, $last-entry)
 };
 
+declare function anno:make-collection-object-title($collection-type as xs:string)
+as xs:string {
+    switch ($collection-type)
+        case "syriac" return "The Syriac Collection"
+        case "arabic-karshuni" return "The Arabic and Karshuni Collections"
+        default return error("ANNO01", "Unknown collection type " || $collection-type)
+};
+
 
 (:~
  : Returns a resource's title as given in the TextGrid metadata.
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index 794b66a..bd9e4dc 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -398,4 +398,12 @@ declare
 function at:get-lang-aggregation-uris($collection-type as xs:string)
 as xs:string+ {
     anno:get-lang-aggregation-uris($collection-type)
-};
\ No newline at end of file
+};
+
+declare
+    %test:args("syriac") %test:assertEquals("The Syriac Collection")
+    %test:args("arabic-karshuni") %test:assertEquals("The Arabic and Karshuni Collections")
+    %test:args("asdf") %test:assertError("ANNO01")
+function at:make-collection-object-title($collection-type as xs:string) {
+    anno:make-collection-object-title($collection-type)
+};
-- 
GitLab


From 75c357506aea627cc095ab568574ca74be638598 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 11:47:46 +0100
Subject: [PATCH 129/155] tests: fix test input

---
 exist-app/tests/annotation-tests.xqm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index bd9e4dc..10d35cf 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -354,8 +354,8 @@ as xs:string {
 };
 
 declare
-    %test:args("sample_lang_aggregation_syriac", "http://localhost:8080")
-    %test:assertEquals("http://localhost:8080/api/annotations/ahikar/sample_lang_aggregation_syriac/sample_edition/annotationPage.json")
+    %test:args("syriac", "http://localhost:8080")
+    %test:assertEquals("http://localhost:8080/api/annotations/ahikar/syriac/sample_edition/annotationPage.json")
 function at:get-information-for-collection-object($collectionURI as xs:string,
     $server as xs:string)
 as xs:string {
@@ -366,9 +366,9 @@ as xs:string {
 };
 
 declare
-    %test:args("sample_lang_aggregation_syriac", "sample_edition", "http://localhost:8080")
+    %test:args("syriac", "sample_edition", "http://localhost:8080")
     %test:assertXPath("$result instance of map()")
-    %test:args("sample_lang_aggregation_syriac", "", "http://localhost:8080")
+    %test:args("syriac", "", "http://localhost:8080")
     %test:assertXPath("$result instance of map()")
 function at:make-annotationCollection($collection as xs:string,
     $document as xs:string?,
-- 
GitLab


From cabe7d37b8fed733fd1d768bb32374917eaf03d9 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 13:37:04 +0100
Subject: [PATCH 130/155] refactor: make is-resource-xml more robust

---
 .../modules/AnnotationAPI/annotations.xqm     | 36 ++++++++++---------
 exist-app/tests/annotation-tests.xqm          | 18 ++++++++--
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/exist-app/modules/AnnotationAPI/annotations.xqm b/exist-app/modules/AnnotationAPI/annotations.xqm
index 459747e..2358461 100644
--- a/exist-app/modules/AnnotationAPI/annotations.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations.xqm
@@ -12,6 +12,7 @@ xquery version "3.1";
 
 module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations";
 
+declare namespace err = "http://www.w3.org/2005/xqt-errors";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace ore="http://www.openarchives.org/ore/terms/";
 declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";
@@ -147,7 +148,7 @@ as xs:string {
     switch ($collection-type)
         case "syriac" return "The Syriac Collection"
         case "arabic-karshuni" return "The Arabic and Karshuni Collections"
-        default return error("ANNO01", "Unknown collection type " || $collection-type)
+        default return anno:get-metadata-title($collection-type)
 };
 
 
@@ -166,29 +167,29 @@ as xs:string {
 (:~
  : Creates a map containing all information necessary for a W3C compliant Annotation Collection.
  : 
- : @param $uri The resource's URI
+ : @param $collection Either the type of the collection (syriac or arabic-karshuni) or the collection URI of an edition.
  : @param $title The resource's title
  : @param $first-entry The IRI of the first Annotation Page that is included within the Collection
  : @param $last-entry The IRI of the last Annotation Page that is included within the Collection
  :)
-declare function anno:make-annotationCollection-map($uri as xs:string,
+declare function anno:make-annotationCollection-map($collection as xs:string,
     $title as xs:string,
     $first-entry as xs:string,
     $last-entry as xs:string)
 as map() {
-    map {
-        "annotationCollection":
-            map {
-                "@context": "http://www.w3.org/ns/anno.jsonld",
-                "id":       $anno:ns || "/annotationCollection/" || $uri,
-                "type":     "AnnotationCollection",
-                "label":    "Ahikar annotations for textgrid:" || $uri || ": " || $title,
-                "x-creator":  anno:get-creator($uri),
-                "total":    anno:get-total-no-of-annotations($uri),
-                "first":    $first-entry,
-                "last":     $last-entry
-            }
-    }
+        map {
+            "annotationCollection":
+                map {
+                    "@context": "http://www.w3.org/ns/anno.jsonld",
+                    "id":       $anno:ns || "/annotationCollection/" || $collection,
+                    "type":     "AnnotationCollection",
+                    "label":    "Ahikar annotations for textgrid:" || $collection || ": " || $title,
+                    "x-creator":  anno:get-creator($collection),
+                    "total":    anno:get-total-no-of-annotations($collection),
+                    "first":    $first-entry,
+                    "last":     $last-entry
+                }
+        }
 };
 
 (:~
@@ -611,7 +612,8 @@ as xs:string? {
  : @return true() if resources stated by $uri is a TEI/XML resource
  :)
 declare function anno:is-resource-xml($uri as xs:string) as xs:boolean {
-    commons:get-document($uri, "meta")//tgmd:format = "text/xml"
+    doc-available($commons:data || $uri || ".xml")
+    and commons:get-document($uri, "meta")//tgmd:format = "text/xml"
 };
 
 (:~ 
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index 10d35cf..35f0ff2 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -206,6 +206,8 @@ as xs:string? {
 declare
     %test:args("sample_teixml") %test:assertEquals("Simon Birol, Aly Elrefaei")
     %test:args("sample_edition") %test:assertEquals("Simon Birol, Aly Elrefaei")
+    %test:args("syriac") %test:assertEquals("Simon Birol, Aly Elrefaei")
+    %test:args("arabic-karshuni") %test:assertEquals("Simon Birol, Aly Elrefaei")
 function at:get-creator($uri as xs:string)
 as xs:string {
     anno:get-creator($uri)
@@ -356,10 +358,10 @@ as xs:string {
 declare
     %test:args("syriac", "http://localhost:8080")
     %test:assertEquals("http://localhost:8080/api/annotations/ahikar/syriac/sample_edition/annotationPage.json")
-function at:get-information-for-collection-object($collectionURI as xs:string,
+function at:get-information-for-collection-object($collection-type as xs:string,
     $server as xs:string)
 as xs:string {
-    let $result := anno:get-information-for-collection-object($collectionURI, $server)
+    let $result := anno:get-information-for-collection-object($collection-type, $server)
     return
         map:get($result, "annotationCollection")
         => map:get("first")
@@ -403,7 +405,17 @@ as xs:string+ {
 declare
     %test:args("syriac") %test:assertEquals("The Syriac Collection")
     %test:args("arabic-karshuni") %test:assertEquals("The Arabic and Karshuni Collections")
-    %test:args("asdf") %test:assertError("ANNO01")
+    %test:args("sample_edition") %test:assertEquals("Beispieldatei zum Testen")
+    %test:args("asdf") %test:assertError("COMMONS002")
 function at:make-collection-object-title($collection-type as xs:string) {
     anno:make-collection-object-title($collection-type)
 };
+
+declare
+    %test:args("syriac") %test:assertEquals("sample_lang_aggregation_syriac")
+    %test:args("arabic-karshuni") %test:assertXPath("count($result) = 2 and $result = 'sample_lang_aggregation_arabic' and $result = 'sample_lang_aggregation_karshuni'")
+    %test:args("sample_edition") %test:assertEquals("sample_edition")
+function at:determine-uris-for-collection($collection as xs:string)
+as xs:string+ {
+    anno:determine-uris-for-collection($collection)
+};
\ No newline at end of file
-- 
GitLab


From f0b68f5df91ddc7437c93d0cc2fe23822e2be5cc Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 14:07:18 +0100
Subject: [PATCH 131/155] feat: finalize first draft for distinguishing views
 in AnnotationAPI

---
 .../modules/AnnotationAPI/annotations.xqm     | 17 ++++++++++++++--
 exist-app/tests/annotation-rest-tests.xqm     | 20 +++++++++----------
 exist-app/tests/annotation-tests.xqm          | 12 ++++++++++-
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/exist-app/modules/AnnotationAPI/annotations.xqm b/exist-app/modules/AnnotationAPI/annotations.xqm
index 2358461..e2425a8 100644
--- a/exist-app/modules/AnnotationAPI/annotations.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations.xqm
@@ -192,6 +192,15 @@ as map() {
         }
 };
 
+
+declare function anno:determine-uris-for-collection($collection as xs:string)
+as xs:string+ {
+    switch ($collection)
+        case "syriac" return $anno:lang-aggs?($collection)
+        case "arabic-karshuni" return $anno:lang-aggs?($collection)
+        default return $collection
+};
+
 (:~
  : Extracts the current edition's editor(s) from the TEI metadata.
  : In case the URI of a collection or edition is passed, the aggregated TEI/XML
@@ -289,7 +298,7 @@ declare function anno:make-annotationCollection-for-manifest($collection as xs:s
     $page as xs:string,
     $server as xs:string)
 as map() {
-    let $title := anno:get-metadata-title($collection)
+    let $title := anno:get-metadata-title($document)
 
     return
         map {
@@ -508,7 +517,11 @@ declare function anno:are-resources-available($resources as xs:string+)
 as xs:boolean {
     let $availability :=
         for $resource in $resources return
-            doc-available($commons:meta || $resource || ".xml")
+            if ($resource = ("syriac", "arabic-karshuni")) then
+                for $edition in $anno:lang-aggs?($resource) return
+                    doc-available($commons:meta || $edition || ".xml")
+            else
+                doc-available($commons:meta || $resource || ".xml")
     return
         not(functx:is-value-in-sequence(false(), $availability))
 };
diff --git a/exist-app/tests/annotation-rest-tests.xqm b/exist-app/tests/annotation-rest-tests.xqm
index f149748..1ea9594 100644
--- a/exist-app/tests/annotation-rest-tests.xqm
+++ b/exist-app/tests/annotation-rest-tests.xqm
@@ -24,7 +24,7 @@ declare
     %test:assertTrue
 function art:is-collection-annotationCollection-endpoint-http200()
 as xs:boolean {
-    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/annotationCollection.json"
+    let $url := $tc:server || "/annotations/ahikar/syriac/annotationCollection.json"
     return
         tc:is-endpoint-http200($url)
 };
@@ -43,7 +43,7 @@ declare
     %test:assertXPath("map:contains($result, 'id')")
 function art:endpoint-collection-annotationCollection()
 as item() {
-    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/annotationCollection.json"
+    let $url := $tc:server || "/annotations/ahikar/syriac/annotationCollection.json"
     let $req := <http:request href="{$url}" method="get">
                         <http:header name="Connection" value="close"/>
                    </http:request>
@@ -58,7 +58,7 @@ declare
     %test:assertTrue
 function art:is-document-annotationPage-endpoint-http200()
 as xs:boolean {
-    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationPage.json"
+    let $url := $tc:server || "/annotations/ahikar/arabic-karshuni/sample_edition/annotationPage.json"
     return
         tc:is-endpoint-http200($url)
 };
@@ -76,7 +76,7 @@ declare
     %test:assertXPath("map:contains($result, 'id')")
 function art:endpoint-document-annotationPage()
 as item() {
-    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationPage.json"
+    let $url := $tc:server || "/annotations/ahikar/syriac/sample_edition/annotationPage.json"
     let $req := <http:request href="{$url}" method="get">
                         <http:header name="Connection" value="close"/>
                    </http:request>
@@ -90,7 +90,7 @@ declare
     %test:assertTrue
 function art:is-document-annotationCollection-endpoint-http200()
 as xs:boolean {
-    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationCollection.json"
+    let $url := $tc:server || "/annotations/ahikar/arabic-karshuni/sample_edition_karshuni/annotationCollection.json"
     return
         tc:is-endpoint-http200($url)
 };
@@ -108,7 +108,7 @@ declare
     %test:assertXPath("map:contains($result, 'id')")
 function art:endpoint-document-annotationCollection()
 as item() {
-    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/annotationCollection.json"
+    let $url := $tc:server || "/annotations/ahikar/syriac/sample_edition/annotationCollection.json"
     let $req := <http:request href="{$url}" method="get">
                         <http:header name="Connection" value="close"/>
                    </http:request>
@@ -123,7 +123,7 @@ declare
     %test:assertTrue
 function art:is-item-annotationCollection-endpoint-http200()
 as xs:boolean {
-    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/83a/annotationCollection.json"
+    let $url := $tc:server || "/annotations/ahikar/arabic-karshuni/sample_edition_arabic/83a/annotationCollection.json"
     return
         tc:is-endpoint-http200($url)
 };
@@ -140,7 +140,7 @@ declare
     %test:assertXPath("map:contains($result, 'id')")
 function art:endpoint-item-annotationCollection()
 as item() {
-    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/83a/annotationCollection.json"
+    let $url := $tc:server || "/annotations/ahikar/syriac/sample_edition/83a/annotationCollection.json"
     let $req := <http:request href="{$url}" method="get">
                         <http:header name="Connection" value="close"/>
                    </http:request>
@@ -155,7 +155,7 @@ declare
     %test:assertTrue
 function art:is-item-annotationPage-endpoint-http200()
 as xs:boolean {
-    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/83a/annotationPage.json"
+    let $url := $tc:server || "/annotations/ahikar/arabic-karshuni/sample_edition_karshuni/83a/annotationPage.json"
     return
         tc:is-endpoint-http200($url)
 };
@@ -172,7 +172,7 @@ declare
     %test:assertXPath("map:contains($result, 'id')")
 function art:endpoint-item-annotationPage()
 as item() {
-    let $url := $tc:server || "/annotations/ahikar/sample_lang_aggregation/sample_edition/83a/annotationPage.json"
+    let $url := $tc:server || "/annotations/ahikar/syriac/sample_edition/83a/annotationPage.json"
     let $req := <http:request href="{$url}" method="get">
                         <http:header name="Connection" value="close"/>
                    </http:request>
diff --git a/exist-app/tests/annotation-tests.xqm b/exist-app/tests/annotation-tests.xqm
index 35f0ff2..2e5f239 100644
--- a/exist-app/tests/annotation-tests.xqm
+++ b/exist-app/tests/annotation-tests.xqm
@@ -37,6 +37,15 @@ as xs:boolean {
         anno:are-resources-available($resources)
 };
 
+declare
+    %test:assertTrue
+function at:are-resources-available-lang-collection-true()
+as xs:boolean {
+    let $resources := "syriac"
+    return
+        anno:are-resources-available($resources)
+};
+
 declare
     %test:assertFalse
 function at:are-resources-available-false()
@@ -98,9 +107,10 @@ as map() {
 };
 
 declare
-    %test:args("sample_lang_aggregation_syriac", "sample_edition", "82a", "http://localhost:8080")
+    %test:args("syriac", "sample_edition", "82a", "http://localhost:8080")
     %test:assertXPath("map:get($result, 'annotationCollection') => map:get('id') = 'http://ahikar.sub.uni-goettingen.de/ns/annotations/annotationCollection/sample_edition/82a'")
     %test:assertXPath("map:get($result, 'annotationCollection') => map:get('type') = 'AnnotationCollection'")
+    %test:assertXPath("map:get($result, 'annotationCollection') => map:get('label') = 'Ahikar annotations for textgrid:sample_edition: Beispieldatei zum Testen, page 82a'")
 function at:make-annotationCollection-for-manifest($collection as xs:string,
     $document as xs:string,
     $page as xs:string,
-- 
GitLab


From 7f0a0cbef1b41b15be6a64f023b2d3a8dad281d9 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 14:21:41 +0100
Subject: [PATCH 132/155] ci: update endpoint for status tests

---
 ci-scripts/.api_tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci-scripts/.api_tests.yml b/ci-scripts/.api_tests.yml
index 34e178a..f9c82b2 100644
--- a/ci-scripts/.api_tests.yml
+++ b/ci-scripts/.api_tests.yml
@@ -19,7 +19,7 @@ test_api_status-test:
     - tags
     - develop
   script:
-    - header=$(curl --head -s https://ahikar-test.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
+    - header=$(curl --head -s https://ahikar-test.sub.uni-goettingen.de/api/textapi/ahikar/arabic-karshuni/collection.json)
     - *check_HTTP_status
 
 test_api_status-develop:
@@ -27,7 +27,7 @@ test_api_status-develop:
   only:
     - develop
   script: 
-    - header=$(curl --head -s https://ahikar-dev.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
+    - header=$(curl --head -s https://ahikar-dev.sub.uni-goettingen.de/api/textapi/ahikar/arabic-karshuni/collection.json)
     - *check_HTTP_status
 
 test_api_status-main:
@@ -35,7 +35,7 @@ test_api_status-main:
   only:
     - main
   script: 
-    - header=$(curl --head -s https://ahikar.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
+    - header=$(curl --head -s https://ahikar.sub.uni-goettingen.de/api/textapi/ahikar/arabic-karshuni/collection.json)
     - *check_HTTP_status
   retry: 2
 
-- 
GitLab


From 65bc65b0000b2dafb3c97a117d73e2131fa66da5 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 15 Jan 2021 14:48:21 +0100
Subject: [PATCH 133/155] chore: switch from draft module to production

---
 exist-app/modules/draft-tapi-collection.xqm   | 133 -----------
 exist-app/modules/tapi-collection.xqm         | 111 ++++++----
 exist-app/modules/tapi.xqm                    |   3 +-
 exist-app/modules/testtrigger.xqm             |   2 -
 .../tests/draft-tapi-collection-tests.xqm     | 145 ------------
 exist-app/tests/tapi-collection-tests.xqm     | 208 +++++++-----------
 6 files changed, 143 insertions(+), 459 deletions(-)
 delete mode 100644 exist-app/modules/draft-tapi-collection.xqm
 delete mode 100644 exist-app/tests/draft-tapi-collection-tests.xqm

diff --git a/exist-app/modules/draft-tapi-collection.xqm b/exist-app/modules/draft-tapi-collection.xqm
deleted file mode 100644
index 4a05722..0000000
--- a/exist-app/modules/draft-tapi-collection.xqm
+++ /dev/null
@@ -1,133 +0,0 @@
-xquery version "3.1";
-
-module namespace d="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft";
-
-declare namespace ore="http://www.openarchives.org/ore/terms/";
-declare namespace rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
-
-import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
-
-declare variable $d:uris :=
-    map {
-        "syriac": if (doc-available($commons:agg || "3r84g.xml")) then "3r84g" else "sample_lang_aggregation_syriac",
-        "arabic-karshuni": (
-            if (doc-available($commons:agg || "3r9ps.xml")) then "3r9ps" else "sample_lang_aggregation_arabic",
-            if (doc-available($commons:agg || "3r84h.xml")) then "3r84h" else "sample_lang_aggregation_karshuni")
-    };
-    
-declare function d:get-uris($collection-type as xs:string)
-as xs:string+ {
-    map:get($d:uris, $collection-type)
-};
-
-
-declare function d:get-json($collection-type as xs:string,
-    $server as xs:string)
-as item()+ {
-    let $collection-string := d:get-collection-string($collection-type)
-    let $sequence := d:make-sequence($collection-type, $server)
-    let $annotationCollection-uri := d:make-annotationCollection-uri($server, $collection-type)
-    
-    return
-        <object>
-            <textapi>{$commons:version}</textapi>
-            <title>
-                <title>The Story and Proverbs of Ahikar the Wise</title>
-                <type>main</type>
-            </title>
-            <!-- this empty title element is necessary to force JSON to
-            generate an array instead of a simple object. -->
-            <title/>
-            <collector>
-                <role>collector</role>
-                <name>Prof. Dr. theol. Kratz, Reinhard Gregor</name>
-                <idref>
-                    <base>http://d-nb.info/gnd/</base>
-                    <id>115412700</id>
-                    <type>GND</type>
-                </idref>
-            </collector>
-            <description>{$collection-string} collection for the Ahiqar project. Funded by DFG, 2019–2020. University of Göttingen</description>
-            <annotationCollection>{$annotationCollection-uri}</annotationCollection>
-            {$sequence}
-        </object>
-};
-
-declare function d:get-collection-string($collection-type as xs:string)
-as xs:string {
-    switch ($collection-type)
-        case "syriac" return "Syriac"
-        case "arabic-karshuni" return "Arabic/Karshuni"
-        default return error("D001", "Unknown collection type " || $collection-type)
-};
-
-declare function d:make-sequence($collection-type as xs:string,
-    $server as xs:string)
-as element(sequence)+ {
-    let $uris := d:get-uris($collection-type)
-    let $aggregations := d:get-aggregations($uris)
-    let $allowed-manifest-uris := d:get-allowed-manifest-uris($aggregations)
-    for $manifest-uri in $allowed-manifest-uris return
-        let $manifest-metadata :=  commons:get-metadata-file($manifest-uri)
-        let $id := d:make-id($server, $collection-type, $manifest-uri)
-        let $type := d:make-format-type($manifest-metadata)
-        return
-            <sequence>
-                <id>{$id}</id>
-                <type>{$type}</type>
-            </sequence>
-};
-
-declare function d:get-aggregations($uris as xs:string+)
-as document-node()+ {
-    for $uri in $uris return
-        doc($commons:agg || $uri || ".xml")
-};
-
-declare function d:get-allowed-manifest-uris($aggregations as node()+)
-as xs:string+ {
-    let $not-allowed :=
-        (
-            "textgrid:3vp38"
-        )
-    let $allowed := 
-        for $aggregation-file in $aggregations return
-            for $aggregate in $aggregation-file//ore:aggregates return
-                $aggregate[@rdf:resource != $not-allowed]/@rdf:resource
-    return
-        for $uri in $allowed return
-            d:remove-textgrid-prefix($uri)
-};
-
-declare function d:remove-textgrid-prefix($uri as xs:string)
-as xs:string {
-    replace($uri, "textgrid:", "")
-};
-
-declare function d:make-id($server as xs:string,
-    $collection-type as xs:string,
-    $manifest-uri as xs:string)
-as xs:string {
-    $server || "/api/textapi/ahikar/" || $collection-type || "/" || $manifest-uri || "/manifest.json"
-};
-
-declare function d:get-format-type($metadata as document-node())
-as xs:string {
-    $metadata//tgmd:format[1]/string()
-    => d:make-format-type()
-};
-
-declare function d:make-format-type($tgmd-format as xs:string)
-as xs:string {
-    switch ($tgmd-format)
-        case "text/tg.aggregation+xml" return "collection"
-        case "text/tg.edition+tg.aggregation+xml" return "manifest"
-        default return "manifest"
-};
-
-declare function d:make-annotationCollection-uri($server as xs:string,
-    $collection-type as xs:string)
-as xs:string {
-    $server || "/api/annotations/ahikar/" || $collection-type || "/annotationCollection.json"
-};
diff --git a/exist-app/modules/tapi-collection.xqm b/exist-app/modules/tapi-collection.xqm
index 8ca2ebe..f726ce4 100644
--- a/exist-app/modules/tapi-collection.xqm
+++ b/exist-app/modules/tapi-collection.xqm
@@ -14,6 +14,20 @@ declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
 
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
 
+declare variable $tapi-coll:uris :=
+    map {
+        "syriac": if (doc-available($commons:agg || "3r84g.xml")) then "3r84g" else "sample_lang_aggregation_syriac",
+        "arabic-karshuni": (
+            if (doc-available($commons:agg || "3r9ps.xml")) then "3r9ps" else "sample_lang_aggregation_arabic",
+            if (doc-available($commons:agg || "3r84h.xml")) then "3r84h" else "sample_lang_aggregation_karshuni")
+    };
+    
+declare function tapi-coll:get-uris($collection-type as xs:string)
+as xs:string+ {
+    map:get($tapi-coll:uris, $collection-type)
+};
+
+
 (:~
  : Returns information about the main collection for the project. This encompasses
  : the key data described at https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object.
@@ -27,44 +41,54 @@ import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons"
  : @param $server A string indicating the server. This parameter has been introduced to make this function testable.
  : @return An object element containing all necessary information
  :)
-declare function tapi-coll:get-json($collection-uri as xs:string,
+declare function tapi-coll:get-json($collection-type as xs:string,
     $server as xs:string)
 as item()+ {
-    let $metadata-file := commons:get-metadata-file($collection-uri)
-    let $format-type := tapi-coll:get-format-type($metadata-file)
-    let $sequence := tapi-coll:make-sequence($collection-uri, $server)
-    let $annotationCollection-uri := tapi-coll:make-annotationCollection-uri($server, $collection-uri)
-
+    let $collection-string := tapi-coll:get-collection-string($collection-type)
+    let $sequence := tapi-coll:make-sequence($collection-type, $server)
+    let $annotationCollection-uri := tapi-coll:make-annotationCollection-uri($server, $collection-type)
+    
     return
-    <object>
-        <textapi>{$commons:version}</textapi>
-        <title>
-            <title>The Story and Proverbs of Ahikar the Wise</title>
-            <type>{$format-type}</type>
-        </title>
-        <!-- this empty title element is necessary to force JSON to
-        generate an array instead of a simple object. -->
-        <title/>
-        <collector>
-            <role>collector</role>
-            <name>Prof. Dr. theol. Kratz, Reinhard Gregor</name>
-            <idref>
-                <base>http://d-nb.info/gnd/</base>
-                <id>115412700</id>
-                <type>GND</type>
-            </idref>
-        </collector>
-        <description>Main collection for the Ahikar project. Funded by DFG, 2019–2020. University of Göttingen</description>
-        <annotationCollection>{$annotationCollection-uri}</annotationCollection>
-        {$sequence}
-    </object>
+        <object>
+            <textapi>{$commons:version}</textapi>
+            <title>
+                <title>The Story and Proverbs of Ahikar the Wise</title>
+                <type>main</type>
+            </title>
+            <!-- this empty title element is necessary to force JSON to
+            generate an array instead of a simple object. -->
+            <title/>
+            <collector>
+                <role>collector</role>
+                <name>Prof. Dr. theol. Kratz, Reinhard Gregor</name>
+                <idref>
+                    <base>http://d-nb.info/gnd/</base>
+                    <id>115412700</id>
+                    <type>GND</type>
+                </idref>
+            </collector>
+            <description>{$collection-string} collection for the Ahiqar project. Funded by DFG, 2019–2020. University of Göttingen</description>
+            <annotationCollection>{$annotationCollection-uri}</annotationCollection>
+            {$sequence}
+        </object>
 };
 
-declare function tapi-coll:get-aggregation($collection-uri as xs:string)
-as document-node() {
-    doc($commons:agg || $collection-uri || ".xml")
+declare function tapi-coll:get-collection-string($collection-type as xs:string)
+as xs:string {
+    switch ($collection-type)
+        case "syriac" return "Syriac"
+        case "arabic-karshuni" return "Arabic/Karshuni"
+        default return error("D001", "Unknown collection type " || $collection-type)
+};
+
+
+declare function tapi-coll:get-aggregations($uris as xs:string+)
+as document-node()+ {
+    for $uri in $uris return
+        doc($commons:agg || $uri || ".xml")
 };
 
+
 (:~
  : Some "editions" that appear in the ore:aggregates list of a collection are
  : actually no editions; They lack an XML file.
@@ -76,15 +100,16 @@ as document-node() {
  : @return A list of ore:aggregates without the manifests to be excluded
  : 
  :)
-declare function tapi-coll:get-allowed-manifest-uris($aggregation-file as node())
+declare function tapi-coll:get-allowed-manifest-uris($aggregations as node()+)
 as xs:string+ {
     let $not-allowed :=
         (
             "textgrid:3vp38"
         )
     let $allowed := 
-        for $aggregate in $aggregation-file//ore:aggregates return
-            $aggregate[@rdf:resource != $not-allowed]/@rdf:resource
+        for $aggregation-file in $aggregations return
+            for $aggregate in $aggregation-file//ore:aggregates return
+                $aggregate[@rdf:resource != $not-allowed]/@rdf:resource
     return
         for $uri in $allowed return
             tapi-coll:remove-textgrid-prefix($uri)
@@ -95,15 +120,15 @@ as xs:string {
     replace($uri, "textgrid:", "")
 };
 
-declare function tapi-coll:make-sequence($collection-uri as xs:string,
+declare function tapi-coll:make-sequence($collection-type as xs:string,
     $server as xs:string)
 as element(sequence)+ {
-    let $aggregation := tapi-coll:get-aggregation($collection-uri)
-    let $allowed-manifest-uris := tapi-coll:get-allowed-manifest-uris($aggregation/*)
-    
+    let $uris := tapi-coll:get-uris($collection-type)
+    let $aggregations := tapi-coll:get-aggregations($uris)
+    let $allowed-manifest-uris := tapi-coll:get-allowed-manifest-uris($aggregations)
     for $manifest-uri in $allowed-manifest-uris return
         let $manifest-metadata :=  commons:get-metadata-file($manifest-uri)
-        let $id := tapi-coll:make-id($server, $collection-uri, $manifest-uri)
+        let $id := tapi-coll:make-id($server, $collection-type, $manifest-uri)
         let $type := tapi-coll:make-format-type($manifest-metadata)
         return
             <sequence>
@@ -113,10 +138,10 @@ as element(sequence)+ {
 };
 
 declare function tapi-coll:make-id($server as xs:string,
-    $collection-uri as xs:string,
+    $collection-type as xs:string,
     $manifest-uri as xs:string)
 as xs:string {
-    $server || "/api/textapi/ahikar/" || $collection-uri || "/" || $manifest-uri || "/manifest.json"
+    $server || "/api/textapi/ahikar/" || $collection-type || "/" || $manifest-uri || "/manifest.json"
 };
 
 declare function tapi-coll:get-format-type($metadata as document-node())
@@ -134,7 +159,7 @@ as xs:string {
 };
 
 declare function tapi-coll:make-annotationCollection-uri($server as xs:string,
-    $collection-uri as xs:string)
+    $collection-type as xs:string)
 as xs:string {
-    $server || "/api/annotations/ahikar/" || $collection-uri || "/annotationCollection.json"
+    $server || "/api/annotations/ahikar/" || $collection-type || "/annotationCollection.json"
 };
diff --git a/exist-app/modules/tapi.xqm b/exist-app/modules/tapi.xqm
index f3e7351..32d9cab 100644
--- a/exist-app/modules/tapi.xqm
+++ b/exist-app/modules/tapi.xqm
@@ -19,7 +19,6 @@ declare namespace test="http://exist-db.org/xquery/xqsuite";
 declare namespace xhtml="http://www.w3.org/1999/xhtml";
 
 import module namespace tapi-coll="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection" at "tapi-collection.xqm";
-import module namespace d="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft" at "draft-tapi-collection.xqm";
 import module namespace tapi-item="http://ahikar.sub.uni-goettingen.de/ns/tapi/item" at "tapi-item.xqm";
 import module namespace tapi-mani="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest" at "tapi-manifest.xqm";
 import module namespace tapi-txt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt" at "tapi-txt.xqm";
@@ -99,7 +98,7 @@ declare
 function tapi:endpoint-collection($collection-type as xs:string)
 as item()+ {
     $commons:responseHeader200,
-    d:get-json($collection-type, $tapi:server)
+    tapi-coll:get-json($collection-type, $tapi:server)
 };
 
 
diff --git a/exist-app/modules/testtrigger.xqm b/exist-app/modules/testtrigger.xqm
index 1cd644c..e024397 100644
--- a/exist-app/modules/testtrigger.xqm
+++ b/exist-app/modules/testtrigger.xqm
@@ -27,7 +27,6 @@ import module namespace ttnt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/no
 import module namespace ttt="http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests" at "../tests/tapi-txt-tests.xqm";
 import module namespace t2ht="http://ahikar.sub.uni-goettingen.de/ns/tei2html-tests" at "../tests/tei2html-tests.xqm";
 import module namespace t2htextt="http://ahikar.sub.uni-goettingen.de/ns/tei2html-textprocessing-tests" at "../tests/tei2html-textprocessing-tests.xqm";
-import module namespace t="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft/tests" at "../tests/draft-tapi-collection-tests.xqm";
 
 (:~
  : Triggers the tests for the Ahikar backend. Called by the CI.
@@ -69,7 +68,6 @@ as element()+ {
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/txt/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/commons-tests")),
-        test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/item/tests")),
         test:suite(util:list-functions("http://ahikar.sub.uni-goettingen.de/ns/tapi/html/tests")),
diff --git a/exist-app/tests/draft-tapi-collection-tests.xqm b/exist-app/tests/draft-tapi-collection-tests.xqm
deleted file mode 100644
index 0857496..0000000
--- a/exist-app/tests/draft-tapi-collection-tests.xqm
+++ /dev/null
@@ -1,145 +0,0 @@
-xquery version "3.1";
-
-module namespace t="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft/tests";
-
-declare namespace http = "http://expath.org/ns/http-client";
-declare namespace tei="http://www.tei-c.org/ns/1.0";
-
-import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "../modules/commons.xqm";
-import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons" at "test-commons.xqm";
-import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
-import module namespace d="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection-draft" at "../modules/draft-tapi-collection.xqm";
-
-declare
-    %test:args("syriac") %test:assertEquals("sample_lang_aggregation_syriac")
-    %test:args("arabic-karshuni") %test:assertXPath("count($result) = 2 and $result = 'sample_lang_aggregation_arabic' and $result = 'sample_lang_aggregation_karshuni'")
-function t:get-uris($collection-type as xs:string)
-as xs:string+ {
-    d:get-uris($collection-type)
-};
-
-declare
-    %test:args("syriac") %test:assertEquals("Syriac")
-    %test:args("arabic-karshuni") %test:assertEquals("Arabic/Karshuni")
-    %test:args("misc") %test:assertError("D001")
-function t:get-collection-string($collection-type as xs:string)
-as xs:string {
-    d:get-collection-string($collection-type)
-};
-
-declare
-    %test:args("syriac") %test:assertXPath("$result//description = 'Syriac collection for the Ahiqar project. Funded by DFG, 2019–2020. University of Göttingen'")
-    %test:args("arabic-karshuni") %test:assertXPath("$result//description = 'Arabic/Karshuni collection for the Ahiqar project. Funded by DFG, 2019–2020. University of Göttingen'")
-function t:get-json($collection-type as xs:string) {
-    d:get-json($collection-type, $tc:server)
-};
-
-
-declare
-    %test:args("syriac") %test:assertXPath("$result//type[. = 'manifest']")
-    %test:args("syriac") %test:assertXPath("$result//id[contains(., 'textapi/ahikar/syriac/sample_edition/manifest.json')]")
-    %test:args("arabic-karshuni") %test:assertXPath("$result//type[. = 'manifest']")
-    %test:args("arabic-karshuni") %test:assertXPath("$result//id[contains(., 'textapi/ahikar/arabic-karshuni/sample_edition_arabic/manifest.json')]")
-    %test:args("arabic-karshuni") %test:assertXPath("$result//id[contains(., 'textapi/ahikar/arabic-karshuni/sample_edition_karshuni/manifest.json')]")
-function t:make-sequence($collection-type as xs:string) {
-    d:make-sequence($collection-type, $tc:server)
-};
-
-declare
-    %test:args("sample_lang_aggregation_syriac") %test:assertExists
-function t:get-aggregations_syriac($uris as xs:string+)
-as document-node()+ {
-    d:get-aggregations($uris)
-};
-
-declare
-    %test:assertExists
-function t:get-aggregations_arabic_karshuni()
-as document-node()+ {
-    let $uris :=
-        (
-           "sample_lang_aggregation_arabic",
-           "sample_lang_aggregation_karshuni"
-        )
-    return
-        d:get-aggregations($uris)
-};
-
-declare
-    %test:args("textgrid:1234") %test:assertEquals("1234")
-    %test:args("1234") %test:assertEquals("1234")
-function t:remove-textgrid-prefix($uri as xs:string) {
-    d:remove-textgrid-prefix($uri)
-};
-
-declare
-    %test:assertTrue
-function t:get-allowed-manifest-uris-mock-up-input-included() {
-    let $collection-metadata :=
-    (
-        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_arabic.0">
-                <ore:aggregates rdf:resource="textgrid:3rbm9"/>
-                <ore:aggregates rdf:resource="textgrid:3rbmc"/>
-                <ore:aggregates rdf:resource="textgrid:3rx14"/>
-                <ore:aggregates rdf:resource="textgrid:3vp38"/>
-            </rdf:Description>
-        </rdf:RDF>,
-        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_karshuni.0">
-                <ore:aggregates rdf:resource="textgrid:3rbm9"/>
-                <ore:aggregates rdf:resource="textgrid:3rbmc"/>
-                <ore:aggregates rdf:resource="textgrid:3rx14"/>
-                <ore:aggregates rdf:resource="textgrid:3vp38"/>
-            </rdf:Description>
-        </rdf:RDF>
-    )
-    return
-        d:get-allowed-manifest-uris($collection-metadata) = "3rx14"
-};
-
-declare
-    %test:assertFalse
-function t:get-allowed-manifest-uris-mock-up-input-excluded() {
-    let $collection-metadata :=
-        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_syriac.0">
-                <ore:aggregates rdf:resource="textgrid:3rbm9"/>
-                <ore:aggregates rdf:resource="textgrid:3rbmc"/>
-                <ore:aggregates rdf:resource="textgrid:3rx14"/>
-                <ore:aggregates rdf:resource="textgrid:3vp38"/>
-            </rdf:Description>
-        </rdf:RDF>
-    return
-        d:get-allowed-manifest-uris($collection-metadata) = "3vp38"
-};
-
-declare
-    %test:args("syriac", "sample_edition") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/syriac/sample_edition/manifest.json")
-function t:make-id($colletion-type as xs:string, $manifest-uri as xs:string)
-as xs:string {
-    d:make-id($tc:server, $colletion-type, $manifest-uri)
-};
-
-declare
-    %test:args("text/tg.aggregation+xml") %test:assertEquals("collection")
-    %test:args("text/tg.edition+tg.aggregation+xml") %test:assertEquals("manifest")
-    %test:args("test") %test:assertEquals("manifest")
-function t:make-format-type($tgmd-format as xs:string) {
-    d:make-format-type($tgmd-format)
-};
-
-declare
-    %test:assertEquals("manifest")
-function t:get-format-type() {
-    let $metadata := commons:get-metadata-file("sample_edition")
-    return
-        d:get-format-type($metadata)
-};
-
-declare
-    %test:args("arabic-karshuni") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/arabic-karshuni/annotationCollection.json")
-function t:make-annotationCollection-uri($collection-uri as xs:string)
-as xs:string {
-    d:make-annotationCollection-uri($tc:server, $collection-uri)
-};
diff --git a/exist-app/tests/tapi-collection-tests.xqm b/exist-app/tests/tapi-collection-tests.xqm
index 0d366e4..6b44d7f 100644
--- a/exist-app/tests/tapi-collection-tests.xqm
+++ b/exist-app/tests/tapi-collection-tests.xqm
@@ -1,6 +1,6 @@
 xquery version "3.1";
 
-module namespace tct="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests";
+module namespace t="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection/tests";
 
 declare namespace http = "http://expath.org/ns/http-client";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
@@ -10,125 +10,100 @@ import module namespace tc="http://ahikar.sub.uni-goettingen.de/ns/tests/commons
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 import module namespace tapi-coll="http://ahikar.sub.uni-goettingen.de/ns/tapi/collection" at "../modules/tapi-collection.xqm";
 
-declare variable $tct:collection-uri := "testapi-collection.xml";
-declare variable $tct:agg1-uri := "test-aggregation-1.xml";
-declare variable $tct:agg2-uri := "test-aggregation-2.xml";
+declare
+    %test:args("syriac") %test:assertEquals("sample_lang_aggregation_syriac")
+    %test:args("arabic-karshuni") %test:assertXPath("count($result) = 2 and $result = 'sample_lang_aggregation_arabic' and $result = 'sample_lang_aggregation_karshuni'")
+function t:get-uris($collection-type as xs:string)
+as xs:string+ {
+    tapi-coll:get-uris($collection-type)
+};
 
 declare
-    %test:setUp
-function tct:_test-setup(){
-    let $collection :=
-        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" 
-            xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <rdf:Description rdf:about="textgrid:testapi-collection">
-                <ore:aggregates rdf:resource="textgrid:test-aggregation-1"/>
-                <ore:aggregates rdf:resource="textgrid:test-aggregation-2"/>
-            </rdf:Description>
-        </rdf:RDF>
-    let $collection-meta :=
-        <MetadataContainerType xmlns="http://textgrid.info/namespaces/metadata/core/2010"
-            xmlns:ns2="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <object>
-                <generic>
-                    <provided>
-                        <title>Beispieldatei zum Testen</title>
-                        <format>text/tg.edition+tg.aggregation+xml</format>
-                    </provided>
-                </generic>
-            </object>
-        </MetadataContainerType>
-        
-    let $agg1 :=
-        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <rdf:Description rdf:about="test-aggregation-1">
-                <ore:aggregates rdf:resource="textgrid:sample_teixml"/>
-            </rdf:Description>
-        </rdf:RDF>
-    let $agg1-meta :=
-        <MetadataContainerType xmlns="http://textgrid.info/namespaces/metadata/core/2010"
-            xmlns:ns2="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <object>
-                <generic>
-                    <provided>
-                        <title>Beispielagg1 zum Testen</title>
-                        <format>text/tg.edition+tg.aggregation+xml</format>
-                    </provided>
-                </generic>
-            </object>
-        </MetadataContainerType>
-        
-    let $agg2 := 
-        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <rdf:Description rdf:about="test-aggregation-2">
-                <ore:aggregates rdf:resource="textgrid:sample_teixml"/>
-            </rdf:Description>
-        </rdf:RDF>
-    let $agg2-meta :=
-        <MetadataContainerType xmlns="http://textgrid.info/namespaces/metadata/core/2010"
-            xmlns:ns2="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <object>
-                <generic>
-                    <provided>
-                        <title>Beispielagg2 zum Testen</title>
-                        <format>text/tg.edition+tg.aggregation+xml</format>
-                    </provided>
-                </generic>
-            </object>
-        </MetadataContainerType>
-        
-        
-    return
-        (
-            xmldb:store($commons:agg, $tct:collection-uri, $collection),
-            xmldb:store($commons:agg, $tct:agg1-uri, $agg1),
-            xmldb:store($commons:agg, $tct:agg2-uri, $agg2),
-            xmldb:store($commons:meta, $tct:collection-uri, $collection-meta),
-            xmldb:store($commons:meta, $tct:agg1-uri, $agg1-meta),
-            xmldb:store($commons:meta, $tct:agg2-uri, $agg2-meta)
-        )
+    %test:args("syriac") %test:assertEquals("Syriac")
+    %test:args("arabic-karshuni") %test:assertEquals("Arabic/Karshuni")
+    %test:args("misc") %test:assertError("D001")
+function t:get-collection-string($collection-type as xs:string)
+as xs:string {
+    tapi-coll:get-collection-string($collection-type)
 };
 
 declare
-    %test:tearDown
-function tct:_test-teardown() {
-    xmldb:remove($commons:agg, $tct:collection-uri),
-    xmldb:remove($commons:agg, $tct:agg1-uri),
-    xmldb:remove($commons:agg, $tct:agg2-uri),
-    xmldb:remove($commons:meta, $tct:collection-uri),
-    xmldb:remove($commons:meta, $tct:agg1-uri),
-    xmldb:remove($commons:meta, $tct:agg2-uri)
+    %test:args("syriac") %test:assertXPath("$result//description = 'Syriac collection for the Ahiqar project. Funded by DFG, 2019–2020. University of Göttingen'")
+    %test:args("arabic-karshuni") %test:assertXPath("$result//description = 'Arabic/Karshuni collection for the Ahiqar project. Funded by DFG, 2019–2020. University of Göttingen'")
+function t:get-json($collection-type as xs:string) {
+    tapi-coll:get-json($collection-type, $tc:server)
 };
 
+
 declare
-    %test:args("sample_main_edition") %test:assertXPath("$result//*[local-name(.) = 'aggregates']")
-function tct:get-aggregation($uri as xs:string) {
-    tapi-coll:get-aggregation($uri)
+    %test:args("syriac") %test:assertXPath("$result//type[. = 'manifest']")
+    %test:args("syriac") %test:assertXPath("$result//id[contains(., 'textapi/ahikar/syriac/sample_edition/manifest.json')]")
+    %test:args("arabic-karshuni") %test:assertXPath("$result//type[. = 'manifest']")
+    %test:args("arabic-karshuni") %test:assertXPath("$result//id[contains(., 'textapi/ahikar/arabic-karshuni/sample_edition_arabic/manifest.json')]")
+    %test:args("arabic-karshuni") %test:assertXPath("$result//id[contains(., 'textapi/ahikar/arabic-karshuni/sample_edition_karshuni/manifest.json')]")
+function t:make-sequence($collection-type as xs:string) {
+    tapi-coll:make-sequence($collection-type, $tc:server)
+};
+
+declare
+    %test:args("sample_lang_aggregation_syriac") %test:assertExists
+function t:get-aggregations_syriac($uris as xs:string+)
+as document-node()+ {
+    tapi-coll:get-aggregations($uris)
+};
+
+declare
+    %test:assertExists
+function t:get-aggregations_arabic_karshuni()
+as document-node()+ {
+    let $uris :=
+        (
+           "sample_lang_aggregation_arabic",
+           "sample_lang_aggregation_karshuni"
+        )
+    return
+        tapi-coll:get-aggregations($uris)
+};
+
+declare
+    %test:args("textgrid:1234") %test:assertEquals("1234")
+    %test:args("1234") %test:assertEquals("1234")
+function t:remove-textgrid-prefix($uri as xs:string) {
+    tapi-coll:remove-textgrid-prefix($uri)
 };
 
 declare
     %test:assertTrue
-function tct:get-allowed-manifest-uris-mock-up-input-included() {
+function t:get-allowed-manifest-uris-mock-up-input-included() {
     let $collection-metadata :=
+    (
+        <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_arabic.0">
+                <ore:aggregates rdf:resource="textgrid:3rbm9"/>
+                <ore:aggregates rdf:resource="textgrid:3rbmc"/>
+                <ore:aggregates rdf:resource="textgrid:3rx14"/>
+                <ore:aggregates rdf:resource="textgrid:3vp38"/>
+            </rdf:Description>
+        </rdf:RDF>,
         <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:3r9ps.0">
+            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_karshuni.0">
                 <ore:aggregates rdf:resource="textgrid:3rbm9"/>
                 <ore:aggregates rdf:resource="textgrid:3rbmc"/>
                 <ore:aggregates rdf:resource="textgrid:3rx14"/>
                 <ore:aggregates rdf:resource="textgrid:3vp38"/>
             </rdf:Description>
         </rdf:RDF>
+    )
     return
         tapi-coll:get-allowed-manifest-uris($collection-metadata) = "3rx14"
 };
 
 declare
     %test:assertFalse
-function tct:get-allowed-manifest-uris-mock-up-input-excluded() {
+function t:get-allowed-manifest-uris-mock-up-input-excluded() {
     let $collection-metadata :=
         <rdf:RDF xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:3r9ps.0">
+            <rdf:Description xmlns:tei="http://www.tei-c.org/ns/1.0" rdf:about="textgrid:sample_lang_aggregation_syriac.0">
                 <ore:aggregates rdf:resource="textgrid:3rbm9"/>
                 <ore:aggregates rdf:resource="textgrid:3rbmc"/>
                 <ore:aggregates rdf:resource="textgrid:3rx14"/>
@@ -139,67 +114,32 @@ function tct:get-allowed-manifest-uris-mock-up-input-excluded() {
         tapi-coll:get-allowed-manifest-uris($collection-metadata) = "3vp38"
 };
 
-
 declare
-    %test:args("sample_main_edition", "sample_edition") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/sample_main_edition/sample_edition/manifest.json")
-function tct:make-id($colletion-uri as xs:string, $manifest-uri as xs:string)
+    %test:args("syriac", "sample_edition") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/syriac/sample_edition/manifest.json")
+function t:make-id($colletion-type as xs:string, $manifest-uri as xs:string)
 as xs:string {
-    tapi-coll:make-id($tc:server, $colletion-uri, $manifest-uri)
-};
-
-
-declare
-    %test:assertEquals("sample_edition")
-function tct:get-allowed-manifest-uris-sample-input() {
-    let $collection-metadata := tapi-coll:get-aggregation("sample_lang_aggregation_syriac")
-    return
-        tapi-coll:get-allowed-manifest-uris($collection-metadata)
-};
-
-declare
-    %test:args("textgrid:1234") %test:assertEquals("1234")
-    %test:args("1234") %test:assertEquals("1234")
-function tct:remove-textgrid-prefix($uri as xs:string) {
-    tapi-coll:remove-textgrid-prefix($uri)
+    tapi-coll:make-id($tc:server, $colletion-type, $manifest-uri)
 };
 
 declare
     %test:args("text/tg.aggregation+xml") %test:assertEquals("collection")
     %test:args("text/tg.edition+tg.aggregation+xml") %test:assertEquals("manifest")
     %test:args("test") %test:assertEquals("manifest")
-function tct:make-format-type($tgmd-format as xs:string) {
+function t:make-format-type($tgmd-format as xs:string) {
     tapi-coll:make-format-type($tgmd-format)
 };
 
 declare
     %test:assertEquals("manifest")
-function tct:get-format-type() {
+function t:get-format-type() {
     let $metadata := commons:get-metadata-file("sample_edition")
     return
         tapi-coll:get-format-type($metadata)
 };
 
-
 declare
-    %test:args("sample_main_edition") %test:assertXPath("$result//type[. = 'manifest']")
-    %test:args("sample_lang_aggregation_syriac") %test:assertXPath("$result//id[matches(., 'sample_edition/manifest.json')]")
-    %test:args("testapi-collection") %test:assertXPath("$result//id[matches(., 'test-aggregation-1/manifest.json')]")
-    %test:args("testapi-collection") %test:assertXPath("$result//id[matches(., 'test-aggregation-2/manifest.json')]")
-function tct:make-sequence($collection-uri as xs:string) {
-    tapi-coll:make-sequence($collection-uri, $tc:server)
-};
-
-declare
-    %test:args("sample_main_edition") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/sample_main_edition/annotationCollection.json")
-function tct:make-annotationCollection-uri($collection-uri as xs:string)
+    %test:args("arabic-karshuni") %test:assertEquals("http://0.0.0.0:8080/exist/restxq/api/annotations/ahikar/arabic-karshuni/annotationCollection.json")
+function t:make-annotationCollection-uri($collection-uri as xs:string)
 as xs:string {
     tapi-coll:make-annotationCollection-uri($tc:server, $collection-uri)
 };
-
-
-declare
-    %test:args("sample_lang_aggregation_syriac") %test:assertXPath("$result//title = 'The Story and Proverbs of Ahikar the Wise'")
-    %test:args("sample_lang_aggregation_syriac") %test:assertXPath("$result//*/string() = 'http://0.0.0.0:8080/exist/restxq/api/textapi/ahikar/sample_lang_aggregation_syriac/sample_edition/manifest.json' ")
-function tct:get-json($collection-uri as xs:string) {
-    tapi-coll:get-json($collection-uri, $tc:server)
-};
-- 
GitLab


From ca7190359b61dc31bebae3d9dbf410e83b363e49 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 18 Jan 2021 06:55:19 +0100
Subject: [PATCH 134/155] fix: Title Object for items

---
 exist-app/modules/tapi-item.xqm     | 15 +++++++++++----
 exist-app/tests/tapi-item-tests.xqm | 13 ++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/exist-app/modules/tapi-item.xqm b/exist-app/modules/tapi-item.xqm
index 4ad33f9..1115f3e 100644
--- a/exist-app/modules/tapi-item.xqm
+++ b/exist-app/modules/tapi-item.xqm
@@ -21,7 +21,7 @@ declare function tapi-item:get-json($collection-uri as xs:string,
 as element(object) {
     <object>
         <textapi>{$commons:version}</textapi>
-        <title>{tapi-item:make-title($manifest-uri)}</title>
+        {tapi-item:make-title-object($manifest-uri)}
         <type>page</type>
         <n>{$page}</n>
         <content>{$server}/api/content/{commons:get-xml-uri($manifest-uri)}-{$page}.html</content>
@@ -36,11 +36,18 @@ as element(object) {
 };
 
 
-declare function tapi-item:make-title($manifest-uri as xs:string)
-as xs:string {
+declare function tapi-item:make-title-object($manifest-uri as xs:string)
+as element() {
     let $tei-xml := commons:get-tei-xml-for-manifest($manifest-uri)
-    return
+    let $title :=
         $tei-xml//tei:title[@type = "main"]/string()
+        => normalize-space()
+    let $type := $tei-xml//tei:title/@type/string()
+    return
+        <title>
+            <title>{$title}</title>
+            <type>{$type}</type>
+        </title>
 };
 
 
diff --git a/exist-app/tests/tapi-item-tests.xqm b/exist-app/tests/tapi-item-tests.xqm
index 837f3c9..fc56427 100644
--- a/exist-app/tests/tapi-item-tests.xqm
+++ b/exist-app/tests/tapi-item-tests.xqm
@@ -44,19 +44,18 @@ as xs:string {
 
 
 declare
-    %test:args("sample_edition") %test:assertEquals("The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh,
-               king of Assyria and Nineveh")
-function titemt:make-title($manifest-uri as xs:string)
-as xs:string {
-    tapi-item:make-title($manifest-uri)
+    %test:args("sample_edition")  %test:assertXPath("$result//*[local-name(.) = 'title'] = 'The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh, king of Assyria and Nineveh'")
+function titemt:make-title-object($manifest-uri as xs:string)
+as element() {
+    tapi-item:make-title-object($manifest-uri)
 };
 
 
 declare
     %test:args("sample_main_edition", "sample_edition", "82a")
     (: checks if the correct file has been opened :)
-    %test:assertXPath("$result//*[local-name(.) = 'title'] = 'The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh,
-               king of Assyria and Nineveh' ")
+    %test:assertXPath("$result//*[local-name(.) = 'title']/*[local-name(.) = 'title'] = 'The Proverbs or History of Aḥīḳar the wise, the scribe of Sanḥērībh, king of Assyria and Nineveh' ")
+    %test:assertXPath("$result//*[local-name(.) = 'title']/*[local-name(.) = 'type'] = 'main' ")
     (: checks if language assembling works correctly :)
     %test:assertXPath("$result//*[local-name(.) = 'lang'] = 'syc' ")
     %test:assertXPath("$result//*[local-name(.) = 'langAlt'] = 'karshuni' ")
-- 
GitLab


From 7a927f061d1b732ff348c18c7ab9d3f916e5b62c Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 18 Jan 2021 07:02:04 +0100
Subject: [PATCH 135/155] chore: update changelog, bump version number

---
 CHANGELOG.md               | 9 ++++++++-
 exist-app/build.properties | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f48461..6e7fee9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.1] - 2021-01-18
+
+### Fixed
+
+- faulty implementation of the Item Object's title key: Provides now a Title Object according to the
+TextAPI specs instead of a string.
+
 ## [2.5.0] - 2021-01-14
 
-## Changed
+### Changed
 
 - switched from SADE to TextGrid Connect Standalone as a means to get data from TextGrid
 
diff --git a/exist-app/build.properties b/exist-app/build.properties
index 1378932..c3507f3 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=2.5.0
+project.version=2.5.1
 project.title=Ahiqar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
-- 
GitLab


From 7d82e4da572dcf4b259fac2f60c5b01e36c0c53a Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 18 Jan 2021 12:59:04 +0100
Subject: [PATCH 136/155] chose: bump version number, update CHANGELOG

---
 CHANGELOG.md               | 12 +++++++++++-
 exist-app/build.properties |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f48461..2b2253e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,14 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.0] - 2021-01-18
+
+### Changed
+
+- The Text- and AnnotationAPI no longer accept URIs as `collection` parameter.
+Callers have to choose between `syriac` or `arabic-karshuni` as `collection`.
+This satifies the requirement of having one separate endpoint for the TIDO instance serving the Syriac and the Arabic/Karshuni collections each.
+
 ## [2.5.0] - 2021-01-14
 
-## Changed
+### Changed
 
 - switched from SADE to TextGrid Connect Standalone as a means to get data from TextGrid
 
 ## [2.4.0] - 2021-01-13
 
+### Changed
+
 - updated the eXist application's name since it was misleading
 
 ## [2.3.0] - 2021-01-13
diff --git a/exist-app/build.properties b/exist-app/build.properties
index 1378932..cda5e5e 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=2.5.0
+project.version=3.0.0
 project.title=Ahiqar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
-- 
GitLab


From 6283fe956a8e5b15bca81851444540932894dd02 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 18 Jan 2021 14:27:39 +0100
Subject: [PATCH 137/155] docs: update README

---
 README.md                                     |   8 +++++---
 .../data/ahiqar_backend_architecture.png      | Bin 39781 -> 16039 bytes
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index daf0e06..e4fc4f0 100644
--- a/README.md
+++ b/README.md
@@ -114,14 +114,16 @@ docker-compose --env-file docker/.env --file docker/docker-compose.yml up --deta
 
 ## Connecting the Backend with the Frontend
 
-The corresponding frontend for the Ahiqar backend is [Ahiqar's version of the TIDO viewer](https://gitlab.gwdg.de/subugoe/ahiqar/frontend).
-In order to connect it with the simply has to expose a REST API that complies to the specification of the [SUB's generic TextAPI](https://subugoe.pages.gwdg.de/emo/text-api/)
+The corresponding frontend for the Ahiqar backend is [Ahiqar's version of the TIDO viewer](https://gitlab.gwdg.de/subugoe/ahiqar/ahiqar-tido).
+In order to connect the back end with the viewer, the former simply has to expose a REST API that complies to the specification of the [SUB's generic TextAPI](https://subugoe.pages.gwdg.de/emo/text-api/).
+The specification of the project specific API can be found at the [API's documentation page](https://subugoe.pages.gwdg.de/ahiqar/api-documentation/).
+
 The frontend takes care of the data transfer as described in [TIDO's README](https://gitlab.gwdg.de/subugoe/emo/Qviewer/-/blob/develop/README.md#connecting-the-viewer-with-a-backend).
 
 ## API documentation
 
 The backend comes shipped with an OpenAPI documentation of its API.
-The docs are available at <https://ahikar-dev.sub.uni-goettingen.de/openapi>.
+The docs are available at <https://ahikar-dev.sub.uni-goettingen.de/openapi> or at <https://subugoe.pages.gwdg.de/ahiqar/api-documentation/>.
 
 ### Interplay of TextAPI and AnnotationAPI
 
diff --git a/exist-app/data/ahiqar_backend_architecture.png b/exist-app/data/ahiqar_backend_architecture.png
index 9cd45cd692ec1ae72ab204c2e2143473122d5c26..3fc4b1f82f4a307c9a698e98cb6b757871438d78 100644
GIT binary patch
literal 16039
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

literal 39781
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
az#sb)HRA7kKKm>JIl$A^&t;ucLK6Th<#+o4

-- 
GitLab


From 137095f98269dde2be442b6db32b0d5554e6ef03 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 18 Jan 2021 14:42:31 +0100
Subject: [PATCH 138/155] docs: update function docs, add return types

---
 .../modules/AnnotationAPI/annotations-rest.xqm   | 16 +++++++++-------
 exist-app/modules/AnnotationAPI/annotations.xqm  | 15 +++++++++------
 exist-app/modules/tapi-collection.xqm            |  4 ++--
 exist-app/modules/tapi-item.xqm                  |  6 +++---
 exist-app/modules/tapi-manifest.xqm              | 15 +++++++--------
 exist-app/modules/tapi.xqm                       | 14 +++++++-------
 6 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/exist-app/modules/AnnotationAPI/annotations-rest.xqm b/exist-app/modules/AnnotationAPI/annotations-rest.xqm
index 1e6b614..87090a2 100644
--- a/exist-app/modules/AnnotationAPI/annotations-rest.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations-rest.xqm
@@ -35,7 +35,7 @@ declare variable $anno-rest:server :=
  : For retrieving annotation information about other collections cf. the endpoint
  : /annotations/ahikar/{$collection}/{$document}/annotationCollection.json
  : 
- : @param $collection The URI of the collection, e.g. '3r132'
+ : @param $collection The type of the collection. Can either be `syriac` or `arabic-karshuni`
  : @return An Annotation Collecion for the given collection
  :)
 declare
@@ -43,7 +43,8 @@ declare
     %rest:HEAD
     %rest:path("/annotations/ahikar/{$collection}/annotationCollection.json")
     %output:method("json")
-function anno-rest:collection-rest($collection as xs:string) {
+function anno-rest:collection-rest($collection as xs:string)
+as item()+ {
     if (anno:are-resources-available($collection)) then
         ($commons:responseHeader200,
         anno:make-annotationCollection($collection, (), $anno-rest:server))
@@ -58,7 +59,7 @@ function anno-rest:collection-rest($collection as xs:string) {
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
  : 
- : @param $collection The URI of the Collection Object
+ : @param $collection The collection type. Can either be `syriac` or `arabic-karshuni`
  : @param $document The URI of an aggregated Collection or Manifest Object
  :)
 declare
@@ -67,7 +68,8 @@ declare
     %rest:path("/annotations/ahikar/{$collection}/{$document}/annotationPage.json")
     %output:method("json")
 function anno-rest:annotationPage-for-collection-rest($collection as xs:string, 
-$document as xs:string) {
+    $document as xs:string)
+as item()+ {
     if (anno:are-resources-available(($collection, $document))) then
         ($commons:responseHeader200,
         anno:make-annotationPage($collection, $document, $anno-rest:server))
@@ -87,7 +89,7 @@ $document as xs:string) {
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
  : 
- : @param $collection The URI of the Collection Object
+ : @param $collection The collection type. Can either be `syriac` or `arabic-karshuni`
  : @param $document The URI of an aggregated Collection or Manifest Object
  : @return An Annotation Collecion for the given Collection or Manifest Object
  :)
@@ -118,7 +120,7 @@ as item()+ {
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
  : 
- : @param $collection The URI of the Collection Object
+ : @param $collection The collection type. Can either be `syriac` or `arabic-karshuni`
  : @param $document The URI of an aggregated Collection or Manifest Object
  : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
  : @return An Annotation Collection for the given Collection or Manifest Object
@@ -151,7 +153,7 @@ as item()+ {
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
  : 
- : @param $collection The URI of the Collection Object
+ : @param $collection The collection type. Can either be `syriac` or `arabic-karshuni`
  : @param $document The URI of an aggregated Collection or Manifest Object
  : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
  : @return An Annotation Page for the given Collection or Manifest Object
diff --git a/exist-app/modules/AnnotationAPI/annotations.xqm b/exist-app/modules/AnnotationAPI/annotations.xqm
index e2425a8..70ca4a7 100644
--- a/exist-app/modules/AnnotationAPI/annotations.xqm
+++ b/exist-app/modules/AnnotationAPI/annotations.xqm
@@ -12,7 +12,6 @@ xquery version "3.1";
 
 module namespace anno="http://ahikar.sub.uni-goettingen.de/ns/annotations";
 
-declare namespace err = "http://www.w3.org/2005/xqt-errors";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace ore="http://www.openarchives.org/ore/terms/";
 declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";
@@ -30,6 +29,10 @@ declare variable $anno:annotationElements :=
         "persName"
     );
 
+(:
+ : Determines the correct language aggregations.
+ : The ones starting with "sample_" are for testing only.
+ :)
 declare variable $anno:lang-aggs := 
     map {
         "syriac": if (doc-available($commons:agg || "3r84g.xml")) then "3r84g" else "sample_lang_aggregation_syriac",
@@ -83,7 +86,7 @@ as xs:string+ {
  : @see https://www.w3.org/TR/annotation-model/#annotation-collection
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
  : 
- : @param $collection The URI of a Collection Object
+ : @param $collection The collection type. Can either be `syriac` or `arabic-karshuni`
  : @param $document The URI of a Collection or Manifest Object. May be an empty sequence if only information about the $collection should be created
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  : @return A map with all information necessary for the Annotation Collection
@@ -125,7 +128,7 @@ as map() {
  : @see https://www.w3.org/TR/annotation-model/#annotation-collection
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
  : 
- : @param $collection-type The type of the current Collection Object (syriac or arabic-karshuni)
+ : @param $collection-type The collection type. Can either be `syriac` or `arabic-karshuni`
  : @param The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  : @return A map with all information necessary for the Annotation Collection
  :)
@@ -236,7 +239,7 @@ as xs:string {
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
  : 
- : @param $collection The URI of a Collection Object, e.g. '3r132'
+ : @param $collection The collection type. Can either be `syriac` or `arabic-karshuni`
  : @param $document The URI of a Collection or Manifest Object, e.g. '3r84g'
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
  : @return A map with all information necessary for the Annotation Collection
@@ -288,7 +291,7 @@ as map() {
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
  : 
- : @param $collection The URI of the Collection Object
+ : @param $collection The collection type. Can either be `syriac` or `arabic-karshuni`
  : @param $document The URI of an aggregated Collection or Manifest Object
  : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
@@ -325,7 +328,7 @@ as map() {
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#manifest-object
  : 
- : @param $collection The URI of the Collection Object
+ : @param $collection The collection type. Can either be `syriac` or `arabic-karshuni`
  : @param $document The URI of an aggregated Collection or Manifest Object
  : @param $page The page within an item, i.e. a tei:pb/@n within a TEI resource
  : @param $server The server we are currently on. This mainly serves testing purposes and usually defaults to $anno:server
diff --git a/exist-app/modules/tapi-collection.xqm b/exist-app/modules/tapi-collection.xqm
index f726ce4..810e3bd 100644
--- a/exist-app/modules/tapi-collection.xqm
+++ b/exist-app/modules/tapi-collection.xqm
@@ -37,7 +37,7 @@ as xs:string+ {
  : the XMLs and images in them.
  :
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
- : @param $collection-uri The unprefixed TextGrid URI of a collection. For Ahiqar's main collection this is '3r132'.
+ : @param $collection-type The collection type. Can either be `syriac` or `arabic-karshuni`
  : @param $server A string indicating the server. This parameter has been introduced to make this function testable.
  : @return An object element containing all necessary information
  :)
@@ -96,7 +96,7 @@ as document-node()+ {
  : In order to not have them included in the list of "actual" editions, they
  : have to be explicitly excluded.
  : 
- : @param $doc The root element of an aggregation object
+ : @param $aggregatins The root element(s) of one or more aggregation objects
  : @return A list of ore:aggregates without the manifests to be excluded
  : 
  :)
diff --git a/exist-app/modules/tapi-item.xqm b/exist-app/modules/tapi-item.xqm
index 4ad33f9..3c11ca0 100644
--- a/exist-app/modules/tapi-item.xqm
+++ b/exist-app/modules/tapi-item.xqm
@@ -3,7 +3,7 @@ xquery version "3.1";
 (: 
  : This module handles calls to the API on item level, e.g.
  : 
- : /textapi/ahikar/3r9ps/3rx15-8a/latest/item.json
+ : /textapi/ahikar/arabic-karshuni/3rx15-8a/latest/item.json
  :)
 
 module namespace tapi-item="http://ahikar.sub.uni-goettingen.de/ns/tapi/item";
@@ -14,7 +14,7 @@ import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons"
 import module namespace tapi-img="http://ahikar.sub.uni-goettingen.de/ns/tapi/images" at "tapi-img.xqm";
 
 
-declare function tapi-item:get-json($collection-uri as xs:string,
+declare function tapi-item:get-json($collection-type as xs:string,
     $manifest-uri as xs:string,
     $page as xs:string,
     $server as xs:string)
@@ -31,7 +31,7 @@ as element(object) {
         <image>
             <id>{tapi-item:make-facsimile-id($manifest-uri, $page, $server)}</id>
         </image>
-        <annotationCollection>{$server}/api/annotations/ahikar/{$collection-uri}/{$manifest-uri}/{$page}/annotationCollection.json</annotationCollection>
+        <annotationCollection>{$server}/api/annotations/ahikar/{$collection-type}/{$manifest-uri}/{$page}/annotationCollection.json</annotationCollection>
     </object>
 };
 
diff --git a/exist-app/modules/tapi-manifest.xqm b/exist-app/modules/tapi-manifest.xqm
index ea5fe07..1e44684 100644
--- a/exist-app/modules/tapi-manifest.xqm
+++ b/exist-app/modules/tapi-manifest.xqm
@@ -3,7 +3,7 @@ xquery version "3.1";
 (: 
  : This module handles calls to the API on manifest level, e.g.
  : 
- : /textapi/ahikar/3r9ps/3rx15/manifest.json
+ : /textapi/ahikar/arabic-karshuni/3rx15/manifest.json
  :)
 
 module namespace tapi-mani="http://ahikar.sub.uni-goettingen.de/ns/tapi/manifest";
@@ -14,13 +14,13 @@ declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
 import module namespace commons="http://ahikar.sub.uni-goettingen.de/ns/commons" at "commons.xqm";
 
 
-declare function tapi-mani:get-json($collection-uri as xs:string,
+declare function tapi-mani:get-json($collection-type as xs:string,
     $manifest-uri as xs:string,
     $server as xs:string)
 as element(object) {
     <object>
         <textapi>{$commons:version}</textapi>
-        <id>{$server || "/api/textapi/ahikar/" || $collection-uri || "/" || $manifest-uri || "/manifest.json"}</id>
+        <id>{$server || "/api/textapi/ahikar/" || $collection-type || "/" || $manifest-uri || "/manifest.json"}</id>
         <label>{tapi-mani:get-manifest-title($manifest-uri)}</label>
         { 
             tapi-mani:make-editors($manifest-uri),
@@ -29,20 +29,20 @@ as element(object) {
             tapi-mani:make-current-location($manifest-uri)
         }
         <license>CC0-1.0</license>
-        <annotationCollection>{$server}/api/annotations/ahikar/{$collection-uri}/{$manifest-uri}/annotationCollection.json</annotationCollection>
-        {tapi-mani:make-sequences($collection-uri, $manifest-uri, $server)}
+        <annotationCollection>{$server}/api/annotations/ahikar/{$collection-type}/{$manifest-uri}/annotationCollection.json</annotationCollection>
+        {tapi-mani:make-sequences($collection-type, $manifest-uri, $server)}
     </object>
 };
 
 
-declare function tapi-mani:make-sequences($collection-uri as xs:string,
+declare function tapi-mani:make-sequences($collection-type as xs:string,
     $manifest-uri as xs:string,
     $server as xs:string)
 as element(sequence)+ {
     let $valid-pages := tapi-mani:get-valid-page-ids($manifest-uri)
     return
         for $page in $valid-pages
-        let $uri := "/api/textapi/ahikar/" || $collection-uri || "/" || $manifest-uri || "-" ||  $page || "/latest/item.json"
+        let $uri := "/api/textapi/ahikar/" || $collection-type || "/" || $manifest-uri || "-" ||  $page || "/latest/item.json"
         return
             <sequence>
                 <id>{$server}{$uri}</id>
@@ -133,5 +133,4 @@ element(x-location) {
             "unknown"
     return
         <x-location>{$string}</x-location>
-
 };
diff --git a/exist-app/modules/tapi.xqm b/exist-app/modules/tapi.xqm
index 32d9cab..63a5159 100644
--- a/exist-app/modules/tapi.xqm
+++ b/exist-app/modules/tapi.xqm
@@ -87,7 +87,7 @@ declare function tapi:remove-whitespaces($doc as document-node()) as document-no
 (:~
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#collection-object
- : @param $collection-uri The unprefixed TextGrid URI of a collection, e.g. '3r132'
+ : @param $collection-type The collection type. Can either be `syriac` or `arabic-karshuni`
  : @return A collection object as JSON
  :)
 declare
@@ -124,10 +124,10 @@ as item()+ {
  :  * the division number, 'n', is mandatory
  :  * 'image' is mandatory since every page has a facsimile
  :
- : Sample call to API: /api/textapi/ahikar/3r17c/3r1pq-147a/latest/item.json
+ : Sample call to API: /api/textapi/ahikar/syriac/3r1pq-147a/latest/item.json
  :
  : @see https://subugoe.pages.gwdg.de/emo/text-api/page/specs/#item
- : @param $collection-uri The unprefixed TextGrid URI of a collection, e.g. '3r17c'
+ : @param $collection-type The collection type. Can either be `syriac` or `arabic-karshuni`
  : @param $manifest-uri The unprefixed TextGrid URI of a document, e.g. '3r1pq'
  : @param $page A page number as encoded in a tei:pb/@n, e.g. '147a'
  : @return Information about a page
@@ -135,9 +135,9 @@ as item()+ {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/textapi/ahikar/{$collection-uri}/{$manifest-uri}-{$page}/latest/item.json")
+    %rest:path("/textapi/ahikar/{$collection-type}/{$manifest-uri}-{$page}/latest/item.json")
     %output:method("json")
-function tapi:endpoint-item($collection-uri as xs:string,
+function tapi:endpoint-item($collection-type as xs:string,
     $manifest-uri as xs:string,
     $page as xs:string)
 as item()+ {
@@ -154,7 +154,7 @@ as item()+ {
  :
  : Sample call to API: /content/3rbmb-1a.html
  :
- : @param $document The unprefixed TextGrid URI of a TEI/XML, e.g. '3rbmb'
+ : @param $tei-xml-uri The unprefixed TextGrid URI of a TEI/XML, e.g. '3rbmb'
  : @param $page The page to be rendered. This has to be the string value of a tei:pb/@n in the given document, e.g. '1a'
  : @return A response header as well as the rendered HTML page
  :)
@@ -208,7 +208,7 @@ as item()+ {
  : function cannot be tested by unit tests.
  :
  : @param $uri The unprefixed TextGrid URI of an image, e.g. '3r1pr'
- : @param $image-section Indicated the image section in percentage to be retured as defined by
+ : @param $image-section Indicates the image section in percentage to be retured as defined by
  : the IIIF Image API
  : @return The image as binary
  :)
-- 
GitLab


From a729b02ff497372266339fd5e0eb2142ea9711cb Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 18 Jan 2021 15:03:57 +0100
Subject: [PATCH 139/155] ci: get results of failing tests

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0703548..4432b58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,6 +54,7 @@ test_exist_app:
     - echo -e "\033[1;33mThere is/are currently $failures failures or errors.\033[0m"
     - if [[ "$failures" -gt 0 || ! -f "exist-app/test/ahikar-test-results.xml" ]]; then exit 1; else exit 0; fi
   artifacts:
+    when: always
     paths:
       - exist-app/test/ahikar-test-results.xml
     reports:
-- 
GitLab


From 1b57e2d97b84cdeacc944da3d912d51938d744e0 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 18 Jan 2021 15:12:39 +0100
Subject: [PATCH 140/155] refactor: rename variable

---
 exist-app/modules/tapi.xqm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/exist-app/modules/tapi.xqm b/exist-app/modules/tapi.xqm
index 63a5159..9fe4447 100644
--- a/exist-app/modules/tapi.xqm
+++ b/exist-app/modules/tapi.xqm
@@ -108,13 +108,13 @@ as item()+ {
 declare
     %rest:GET
     %rest:HEAD
-    %rest:path("/textapi/ahikar/{$collection-uri}/{$manifest-uri}/manifest.json")
+    %rest:path("/textapi/ahikar/{$collection-type}/{$manifest-uri}/manifest.json")
     %output:method("json")
-function tapi:endpoint-manifest($collection-uri as xs:string,
+function tapi:endpoint-manifest($collection-type as xs:string,
     $manifest-uri as xs:string)
 as item()+ {
     $commons:responseHeader200,
-    tapi-mani:get-json($collection-uri, $manifest-uri, $tapi:server)
+    tapi-mani:get-json($collection-type, $manifest-uri, $tapi:server)
 };
 
 
@@ -142,7 +142,7 @@ function tapi:endpoint-item($collection-type as xs:string,
     $page as xs:string)
 as item()+ {
     $commons:responseHeader200,
-    tapi-item:get-json($collection-uri, $manifest-uri, $page, $tapi:server)
+    tapi-item:get-json($collection-type, $manifest-uri, $page, $tapi:server)
 };
 
 (:~
-- 
GitLab


From 28f705f9447eb11a03882f4b23401d417b6458ff Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 22 Jan 2021 13:58:30 +0100
Subject: [PATCH 141/155] ci: fix path

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0703548..23c3e64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,7 @@ load_frontend-all:
   script:
     - 'curl --output frontend.zip --header "PRIVATE-TOKEN: $GITLAB_TOKEN" "$CI_API_V4_URL/projects/$FRONTEND_REPO_ID/jobs/artifacts/develop/download?job=build"'
     - unzip frontend.zip
-    - mkdir frontend
+    - mkdir -p docker/frontend
     - mv Qviewer/dist/* docker/frontend/
   artifacts:
     paths:
-- 
GitLab


From f7e7fd9c82b257e7e058209e37c723b16949b1bb Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 22 Jan 2021 14:00:45 +0100
Subject: [PATCH 142/155] chore: update CHANGELOG, bump version number

---
 CHANGELOG.md               | 8 +++++++-
 exist-app/build.properties | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f48461..4741dd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.1] - 2021-01-22
+
+### Fixed
+
+- a broken path in the CI config
+
 ## [2.5.0] - 2021-01-14
 
-## Changed
+### Changed
 
 - switched from SADE to TextGrid Connect Standalone as a means to get data from TextGrid
 
diff --git a/exist-app/build.properties b/exist-app/build.properties
index 1378932..c3507f3 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=2.5.0
+project.version=2.5.1
 project.title=Ahiqar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
-- 
GitLab


From 9ac7982fdbe1621c41c5cda1bbed956d1707f727 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 22 Jan 2021 14:10:43 +0100
Subject: [PATCH 143/155] ci: update API paths

---
 ci-scripts/.api_tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci-scripts/.api_tests.yml b/ci-scripts/.api_tests.yml
index 34e178a..417e2d2 100644
--- a/ci-scripts/.api_tests.yml
+++ b/ci-scripts/.api_tests.yml
@@ -19,7 +19,7 @@ test_api_status-test:
     - tags
     - develop
   script:
-    - header=$(curl --head -s https://ahikar-test.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
+    - header=$(curl --head -s https://ahikar-test.sub.uni-goettingen.de/api/textapi/ahikar/syriac/collection.json)
     - *check_HTTP_status
 
 test_api_status-develop:
@@ -27,7 +27,7 @@ test_api_status-develop:
   only:
     - develop
   script: 
-    - header=$(curl --head -s https://ahikar-dev.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
+    - header=$(curl --head -s https://ahikar-dev.sub.uni-goettingen.de/api/textapi/ahikar/syriac/collection.json)
     - *check_HTTP_status
 
 test_api_status-main:
-- 
GitLab


From b7e62e558ea70978345eb8ae571b6b48c7da1141 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Fri, 22 Jan 2021 14:41:56 +0100
Subject: [PATCH 144/155] ci: fix API endpoint

---
 ci-scripts/.api_tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-scripts/.api_tests.yml b/ci-scripts/.api_tests.yml
index 417e2d2..c6c14e4 100644
--- a/ci-scripts/.api_tests.yml
+++ b/ci-scripts/.api_tests.yml
@@ -27,7 +27,7 @@ test_api_status-develop:
   only:
     - develop
   script: 
-    - header=$(curl --head -s https://ahikar-dev.sub.uni-goettingen.de/api/textapi/ahikar/syriac/collection.json)
+    - header=$(curl --head -s https://ahikar-dev.sub.uni-goettingen.de/api/textapi/ahikar/3r9ps/collection.json)
     - *check_HTTP_status
 
 test_api_status-main:
-- 
GitLab


From 253bda9182f59a766b2ac21e45d2f2b13f3a7641 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 25 Jan 2021 15:30:41 +0100
Subject: [PATCH 145/155] ci: check if deployment is possible

---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23c3e64..2559698 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,6 +173,10 @@ deploy_app-dev:
   environment:
     name: ahikar-dev
   script:
+    - header=$(curl --head -s https://ahikar-dev.sub.uni-goettingen.de/api/deploy)
+    - status=$(echo $header | head -n 1 | cut -d" " -f 2)
+    - echo "Current HTTP status is $status."
+    - if [[ "$status" != "200" ]]; then exit 1; fi
     - curl --get --silent https://ahikar-dev.sub.uni-goettingen.de/api/deploy
 
 deploy_app-main:
@@ -184,6 +188,10 @@ deploy_app-main:
   environment:
     name: ahikar
   script:
+    - header=$(curl --head -s https://ahikar.sub.uni-goettingen.de/api/deploy)
+    - status=$(echo $header | head -n 1 | cut -d" " -f 2)
+    - echo "Current HTTP status is $status."
+    - if [[ "$status" != "200" ]]; then exit 1; fi
     - curl --get --silent https://ahikar.sub.uni-goettingen.de/api/deploy
 
 # when a git flow release is made, a tag will be pushed starting this job. it
-- 
GitLab


From c725dd5800fb8e9260de7599a1815b266abef893 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Mon, 25 Jan 2021 15:33:54 +0100
Subject: [PATCH 146/155] chore: update CHANGELOG, bump version number

---
 CHANGELOG.md               | 6 ++++++
 exist-app/build.properties | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4741dd8..7a2bbdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.2] - 2021-01-25
+
+### Changed
+
+- added API health check for deploy API
+
 ## [2.5.1] - 2021-01-22
 
 ### Fixed
diff --git a/exist-app/build.properties b/exist-app/build.properties
index c3507f3..e536862 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=2.5.1
+project.version=2.5.2
 project.title=Ahiqar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
-- 
GitLab


From 3e0629168bcd09a98870ec8b80d96e7632242c7a Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 26 Jan 2021 09:27:31 +0100
Subject: [PATCH 147/155] ci: add test with dummy data

---
 .gitlab-ci.yml |  2 ++
 test.html      | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 test.html

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2559698..64fb465 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,6 +82,8 @@ load_frontend-all:
     - unzip frontend.zip
     - mkdir -p docker/frontend
     - mv Qviewer/dist/* docker/frontend/
+    - mkdir docker/frontend/test
+    - mv test.html docker/frontend/test
   artifacts:
     paths:
       - docker/frontend/
diff --git a/test.html b/test.html
new file mode 100644
index 0000000..9f5bbb9
--- /dev/null
+++ b/test.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Sample Page</title>
+    <!--<link rel="stylesheet" href="style.css">-->
+    <!--<script src="script.js"></script>-->
+  </head>
+  <body>
+    <h1>Sample page </h1>
+    Lorem ipsum, lorem ipsum.
+  </body>
+</html>
-- 
GitLab


From 52e9ae05787be123b06d9df19fb7c5d499591801 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 26 Jan 2021 09:44:35 +0100
Subject: [PATCH 148/155] ci: generate two viewer instances

---
 .gitlab-ci.yml |  9 ++++++---
 test.html      | 13 -------------
 2 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 test.html

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64fb465..4001cce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,9 +81,12 @@ load_frontend-all:
     - 'curl --output frontend.zip --header "PRIVATE-TOKEN: $GITLAB_TOKEN" "$CI_API_V4_URL/projects/$FRONTEND_REPO_ID/jobs/artifacts/develop/download?job=build"'
     - unzip frontend.zip
     - mkdir -p docker/frontend
-    - mv Qviewer/dist/* docker/frontend/
-    - mkdir docker/frontend/test
-    - mv test.html docker/frontend/test
+    - cp Qviewer/dist/* docker/frontend/
+    - mkdir docker/frontend/syriac && mkdir docker/frontend/arabic-karshuni
+    - cp Qviewer/dist/* docker/frontend/syriac
+    - sed 's/ahikar-dev.sub.uni-goettingen.de\/api\/textapi\/ahikar\/3r9ps/ahikar-test.sub.uni-goettingen.de\/api\/textapi\/ahikar\/syriac/' docker/frontend/syriac/index.html
+    - cp Qviewer/dist/* docker/frontend/arabic-karshuni
+    - sed 's/ahikar-dev.sub.uni-goettingen.de\/api\/textapi\/ahikar\/3r9ps/ahikar-test.sub.uni-goettingen.de\/api\/textapi\/ahikar\/arabic-karshuni/' docker/frontend/arabic-karshuni/index.html
   artifacts:
     paths:
       - docker/frontend/
diff --git a/test.html b/test.html
deleted file mode 100644
index 9f5bbb9..0000000
--- a/test.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Sample Page</title>
-    <!--<link rel="stylesheet" href="style.css">-->
-    <!--<script src="script.js"></script>-->
-  </head>
-  <body>
-    <h1>Sample page </h1>
-    Lorem ipsum, lorem ipsum.
-  </body>
-</html>
-- 
GitLab


From e90ea6be01308adab87afde3c72dfad5dc08a9df Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 26 Jan 2021 09:53:29 +0100
Subject: [PATCH 149/155] ci: fix regex

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4001cce..a9ef3f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,9 +84,9 @@ load_frontend-all:
     - cp Qviewer/dist/* docker/frontend/
     - mkdir docker/frontend/syriac && mkdir docker/frontend/arabic-karshuni
     - cp Qviewer/dist/* docker/frontend/syriac
-    - sed 's/ahikar-dev.sub.uni-goettingen.de\/api\/textapi\/ahikar\/3r9ps/ahikar-test.sub.uni-goettingen.de\/api\/textapi\/ahikar\/syriac/' docker/frontend/syriac/index.html
+    - sed -i 's/ahikar-dev.sub.uni-goettingen.de\/api\/textapi\/ahikar\/3r9ps/ahikar-test.sub.uni-goettingen.de\/api\/textapi\/ahikar\/syriac/' docker/frontend/syriac/index.html
     - cp Qviewer/dist/* docker/frontend/arabic-karshuni
-    - sed 's/ahikar-dev.sub.uni-goettingen.de\/api\/textapi\/ahikar\/3r9ps/ahikar-test.sub.uni-goettingen.de\/api\/textapi\/ahikar\/arabic-karshuni/' docker/frontend/arabic-karshuni/index.html
+    - sed -i 's/ahikar-dev.sub.uni-goettingen.de\/api\/textapi\/ahikar\/3r9ps/ahikar-test.sub.uni-goettingen.de\/api\/textapi\/ahikar\/arabic-karshuni/' docker/frontend/arabic-karshuni/index.html
   artifacts:
     paths:
       - docker/frontend/
-- 
GitLab


From 9ad3be22cc29eda0e70fcb95683f03b605bf0b14 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 26 Jan 2021 13:24:23 +0100
Subject: [PATCH 150/155] chore: bump versoin number, update CHANGELOG

---
 CHANGELOG.md               | 6 ++++++
 exist-app/build.properties | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a617d3..35fb402 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.0] - 2021-01-26
+
+### Changed
+
+- provide two instances of the viewer, one for Syriac and one for Arabic/Karshuni texts
+
 ## [3.0.0] - 2021-01-18
 
 ### Changed
diff --git a/exist-app/build.properties b/exist-app/build.properties
index cda5e5e..9ebefb1 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=3.0.0
+project.version=3.1.0
 project.title=Ahiqar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
-- 
GitLab


From e6ea5289d5d3c2655a87de75ce903e7acca8bc22 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 26 Jan 2021 15:14:22 +0100
Subject: [PATCH 151/155] ci: update regex

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9d06c1..5b3dec4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,9 +85,8 @@ load_frontend-all:
     - cp Qviewer/dist/* docker/frontend/
     - mkdir docker/frontend/syriac && mkdir docker/frontend/arabic-karshuni
     - cp Qviewer/dist/* docker/frontend/syriac
-    - sed -i 's/ahikar-dev.sub.uni-goettingen.de\/api\/textapi\/ahikar\/3r9ps/ahikar-test.sub.uni-goettingen.de\/api\/textapi\/ahikar\/syriac/' docker/frontend/syriac/index.html
+    - sed -i 's/textapi\/ahikar\/arabic-karshuni/textapi\/ahikar\/syriac' docker/frontend/syriac/index.html
     - cp Qviewer/dist/* docker/frontend/arabic-karshuni
-    - sed -i 's/ahikar-dev.sub.uni-goettingen.de\/api\/textapi\/ahikar\/3r9ps/ahikar-test.sub.uni-goettingen.de\/api\/textapi\/ahikar\/arabic-karshuni/' docker/frontend/arabic-karshuni/index.html
   artifacts:
     paths:
       - docker/frontend/
-- 
GitLab


From cd684c9a82b2d7b6ba3f0b22e9d7898c05fce3b4 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 26 Jan 2021 15:19:45 +0100
Subject: [PATCH 152/155] ci: fix typo

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b3dec4..9b932f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,7 +85,7 @@ load_frontend-all:
     - cp Qviewer/dist/* docker/frontend/
     - mkdir docker/frontend/syriac && mkdir docker/frontend/arabic-karshuni
     - cp Qviewer/dist/* docker/frontend/syriac
-    - sed -i 's/textapi\/ahikar\/arabic-karshuni/textapi\/ahikar\/syriac' docker/frontend/syriac/index.html
+    - sed -i 's/textapi\/ahikar\/arabic-karshuni/textapi\/ahikar\/syriac/' docker/frontend/syriac/index.html
     - cp Qviewer/dist/* docker/frontend/arabic-karshuni
   artifacts:
     paths:
-- 
GitLab


From ea239457dda017091f5035dad1727c97ef417ef3 Mon Sep 17 00:00:00 2001
From: mrodzis <weidling@sub.uni-goettingen.de>
Date: Wed, 27 Jan 2021 09:41:44 +0100
Subject: [PATCH 153/155] Bugfix/#87 tile follow up

---
 CHANGELOG.md                   |  6 ++++++
 exist-app/build.properties     |  2 +-
 exist-app/modules/tapi-img.xqm | 10 +++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a617d3..53e8333 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.1] - 2021-01-27
+
+### Changed
+
+- `local:truncate` in `tapi-img.xqm` has been renamed to `local:round` to better grasp what the function does.
+
 ## [3.0.0] - 2021-01-18
 
 ### Changed
diff --git a/exist-app/build.properties b/exist-app/build.properties
index cda5e5e..fd1dd02 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=3.0.0
+project.version=3.0.1
 project.title=Ahiqar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
diff --git a/exist-app/modules/tapi-img.xqm b/exist-app/modules/tapi-img.xqm
index 032b45c..d5f1dd0 100644
--- a/exist-app/modules/tapi-img.xqm
+++ b/exist-app/modules/tapi-img.xqm
@@ -96,15 +96,15 @@ as element(svg:rect) {
 
 declare function tapi-img:get-svg-section-dimensions-as-string($svg as element(svg:rect))
 as xs:string {
-    let $x-offset := local:truncate($svg/@x)
-    let $y-offset := local:truncate($svg/@y)
-    let $width := local:truncate($svg/@width)
-    let $height := local:truncate($svg/@height)
+    let $x-offset := local:round($svg/@x)
+    let $y-offset := local:round($svg/@y)
+    let $width := local:round($svg/@width)
+    let $height := local:round($svg/@height)
     return
         string-join(($x-offset, $y-offset, $width, $height), ",")
 };
 
-declare function local:truncate($number-as-string as attribute())
+declare function local:round($number-as-string as attribute())
 as xs:string {
   $number-as-string
     => substring-before("%")
-- 
GitLab


From 9299657f132f68488cbb486e04990c2f55067cef Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 27 Jan 2021 13:15:42 +0100
Subject: [PATCH 154/155] chore: rename file

---
 exist-app/{master.build.properties => main.build.properties} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename exist-app/{master.build.properties => main.build.properties} (100%)

diff --git a/exist-app/master.build.properties b/exist-app/main.build.properties
similarity index 100%
rename from exist-app/master.build.properties
rename to exist-app/main.build.properties
-- 
GitLab


From d029325e5616dd5a5bc85e586aac85ba6e2873a5 Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Wed, 27 Jan 2021 13:21:20 +0100
Subject: [PATCH 155/155] chore: update CHANGELOG, bump version numver

---
 CHANGELOG.md               | 9 ++++++++-
 exist-app/build.properties | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af10032..5847bcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.1.0] - 2021-01-26
+## [3.1.1] - 2021-01-27
+
+### Fixed
+
+- rename `master.build.properties` to `main.build.properties` to match the actual branch names.
+This is necessary to build a package and upload it to our package store (ci.de.dariah.eu).
+
+## [3.1.0] - 2021-01-27
 
 ### Changed
 
diff --git a/exist-app/build.properties b/exist-app/build.properties
index 9ebefb1..64529fb 100644
--- a/exist-app/build.properties
+++ b/exist-app/build.properties
@@ -1,5 +1,5 @@
 project.name=https://ahikar-test.sub.uni-goettingen.de/
-project.version=3.1.0
+project.version=3.1.1
 project.title=Ahiqar
 project.abbrev=ahikar-test
 project.processorversion=5.2.0
-- 
GitLab