26 q2

.gitignore

@@ -19,3 +19,4 @@ edoc/rest2/v2.json
 # node-reladted stuff
 node_modules/
 
+.codex

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "edoc/include/xstring"]
-	path = edoc/include/xstring
-	url = https://github.com/dariok/XStringUtils
 [submodule "edoc/include/wdbmeta"]
 	path = edoc/include/wdbmeta
 	url = https://github.com/dariok/wdbmeta

edoc/admin/global.xqm

@@ -9,7 +9,7 @@ declare namespace meta   = "https://github.com/dariok/wdbplus/wdbmeta";
 declare namespace system = "http://exist-db.org/xquery/system";
 
 declare function wdbGS:getRest ( $node as node(), $model as map(*) ) as element(meta) {
-  <meta name="rest" content="{ $config:restURL }" />
+  $config:restMetaElement
 };
 
 declare function wdbGS:body ( $node as node(), $model as map(*) ) {

edoc/admin/projects.xqm

@@ -6,7 +6,6 @@ import module namespace config   = "https://github.com/dariok/wdbplus/config" at
 import module namespace sm       = "http://exist-db.org/xquery/securitymanager";
 import module namespace wdbFiles = "https://github.com/dariok/wdbplus/files"  at "../modules/wdb-files.xqm";
 import module namespace wdbs     = "https://github.com/dariok/wdbplus/stats"  at "../modules/stats.xqm";
-import module namespace xstring  = "https://github.com/dariok/XStringUtils"   at "../include/xstring/string-pack.xql";
 
 declare namespace meta   = "https://github.com/dariok/wdbplus/wdbmeta";
 declare namespace tei    = "http://www.tei-c.org/ns/1.0";
@@ -29,8 +28,10 @@ declare function wdbPL:body ( $node as node(), $model as map(*) ) {
       let $metaFile := doc($metaPath)
 
       let $relativePath := substring-after($file, $model?pathToEd || '/')
-      let $subColl := xstring:substring-before-last($file, '/')
-      let $resource := xstring:substring-after-last($file, '/')
+      let $subColl := if (starts-with($file, '/'))
+        then '/' || string-join(tokenize(normalize-space($file), '/')[position() lt last()], '/')
+        else string-join(tokenize(normalize-space($file), '/')[position() lt last()], '/')
+      let $resource := tokenize(normalize-space($file), '/')[last()]
       let $fileEntry := $metaFile//meta:file[@path = $relativePath]
       let $xml := doc($file)
 
@@ -203,7 +204,7 @@ declare %private function wdbPL:getFileStat( $model as map(*), $id as xs:string
                   <td>externe PID</td>
                   <td>{if ($entry/@pid = $pid)
                     then "OK: " || string($entry/@pid)
-                    else <a href="javascript:job('pid', '{$id}'">PID aus Datei übernehmen</a>
+                    else <a href="javascript:job('pid', '{$id}')">PID aus Datei übernehmen</a>
                   }</td>
                 </tr>,
                 <tr>

edoc/config/edoc/data/collection.xconf

@@ -3,44 +3,32 @@
     <!-- Lucene index is configured below -->
     <lucene>
       <analyzer id="std" class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
-      <!-- This index configuration is likely to be revised in later releases of wdb+ -->
-
-      <!-- index files and standOff: index main name parts but not whole lists -->
-      <text qname="tei:persName"/>
-      <text qname="tei:placeName"/>
-      <text qname="tei:orgName"/>
-      <text qname="tei:title"/>
-
-      <!-- main text -->
-      <!-- tei:text for fast first step, cf. rest-search.xql: /edoc/search/collection/{$id}.xml -->
+      <!-- main index – information for filtering is provided when results are prepared per file -->
       <text qname="tei:text"/>
 
-      <!-- notes usually contain text that is outside the main text’s flow; hence, they must be
-        handled separately -->
-      <ignore qname="tei:note"/>
-      <text qname="tei:note"/>
+      <!-- notes usually contain text that is outside the main text’s flow; hence, they must be handled separately. -->
+      <ignore qname="tei:note" />
+      <text qname="tei:note" />
 
-      <!-- main structure types that contain relevant text -->
-      <text qname="tei:p"/>
-      <text qname="tei:ab"/>
-      <text qname="tei:opener"/>
-      <text qname="tei:closer"/>
-      <text qname="tei:postscript"/>
-      <text qname="tei:cell"/>
-      <text qname="tei:label"/>
-      <text qname="tei:item"/>
-      <text qname="tei:quote"/>
-      <text qname="tei:head"/>
-      <text qname="tei:l"/>
+      <!-- headings will often be used for filtering and thus an additional index is created; unlike notes, however,
+        they are still part of the general text index -->
+      <text qname="tei:head" />
 
-      <!-- index w for fast queries for single words if text is tokenized -->
-      <!--<text qname="tei:w"/>-->
-
-      <!-- lists are not indexed, only the main entry head -->
+      <!-- lists of entities are not indexed, only the main entry head is added as a range index below -->
       <ignore qname="tei:listPerson"/>
+      <!-- <text qname="tei:persName"/> -->
       <ignore qname="tei:listPlace"/>
+      <!-- <text qname="tei:placeName"/> -->
       <ignore qname="tei:listOrg"/>
+      <!-- <text qname="tei:orgName"/> -->
       <ignore qname="tei:listBibl"/>
+      <!-- <text qname="tei:title"/> -->
+
+      <!-- contemporary changes: only the intended for, with tei:add, is to be indexed -->
+      <inline qname="tei:subst"/>
+      <ignore qname="tei:del"/>
+
+      <!-- modern intervention, choice[orig+reg] and choice[sic+corr], must occur at word level !! → documentation -->
 
       <!-- elements that may appear within a word -->
       <inline qname="tei:unclear"/>
@@ -51,15 +39,23 @@
 
       <!-- things to ignore -->
       <ignore qname="tei:pb"/>
-      <ignore qname="tei:fw"/>
+      <ignore qname="tei:cb"/>
       <ignore qname="tei:lb"/>
+      <ignore qname="tei:fw"/>
       <ignore qname="tei:pc"/>
     </lucene>
     <range>
-      <!-- configuration for metadata files -->
-      <create qname="meta:file">
+      <!-- configuration for metadata files – should be rewritten to match agains out index of ID → path -->
+      <!-- <create qname="meta:file">
         <field name="file-path" match="@path" type="xs:string"/>
-      </create>
+      </create> -->
+
+       <!-- entities -->
+      <create qname="tei:persName" type="xs:string" />
+      <create qname="tei:placeName" type="xs:string" />
+      <create qname="tei:orgName" type="xs:string" />
+      <create qname="tei:eventName" type="xs:string" />
+      <create qname="tei:title" type="xs:string" />
 
       <!-- attributes for semantic elements -->
       <create qname="@ref" type="xs:string"/>

edoc/controller.xql

@@ -5,30 +5,30 @@
  :)
 xquery version "3.1";
 
-import module namespace login      = "http://exist-db.org/xquery/login"          at "resource:org/exist/xquery/modules/persistentlogin/login.xql";
-import module namespace request    = "http://exist-db.org/xquery/request"        at "java:org.exist.xquery.functions.request.RequestModule";
+import module namespace request = "http://exist-db.org/xquery/request" at "java:org.exist.xquery.functions.request.RequestModule";
 
 declare namespace config = "https://github.com/dariok/wdbplus/config";
 declare namespace exist  = "http://exist.sourceforge.net/NS/exist";
+declare namespace meta = "https://github.com/dariok/wdbplus/wdbmeta";
 
 declare variable $exist:path external;
 declare variable $exist:resource external;
 declare variable $exist:controller external;
 declare variable $exist:prefix external;
-(: declare variable $exist:root external; :)
+declare variable $exist:root external;
 
 declare variable $local:isget := request:get-method() = ("GET","get");
 declare variable $local:config := doc("/db/apps/edoc/config.xml")/config:config;
 
-util:log("info", request:get-method() || " " || request:get-url() || ' ? ' || request:get-query-string() || " -> resource: " || $exist:resource),
+(: util:log("info", "Request-Path: " || $exist:path || "; Resource: " || $exist:resource || "; Controller: " || $exist:controller || "; Prefix: " || $exist:prefix || "; Root: " || $exist:root), :)
+util:log("info", request:get-method() || " " || request:get-url() || ' ? ' || request:get-query-string() || " → resource: " || $exist:resource),
 
 (: static HTML page for API documentation should be served directly to make sure it is always accessible :)
-if (
-    ( $local:isget and $exist:resource = ('v2.json', 'apiv2.html') )
-) then
+if ( $local:isget and $exist:resource = ('v2.json', 'apiv2.html') ) then
   <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
     <forward url="{$exist:controller}/rest2/{$exist:resource}"/>
   </dispatch>
+
 (: login :)
 else if ( $exist:resource = 'login' ) then
   <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
@@ -41,23 +41,37 @@ else if ( $exist:resource = 'logout' ) then
       <add-parameter name="logout" value="logout" />
     </forward>
   </dispatch>
+
 (: REST API :)
 else if ( contains($exist:path, 'api/v2') ) then
   <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
-    <forward url="{$exist:controller}/rest2/api.xq"/>
+    <forward url="{$exist:controller}/rest2/api.xq">
+      {
+        (: we currently need this workaround here as Jetty snatches all OPTIONS requests before they can be parsed by roaster :)
+        if ( request:get-method() = ('options', 'OPTIONS') and $local:config//config:origin = request:get-header('origin') )
+        then (
+          <set-header name="Access-Control-Allow-Origin" value="{ request:get-header('origin') }" />,
+          <set-header name="Access-Control-Allow-Methods" value="{ request:get-method() }" />,
+          <set-header name="Access-Control-Allow-Headers" value="authorization" />,
+          <set-header name="Access-Control-Allow-Credentials" value="true" />
+        )
+        else ()
+      }
+    </forward>
   </dispatch>
+
+(: global index.html :)
 else if ( $exist:resource eq '' or $exist:resource eq 'index.html' ) then
   <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
     <forward url="{$exist:controller}/global/index.html"/>
   </dispatch>
+
 (: admin pages :)
 else if ( ends-with($exist:resource, ".html") and contains($exist:path, '/admin/') ) then
   <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
-    { login:set-user("wd", substring-before(request:get-uri(), $exist:path), xs:dayTimeDuration("P2D"), false()) }
     <view>
       <set-header name="Cache-Control" value="no-cache"/>
-      <forward url="{$exist:controller}/admin/view.xql">
-      </forward>
+      <forward url="{$exist:controller}/admin/view.xql"/>
     </view>
     <error-handler>
       <forward url="{$exist:controller}/templates/error-page.html" method="get"/>
@@ -75,34 +89,41 @@ else if ( ends-with($exist:resource, ".html") ) then
         }
       </forward>
     </view>
+    <error-handler>
+      <forward url="{$exist:controller}/templates/error-page.html" method="get"/>
+      <forward url="{$exist:controller}/modules/view.xql"/>
+    </error-handler>
   </dispatch>
-  (: generic resources :)
-  else if ( contains($exist:path, "/$shared/") ) then
-    <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
-      <forward url="{$exist:controller}/resources/{substring-after($exist:path, '/$shared/')}">
-        {
-          for $header in $local:config//config:header
-            return <set-header>{ $header/@* }</set-header>
-        }
-      </forward>
-    </dispatch>
-  (: instance specific resources :)
-  else if ( contains($exist:path, "/$global/") ) then
-    <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
-      <forward url="{$exist:controller}/data/resources/{substring-after($exist:path, '/$global/')}">
-        {
-          for $header in $local:config//config:header
-            return <set-header>{ $header/@* }</set-header>
-        }
-      </forward>
-    </dispatch>
-else if ( ends-with($exist:path, ".xql") ) then
+
+(: generic resources :)
+else if ( contains($exist:path, "/$shared/") ) then
+  <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
+    <forward url="{$exist:controller}/resources/{substring-after($exist:path, '/$shared/')}">
+      {
+        for $header in $local:config//config:header
+          return <set-header>{ $header/@* }</set-header>
+      }
+    </forward>
+  </dispatch>
+(: instance specific resources :)
+else if ( contains($exist:path, "/$global/") ) then
+  <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
+    <forward url="{$exist:controller}/data/resources/{substring-after($exist:path, '/$global/')}">
+      {
+        for $header in $local:config//config:header
+          return <set-header>{ $header/@* }</set-header>
+      }
+    </forward>
+  </dispatch>
+
+else if ( ends-with($exist:path, ".xql") or ends-with($exist:path, ".xq") ) then
   <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
     <set-header name="Cache-Control" value="no-cache"/>
     <set-attribute name="app-root" value="{$exist:prefix}{$exist:controller}"/>
   </dispatch>
-else
+
   (: everything else is passed through :)
+else
   <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
     <cache-control cache="yes"/>
     <set-header name="Cache-Control" value="max-age=604800, must-revalidate"/>

edoc/expath-pkg.xml

@@ -2,5 +2,5 @@
    <title>W. Digitale Bibliothek</title>
    <dependency processor="http://exist-db.org" semver-min="6.0.0" />
    <dependency package="http://exist-db.org/html-templating" semver-min="1.1.0"/>
-   <dependency package="http://e-editiones.org/roaster" semver-min="1.10.0"/>
+   <dependency package="http://e-editiones.org/roaster" semver-min="1.11.0"/>
 </package>

edoc/index/index-projects.xq

@@ -23,4 +23,5 @@ for $project in collection('/db/apps/edoc/data')//meta:projectMD
     if ( not(empty($file-entries)) )
       then update insert $file-entries into doc("/db/apps/edoc/index/file-index.xml")/index:index
       else ()
-  )
+  ),
+xmldb:reindex("/db/apps/edoc/index")