Prepare release 1.1.0

digicademy · Oct 30, 2019 · 59d7cd8 · 59d7cd8
1 parent c6e01da
commit 59d7cd8
Show file tree

Hide file tree

Showing 1,259 changed files with 135,423 additions and 12,016 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ The software is published under the terms of the MIT license.
 
 ### Research Software Engineering and Development
 
-Copyright 2018 <a href="https://orcid.org/0000-0002-0953-2818">Torsten Schrade</a>
+Copyright 2018-2019 <a href="https://orcid.org/0000-0002-0953-2818">Torsten Schrade</a>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/build.xml b/build.xml
@@ -1,5 +1,5 @@
 <project default="xar" name="sturm-edition">
-    <property name="project.version" value="1.0.0"/>
+    <property name="project.version" value="1.1.0"/>
     <property name="project.app" value="sturm-edition"/>
     <property name="build.dir" value="build"/>
     <target name="xar">

diff --git a/expath-pkg.xml b/expath-pkg.xml
@@ -1,4 +1,4 @@
-<package xmlns="http://expath.org/ns/pkg" name="https://sturm-edition.de" abbrev="sturm-edition" version="1.0.0" spec="1.0">
+<package xmlns="http://expath.org/ns/pkg" name="https://sturm-edition.de" abbrev="sturm-edition" version="1.1.0" spec="1.0">
     <title>STURM Edition</title>
     <dependency package="http://www.functx.com" semver-min="1.0"/>
 </package>
diff --git a/html/404.html b/html/404.html
@@ -2,43 +2,43 @@
     <head>
         <meta charset="utf-8"/>
         <meta name="description" content=""/>
-        <meta name="author" content="Marjam Mahmoodzada"/>
+        <meta name="author" content="Marjam Trautmann"/>
         <meta name="author" content="Torsten Schrade"/>
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
-        <title>Fehler 404 : DER STURM - Digitale Quellenedition zur Geschichte der internationalen Avantgarde</title>
+        <title>Abteilungsübergreifende Editionsrichtlinien : DER STURM. Digitale Quellenedition zur Geschichte der internationalen Avantgarde</title>
         <script>
                 var Hyphenopoly = {
                     require: {
                         "de": "FORCEHYPHENOPOLY"
                     },
                     paths: {
-                        patterndir: "/js/Hyphenopoly/patterns/",
-                        maindir: "/js/Hyphenopoly/"
+                        patterndir: "js/Hyphenopoly/patterns/",
+                        maindir: "js/Hyphenopoly/"
                     },
                     setup: {
                         classnames: {
                             "container": {}
                         }
                     }
                 };
-            </script>
-        <script src="/js/Hyphenopoly/Hyphenopoly_Loader.js"/>
+        </script>
+        <script src="js/Hyphenopoly/Hyphenopoly_Loader.js"/>
         <link href="https://fonts.googleapis.com/css?family=Tinos:400,400i,700,700i&amp;subset=latin-ext" rel="stylesheet"/>
         <link href="https://fonts.googleapis.com/css?family=Ramaraja" rel="stylesheet"/>
-        <link rel="stylesheet" type="text/css" href="/css/MyFontsWebfontsKit/MyFontsWebfontsKit.css"/>
-        <link rel="stylesheet" type="text/css" media="screen" href="/css/normalize.css"/>
-        <link rel="stylesheet" type="text/css" media="screen" href="/css/skeleton.css"/>
-        <link rel="stylesheet" type="text/css" media="screen" href="/css/magnific-popup.css"/>
-        <link rel="stylesheet" type="text/css" media="screen" href="/css/atom-one-light.css"/>
-        <link rel="stylesheet" type="text/css" media="screen" href="/css/style.css"/>
-        <link rel="stylesheet" type="text/css" media="print" href="/css/print.css"/>
+        <link rel="stylesheet" type="text/css" href="css/MyFontsWebfontsKit/MyFontsWebfontsKit.css"/>
+        <link rel="stylesheet" type="text/css" media="screen" href="css/normalize.css"/>
+        <link rel="stylesheet" type="text/css" media="screen" href="css/skeleton.css"/>
+        <link rel="stylesheet" type="text/css" media="screen" href="css/magnific-popup.css"/>
+        <link rel="stylesheet" type="text/css" media="screen" href="css/atom-one-light.css"/>
+        <link rel="stylesheet" type="text/css" media="screen" href="css/style.css"/>
+        <link rel="stylesheet" type="text/css" media="print" href="css/print.css"/>
         <link rel="icon" type="image/png" href="images/favicon.png"/>
     </head>
     <body>
         <div class="container">
             <header class="row header">
                 <div class="branding">
-                    <a href="/">
+                    <a href="index.html">
                     <h1 class="title">
                             <span class="tighter">DER</span> <span class="tight">ST</span>
                             <span class="normal">URM</span>
@@ -49,19 +49,19 @@ <h2 class="subtitle">Digitale Quellenedition zur Geschichte der internationalen
                 <nav class="navigation">
                     <ul>
                         <li>
-                            <a class="normal" href="/projekt.html">Projekt</a>
+                            <a class="normal" href="projekt.html">Projekt</a>
                         </li>
                         <li>
-                            <a class="normal" href="/edition.html">Edition</a>
+                            <a class="active" href="edition.html">Edition</a>
                         </li>
                         <li>
-                            <a class="normal" href="/quellen.html">Quellen</a>
+                            <a class="normal" href="quellen.html">Quellen</a>
                         </li>
                         <li>
-                            <a class="normal" href="/register.html">Register</a>
+                            <a class="normal" href="register.html">Register</a>
                         </li>
                         <li>
-                            <a class="normal" href="/ressourcen.html">Ressourcen</a>
+                            <a class="normal" href="ressourcen.html">Ressourcen</a>
                         </li>
                     </ul>
                 </nav>
@@ -105,7 +105,7 @@ <h5>Nachnutzung</h5>
                         Edition und Forschungsdaten stehen unter einer 
                         <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International (CC-BY 4.0)</a> 
                         Lizenz und können unter Berücksichtigung der Lizenzbedingungen frei nachgenutzt werden. 
-                        Die Editionssoftware dieses Projektes steht unter MIT-Lizenz und kann <a href="/ressourcen/software.html">frei heruntergeladen</a> und 
+                        Die Editionssoftware dieses Projektes steht unter MIT-Lizenz und kann <a href="ressourcen/software.html">frei heruntergeladen</a> und 
                         weiterentwickelt werden.
                     </p>
                 </section>
@@ -118,7 +118,7 @@ <h5>Herausgeber</h5>
                     </p>
                     <h5>Kontakt</h5>
                     <a href="http://www.adwmainz.de/">
-                        <img id="logo" src="/images/adwlogo.png"/>
+                        <img id="logo" src="images/adwlogo.png"/>
                     </a>
                     <address x-ms-format-detection="none" vocab="http://schema.org/" typeof="Organization">
                         <span property="name">Akademie der Wissenschaften und der Literatur Mainz</span>
@@ -137,8 +137,9 @@ <h5>Kontakt</h5>
                         <br/>
                         Twitter: <a class="twitter" href="https://twitter.com/SturmEdition">@SturmEdition</a>
                         <br/>
-                        <a class="imprint" href="/impressum.html">Impressum</a> / 
-                        <a class="privacy" href="/datenschutz.html">Datenschutzerklärung</a>
+                        <a class="imprint" href="impressum.html">Impressum</a>
+                        <span class="dash"> / </span>
+                        <a class="privacy" href="datenschutz.html">Datenschutzerklärung</a>
                     </address>
                 </section>
             </footer>

diff --git a/html/api.xql b/html/api.xql
@@ -4,7 +4,7 @@ xquery version "3.0";
  : DER STURM
  : A Digital Edition of Sources from the International Avantgarde
  :
- : Edited and developed by Marjam Mahmoodzada and Torsten Schrade
+ : Edited and developed by Marjam Trautmann and Torsten Schrade
  : Academy of Sciences and Literature | Mainz
  :
  : XQuery based REST API
@@ -53,10 +53,16 @@ declare function sturm_api:getResourceCollection($type as xs:string, $format as
             doc('../xml/register/werke.xml')
         else if ($type eq 'files') then
             <files>{(
-                collection(concat($appRoot, $appName, '/xml/seiten/'))//tei:publicationStmt/tei:idno,
-                collection(concat($appRoot, $appName, '/xml/register/'))//tei:publicationStmt/tei:idno,
-                collection(concat($appRoot, $appName, '/xml/quellen/01.briefe/'))//tei:publicationStmt/tei:idno[@type = 'file'],
-                collection(concat($appRoot, $appName, '/xml/versionen/quellen/01.briefe/'))//tei:publicationStmt/tei:idno[@type = 'file']
+                for $page in collection(concat($appRoot, $appName, '/xml/seiten/'))
+                    return <idno key="{$page//tei:TEI/@xml:id}" type="page" version="{$page//tei:change[1]/tei:date/@n}">{concat('S.', substring-after(util:document-name($page), 'S.'))}</idno>,
+                for $versionedPage in collection(concat($appRoot, $appName, '/xml/versionen/seiten/'))
+                    return <idno key="{$versionedPage//tei:TEI/@xml:id}" type="page" version="{$versionedPage//tei:change[1]/tei:date/@n}">{concat('S.', substring-after(util:document-name($versionedPage), 'S.'))}</idno>,
+                for $register in collection(concat($appRoot, $appName, '/xml/register/'))
+                    return <idno key="{replace(util:document-name($register), '.xml', '')}" type="register" version="1">{util:document-name($register)}</idno>,
+                for $letter in collection(concat($appRoot, $appName, '/xml/quellen/01.briefe/'))
+                    return <idno key="{$letter//tei:TEI/@xml:id}" type="letter" version="{$letter//tei:change[1]/tei:date/@n}">{util:document-name($letter)}</idno>,
+                for $versionedLetter in collection(concat($appRoot, $appName, '/xml/versionen/quellen/01.briefe/'))
+                    return <idno key="{$versionedLetter//tei:TEI/@xml:id}" type="letter" version="{$versionedLetter//tei:change[1]/tei:date/@n}">{util:document-name($versionedLetter)}</idno>
             )}</files>
         else ()
 
@@ -82,26 +88,21 @@ declare function sturm_api:getResourceCollection($type as xs:string, $format as
 
 declare function sturm_api:getResourceByIdentifier($identifier as xs:string, $type as xs:string, $format as xs:string) {
 
+    let $processedFileIndex := doc(concat($appRoot, $appName, '/temp/processed.xml'))
+
     let $resource := 
         if ($type eq 'letter') then
-            doc('../xml/register/briefe.xml')//tei:item[@xml:id = $identifier]
+            doc(concat($appRoot, $appName, '/xml/register/briefe.xml'))//tei:item[@xml:id = $identifier]
         else if ($type eq 'person') then
-            doc('../xml/register/personen.xml')//tei:person[@xml:id = $identifier]
+            doc(concat($appRoot, $appName, '/xml/register/personen.xml'))//tei:person[@xml:id = $identifier]
         else if ($type eq 'place') then
-            doc('../xml/register/orte.xml')//tei:place[@xml:id = $identifier]
+            doc(concat($appRoot, $appName, '/xml/register/orte.xml'))//tei:place[@xml:id = $identifier]
         else if ($type eq 'work') then
-            doc('../xml/register/werke.xml')//tei:item[@xml:id = $identifier]
+            doc(concat($appRoot, $appName, '/xml/register/werke.xml'))//tei:item[@xml:id = $identifier]
         else if ($type eq 'file') then
-            let $fileIndex :=
-                <files>{(
-                    for $page in collection(concat($appRoot, $appName, '/xml/seiten/'))//tei:publicationStmt/tei:idno
-                        return <file id="{$page}" ref="{concat($appRoot, $appName, '/xml/seiten/', $page)}" />,
-                    for $register in collection(concat($appRoot, $appName, '/xml/register/'))//tei:publicationStmt/tei:idno
-                        return <file id="{$register}" ref="{concat($appRoot, $appName, '/xml/register/', $register)}" />,
-                    sturm_api:getSourcesFileIndex('/xml/quellen/01.briefe/'),
-                    sturm_api:getSourcesFileIndex('/xml/versionen/quellen/01.briefe/')
-                )}</files>
-            return doc($fileIndex//file[@id = $identifier]/@ref)
+            if ($processedFileIndex//processed[@filekey = $identifier]) then
+                doc($processedFileIndex//processed[@filekey = $identifier][1]/@source)
+            else ()
         else ()
 
     let $result :=

diff --git a/html/beacon/personen.txt b/html/beacon/personen.txt
@@ -8,28 +8,53 @@
 #UPDATE: monthly
 #INSTITUTION: Digital Academy - Academy of Sciences and Literature Mainz
 
+119262177||https://sturm-edition.de/id/P.0000032
+118649949||https://sturm-edition.de/id/P.0000117
 2097840-6||https://sturm-edition.de/id/P.0000059
+123805767||https://sturm-edition.de/id/P.0000179
 13236056X||https://sturm-edition.de/id/P.0000063
-118888692||https://sturm-edition.de/id/P.0000072
 141343133||https://sturm-edition.de/id/P.0000014
 119191164||https://sturm-edition.de/id/P.0000021
 116120894||https://sturm-edition.de/id/P.0000070
+118509640||https://sturm-edition.de/id/P.0000151
+142220078||https://sturm-edition.de/id/P.0000171
+118663119||https://sturm-edition.de/id/P.0000109
+11620589X||https://sturm-edition.de/id/P.0000108
+118512188||https://sturm-edition.de/id/P.0000118
+119102277||https://sturm-edition.de/id/P.0000110
+121668053||https://sturm-edition.de/id/P.0000043
 118673998||https://sturm-edition.de/id/P.0000044
+101835825||https://sturm-edition.de/id/P.0000185
 118518674||https://sturm-edition.de/id/P.0000062
 118870645||https://sturm-edition.de/id/P.0000058
 118519980||https://sturm-edition.de/id/P.0000015
+118520873||https://sturm-edition.de/id/P.0000115
+123242231||https://sturm-edition.de/id/P.0000116
+136469264||https://sturm-edition.de/id/P.0000162
 116012374||https://sturm-edition.de/id/P.0000088
 118524461||https://sturm-edition.de/id/P.0000092
+118524496||https://sturm-edition.de/id/P.0000123
 118526405||https://sturm-edition.de/id/P.0000024
+118638858||https://sturm-edition.de/id/P.0000150
+118528610||https://sturm-edition.de/id/P.0000120
+118688189||https://sturm-edition.de/id/P.0000176
+118529587||https://sturm-edition.de/id/P.0000122
+118722778||https://sturm-edition.de/id/P.0000182
 118530712||https://sturm-edition.de/id/P.0000066
+119071312||https://sturm-edition.de/id/P.0000177
 118969161||https://sturm-edition.de/id/P.0000033
 121931005||https://sturm-edition.de/id/P.0000040
 117543705||https://sturm-edition.de/id/P.0000035
 5120121-5||https://sturm-edition.de/id/P.0000068
+1055475877||https://sturm-edition.de/id/P.0000181
+118542907||https://sturm-edition.de/id/P.0000183
 118907689||https://sturm-edition.de/id/P.0000081
 118547488||https://sturm-edition.de/id/P.0000078
 132815273||https://sturm-edition.de/id/P.0000006
 11854764X||https://sturm-edition.de/id/P.0000004
+11939877X||https://sturm-edition.de/id/P.0000100
+14179044X||https://sturm-edition.de/id/P.0000172
+117037508||https://sturm-edition.de/id/P.0000102
 127466118||https://sturm-edition.de/id/P.0000051
 118557157||https://sturm-edition.de/id/P.0000064
 118714708||https://sturm-edition.de/id/P.0000030
@@ -38,11 +63,17 @@
 118562827||https://sturm-edition.de/id/P.0000076
 121452735||https://sturm-edition.de/id/P.0000073
 118564722||https://sturm-edition.de/id/P.0000046
+136238378||https://sturm-edition.de/id/P.0000152
+119256630||https://sturm-edition.de/id/P.0000170
+119254522||https://sturm-edition.de/id/P.0000169
 118567365||https://sturm-edition.de/id/P.0000079
 118778153||https://sturm-edition.de/id/P.0000054
 128866748||https://sturm-edition.de/id/P.0000010
+119224496||https://sturm-edition.de/id/P.0000161
 122927486||https://sturm-edition.de/id/P.0000036
 118571516||https://sturm-edition.de/id/P.0000042
+118572695||https://sturm-edition.de/id/P.0000126
+11857275X||https://sturm-edition.de/id/P.0000121
 119218208||https://sturm-edition.de/id/P.0000029
 118575864||https://sturm-edition.de/id/P.0000025
 118575872||https://sturm-edition.de/id/P.0000075
@@ -55,21 +86,37 @@
 120828871||https://sturm-edition.de/id/P.0000087
 117022632||https://sturm-edition.de/id/P.0000086
 117159271||https://sturm-edition.de/id/P.0000084
+118738860||https://sturm-edition.de/id/P.0000174
 118812645||https://sturm-edition.de/id/P.0000061
 118594206||https://sturm-edition.de/id/P.0000049
+118988751||https://sturm-edition.de/id/P.0000180
 143669230||https://sturm-edition.de/id/P.0000057
 11859964X||https://sturm-edition.de/id/P.0000091
+1056411538||https://sturm-edition.de/id/P.0000045
 117103594||https://sturm-edition.de/id/P.0000007
 118606816||https://sturm-edition.de/id/P.0000013
 124503063||https://sturm-edition.de/id/P.0000039
+1047412616||https://sturm-edition.de/id/P.0000101
+118612751||https://sturm-edition.de/id/P.0000184
+118796798||https://sturm-edition.de/id/P.0000119
 118613723||https://sturm-edition.de/id/P.0000074
 118748475||https://sturm-edition.de/id/P.0000016
 118618830||https://sturm-edition.de/id/P.0000041
 136128289||https://sturm-edition.de/id/P.0000008
 118621041||https://sturm-edition.de/id/P.0000020
 117299421||https://sturm-edition.de/id/P.0000071
+11862332X||https://sturm-edition.de/id/P.0000157
 119295954||https://sturm-edition.de/id/P.0000011
+128547111||https://sturm-edition.de/id/P.0000175
+174282923||https://sturm-edition.de/id/P.0000114
 118770950||https://sturm-edition.de/id/P.0000001
 118891456||https://sturm-edition.de/id/P.0000002
+117178446||https://sturm-edition.de/id/P.0000125
 118631365||https://sturm-edition.de/id/P.0000065
-128951710||https://sturm-edition.de/id/P.0000052
+121893421||https://sturm-edition.de/id/P.0000164
+128951710||https://sturm-edition.de/id/P.0000052
+129032638||https://sturm-edition.de/id/P.0000155
+128963255||https://sturm-edition.de/id/P.0000156
+129075094||https://sturm-edition.de/id/P.0000158
+184199166||https://sturm-edition.de/id/P.0000167
+129223166||https://sturm-edition.de/id/P.0000124
diff --git a/html/beacon/werke.txt b/html/beacon/werke.txt
@@ -8,9 +8,17 @@
 #UPDATE: monthly
 #INSTITUTION: Digital Academy - Academy of Sciences and Literature Mainz
 
+4006406-2||https://sturm-edition.de/id/W.0000167
 4384142-9||https://sturm-edition.de/id/W.0000072
 4714366-6||https://sturm-edition.de/id/W.0000073
 4127687-5||https://sturm-edition.de/id/W.0000070
+4181967-6||https://sturm-edition.de/id/W.0000102
+4737924-8||https://sturm-edition.de/id/W.0000120
 4129625-4||https://sturm-edition.de/id/W.0000071
+4133052-3||https://sturm-edition.de/id/W.0000170
+4166017-1||https://sturm-edition.de/id/W.0000169
+4735095-7||https://sturm-edition.de/id/W.0000110
 4099371-1||https://sturm-edition.de/id/W.0000069
-4058273-5||https://sturm-edition.de/id/W.0000068
+4058273-5||https://sturm-edition.de/id/W.0000068
+4382699-4||https://sturm-edition.de/id/W.0000091
+4543675-7||https://sturm-edition.de/id/W.0000076