Refactoring/2022

.gitignore

@@ -1,3 +1,19 @@
+.git
+.DS_Store
+.idea
+.vscode
+/node_modules
+.env
+.env.*
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+.setadminpw
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 *.bak
-build/*
-repo.xml
+/build
+/dist

admin.html

@@ -11,46 +11,61 @@ <h1>
                 Link to <a target="_new" href="https://stats.adwmainz.net/index.php?module=CoreHome&amp;action=index&amp;idSite=20&amp;period=day&amp;date=yesterday&amp;ignoreSalt=eb2d7603c7b3f98ce81efb011e901d4c#?module=Dashboard&amp;action=embeddedIndex&amp;idSite=20&amp;period=day&amp;date=yesterday&amp;ignoreSalt=eb2d7603c7b3f98ce81efb011e901d4c&amp;idDashboard=1">Piwik page</a>.<br/>
                 <a href="reindex.xql" target="_new">Reindex</a> eXist-db.
             </p>
-            <!--        <p><a href="admin-svn.html">SVN Functions</a>.</p> -->
         </div>
 
-        <div class="row" data-template="app:loadListOfWorks" data-template-sort="wid">
+        <div class="row" data-template="admin:loadListOfWorks">
             <h2>Works</h2>
             <p>
                 <span data-template="app:workCount">0</span> works found.
             </p>
+            <p>
+                <a href="create-lists.html" role="button" class="btn btn-primary">Write/overwrite list of works!</a>
+                <!-- TODO: (?) <a href="postRoutes.xql" role="button" class="btn btn-primary">Write all routes to Caddy</a>
+                            for now, it suffices to do it individually and with the shell scripts "/etc/caddy/{buildroutes.sh,postroutes.sh}" on the server
+                 -->
+            </p>
             <table class="table table-hover">
                 <tr>
                     <th>Werk-ID</th>
+                    <th>IIIF Resource</th>
                     <th>Node Index</th>
+                    <th>Crumbtrails</th>
+                    <th>Full PDF</th>
                     <th>HTML Fragments</th>
+                    <th>Catalogue/details Page</th>
                     <th>Sphinx Fragments</th>
+                    <th>NLP csv file</th>
+                    <th>Stats file</th>
+                    <th>Routing Information</th>
                     <th>RDF Triples</th>
-                    <th>IIIF Resource</th>
                 </tr>
                 <tr data-template="templates:each" data-template-from="listOfWorks" data-template-to="currentWork">
                     <td data-template="admin:workString">boing</td>
+                    <td data-template="admin:needsIIIFResourceString">boing</td>
                     <td data-template="admin:needsIndexString">boing</td>
+                    <td data-template="admin:needsCrumbtrailString">boing</td>
+                    <td data-template="admin:needsPdfString">boing</td>
                     <td data-template="admin:needsHTMLString">boing</td>
-                    <td data-template="admin:needsSphinxSnippetsString">boing</td>
+                    <td data-template="admin:needsDetailsString">boing</td>
+                    <td data-template="admin:needsSnippetsString">boing</td>
+                    <td data-template="admin:needsNLPString">boing</td>
+                    <td data-template="admin:needsStatsString">boing</td>
+                    <td data-template="admin:needsRoutingString">boing</td>
                     <td data-template="admin:needsRDFString">boing</td>
-                    <td data-template="admin:needsIIIFResourceString">boing</td>
                 </tr>
-                <br/>
-                <a href="createLists.html" role="button" class="btn btn-primary">Write/overwrite list of works and save!</a>
-                <br/>
             </table>
             <p>
-                <span data-template="admin:needsTeiCorpusZip">boing</span>
+                <span data-template="admin:needsTeiCorpusZipString">boing</span>
             </p>
             <p>
-                <span data-template="admin:needsTxtCorpusZip">boing</span>
+                <span data-template="admin:needsTxtCorpusZipString">boing</span>
             </p>
             <p>
-                <span data-template="admin:needsStats">boing</span>
+                <span data-template="admin:needsCorpusStatsString">boing</span>
             </p>
         </div>
 
+<!-- Authors
         <div class="row" data-template="app:loadListOfAuthors">
             <h2>Authors</h2>
             <table class="table table-hover">
@@ -64,49 +79,63 @@ <h2>Authors</h2>
                     <tr data-template="templates:each" data-template-from="listOfAuthors" data-template-to="currentAuthor">
                         <td data-template="admin:authorString">boing</td>
                         <td data-template="admin:authorMakeHTML">boing</td>
-                        <td data-template="admin:needsSphinxSnippetsString">boing</td>
+                        <td data-template="admin:needsSnippetsString">boing</td>
                         <td data-template="admin:needsRDFString">boing</td>
                     </tr>
                 </tbody>
             </table>
-
         </div>
-
-        <div class="row" data-template="app:loadDictionary">
+-->
+
+        <div class="row" data-template="admin:loadListOfLemmata" data-template-to="currentLemma">
             <h2>Lemmata</h2>
+            <p>
+                <a href="create-lists-dict.html" role="button" class="btn btn-primary">Write/overwrite list of dictionary entries!</a>
+                <!-- TODO: (?) <a href="postRoutes.xql" role="button" class="btn btn-primary">Write all routes to Caddy</a>
+                            for now, it suffices to do it individually and with the shell scripts "/etc/caddy/{buildroutes.sh,postroutes.sh}" on the server
+                 -->
+            </p>
             <table class="table table-hover">
                 <tbody>
                     <tr>
                         <th>Lemma-ID</th>
+                        <th>Node Index</th>
+                        <th>Crumbtrails</th>
                         <th>HTML</th>
                         <th>Sphinx Fragmente</th>
+                        <th>Routing</th>
                     </tr>
                     <tr data-template="templates:each" data-template-from="listOfLemmata" data-template-to="currentLemma">
                         <td data-template="admin:lemmaString">boing</td>
-                        <td data-template="admin:lemmaMakeHTML">boing</td>
-                        <td data-template="admin:needsSphinxSnippetsString">boing</td>
+                        <td data-template="admin:needsIndexString">boing</td>
+                        <td data-template="admin:needsCrumbtrailString">boing</td>
+                        <td data-template="admin:needsHTMLString">boing</td>
+                        <td data-template="admin:needsSnippetsString">boing</td>
+                        <td data-template="admin:needsRoutingString">boing</td>
                     </tr>
                 </tbody>
             </table>
         </div>
-        
-        <div class="row" data-template="app:loadListOfWps">
+
+        <div class="row" data-template="admin:loadListOfWorkingpapers">
             <h2>Working Papers</h2>
             <table class="table table-hover">
                 <tbody>
                     <tr>
                         <th>WP-ID</th>
-                        <!--                    <th>HTML</th> -->
+                        <th>Details</th>
                         <th>Sphinx Fragmente</th>
+                        <th>Routing</th>
                     </tr>
-                    <tr data-template="templates:each" data-template-from="listOfWps" data-template-to="currentWp">
+                    <tr data-template="templates:each" data-template-from="listOfWorkingpapers" data-template-to="currentWP">
                         <td data-template="admin:WPString">boing</td>
-                        <!--                    <td data-template="admin:lemmaMakeHTML">boing</td>  -->
-                        <td data-template="admin:needsSphinxSnippetsString">boing</td>
+                        <td data-template="admin:needsDetailsString">boing</td>
+                        <td data-template="admin:needsSnippetsString">boing</td>
+                        <td data-template="admin:needsRoutingString">boing</td>
                     </tr>
                 </tbody>
             </table>
         </div>
-        
+
     </div>
 </div>

controller.xql

@@ -8,9 +8,9 @@ import module namespace util    = "http://exist-db.org/xquery/util";
 import module namespace functx  = "http://www.functx.com";
 import module namespace rest = "http://exquery.org/ns/restxq";
 
-import module namespace config  = "http://www.salamanca.school/xquery/config"     at "modules/config.xqm";
-import module namespace net     = "http://www.salamanca.school/xquery/net"        at "modules/net.xqm";
-import module namespace iiif    = "http://www.salamanca.school/xquery/iiif"       at "modules/iiif.xqm";
+import module namespace config  = "https://www.salamanca.school/xquery/config"     at "modules/config.xqm";
+import module namespace net     = "https://www.salamanca.school/xquery/net"        at "modules/net.xqm";
+import module namespace iiif    = "https://www.salamanca.school/xquery/iiif"       at "modules/iiif.xqm";
 
 declare       namespace exist   = "http://exist.sourceforge.net/NS/exist";
 declare       namespace output  = "http://www.w3.org/2010/xslt-xquery-serialization";
@@ -67,6 +67,7 @@ let $parameterString    :=
 
 
 (: Print request context for debugging :)
+(: 
 let $debug :=  
     if ($config:debug = "trace") then
         console:log("Request at '" || request:get-header('X-Forwarded-Host') || "' for " || request:get-effective-uri() || "
 " ||
@@ -77,7 +78,7 @@ let $debug :=
                     "$lang: " || $lang || "."
                    )
     else ()
-
+:)
 
 (: Here comes the actual routing ... :)
 return
@@ -97,7 +98,7 @@ return
     else if ($exist:resource = "favicon.ico") then
         (:let $debug := if ($config:debug = "trace") then util:log("warn", "Favicon requested: " || $net:forwardedForServername || $exist:path || ".") else ()
         return :)
-        if ($config:instanceMode = "testing") then
+        if ($config:instanceMode = ("testing", "fakeprod", "dockernet")) then
             net:forward("/resources/favicons/" || replace($exist:resource, "favicon", "favicon_red"), $netVars)
         else
             net:forward("/resources/favicons/" || $exist:resource, $netVars)
@@ -116,12 +117,12 @@ return
 
 
     (: *** Entity resolver (X-Forwarded-Host = 'id.{$config:serverdomain}') *** :)
-    else if (request:get-header('X-Forwarded-Host') = "id." || $config:serverdomain) then
+    else if (request:get-header('X-Forwarded-Host') = "id." || $config:serverdomain or substring($exist:path, 1, 7) = "/texts/") then
         let $debug1 := if ($config:debug = ("trace", "info")) then console:log("Id requested: " || $net:forwardedForServername || $exist:path || $parameterString || ". (" || net:negotiateContentType($net:servedContentTypes, '') || ')') else ()
-        let $debug1 := if ($config:debug = ("trace")) then console:log("Redirect (303) to '" || $config:apiserver || "/v1" || $exist:path || $parameterString || "'.") else ()
+        let $debug1 := if ($config:debug = ("trace")) then console:log("Redirect (303) to '" || $config:apiserver || "/v1" || translate($exist:path, "_", ":") || $parameterString || "'.") else ()
         return 
             if (matches($exist:path, '(/texts|/concepts/|/authors)')) then 
-                net:redirect-with-303($config:apiserver || "/v1" || $exist:path || $parameterString)
+                net:redirect-with-303($config:apiserver || "/v1" || translate($exist:path, "_", ":") || $parameterString)
             else if (matches($exist:path, '/works\.')) then 
                 net:redirect-with-303($config:apiserver || "/v1" || replace($exist:path, '/works\.', '/texts/') || $parameterString)
             else net:error(404, $netVars, ())
@@ -233,7 +234,7 @@ return
                     switch ($resource) (: cases need to be lower-cased :)
                         case "admin.html"
                         case "corpus-admin.html"
-                        case "createlists.html"
+                        case "create-lists.html"
                         case "iiif-admin.html"
                         case "rendertherest.html"
                         case "render.html"
@@ -267,11 +268,11 @@ return
 
     (: Relative path requests from sub-collections are redirected there :)
     else if (contains($exist:path, "/resources/")) then
-        let $debug := if ($config:debug = "trace") then console:log("Resource requested: " || $net:forwardedForServername || $exist:path || $parameterString || ".") else ()
+        let $debug := () (: if ($config:debug = "trace") then console:log("Resource requested: " || $net:forwardedForServername || $exist:path || $parameterString || ".") else ():)
 (:        let $debug := if ($config:debug = "trace") then util:log("warn", "Favicon requested: " || $net:forwardedForServername || $exist:path || ".") else ():)
         return 
             if (contains(lower-case($exist:resource), "favicon")) then
-                if ($config:instanceMode = "testing") then
+                if ($config:instanceMode = ("testing", "fakeprod", "dockernet")) then
                     net:forward("/resources/favicons/" || replace($exist:resource, "favicon", "favicon_red"), $netVars)
                 else
                     net:forward("/resources/favicons/" || $exist:resource, $netVars)

createLists.html → create-lists-dict.html

@@ -20,15 +20,21 @@ <h2 class="hidden-lg hidden-md">
         </h2>
         <div class="row">
             <div class="col-md-6">
-                <div data-template="admin:saveFileWRK">
+                <div data-template="admin:buildDictList">
                     Booo! Something went wrong!
                 </div>
             </div>
             <div class="col-md-6">
-                <div data-template="admin:saveFileWRKnoJs">
+                <div data-template="admin:buildDictListNoJs">
                     Booo! Something went wrong!
                 </div>
             </div>
         </div>
+        <div class="row">
+            <div class="col-md-6">
+                <a href="dictionary.html" class="btn btn-info" role="button">
+                    <span class="glyphicon glyphicon-thumbs-up" aria-hidden="true"></span> Open dictionary.html</a>
+            </div>
+        </div>
     </div>
-</div>
+</div>

create-lists.html

@@ -0,0 +1,56 @@
+<div xmlns:i18n="http://exist-db.org/xquery/i18n" data-template="templates:surround" data-template-with="templates/template_basic.html" data-template-at="content">
+    <div class="container" data-template="i18n:translate" data-template-catalogues="data/i18n">
+        <h2 style="margin-top: 3%" class="hidden-md hidden-sm hidden-xs">
+            <span class="text-muted">
+                Dateien gespeichert!
+            </span>
+            <hr/>
+        </h2>
+        <h2 style="margin-top: 2%" class="hidden-lg hidden-sm hidden-xs">
+            <span class="text-muted">
+                Dateien gespeichert!
+            </span>
+            <hr/>
+        </h2>
+        <h2 class="hidden-lg hidden-md">
+            <span class="text-muted">
+                Dateien gespeichert!
+            </span>
+            <hr/>
+        </h2>
+        <div class="row">
+            <div class="col-md-6">
+                <div data-template="admin:buildFacets">
+                    Booo! Something went wrong!
+                </div>
+            </div>
+            <div class="col-md-6">
+                <div data-template="admin:buildFacetsNoJs">
+                    Booo! Something went wrong!
+                </div>
+            </div>
+<!--            <div class="col-md-6">
+                <div data-template="admin : exportFileWRK">
+                    Booo! Something went wrong!
+                </div>
+            </div>
+            <div class="col-md-6">
+                <div data-template="admin : saveFileWRKnoJs">
+                    Booo! Something went wrong!
+                </div>
+            </div>
+            <div class="col-md-6">
+                <div data-template="admin : exportFileWRKnoJs">
+                    Booo! Something went wrong!
+                </div>
+            </div>
+-->
+        </div>
+        <div class="row">
+            <div class="col-md-6">
+                <a href="works.html" class="btn btn-info" role="button">
+                    <span class="glyphicon glyphicon-thumbs-up" aria-hidden="true"></span> Open works.html</a>
+            </div>
+        </div>
+    </div>
+</div>