Merge branch 'develop'

Edirom · Jul 19, 2018 · 15922ef · 15922ef
2 parents 8b9e241 + 2631f74
commit 15922ef
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/catalogues/options.xml b/catalogues/options.xml
@@ -21,10 +21,10 @@
         <entry xml:id="maxNews">2</entry>
         <entry xml:id="googleWebsiteMetatag">EAO5d_GiQPkJeTGACYYOFahJm2HRNvJUWwIkyw4j0Ys</entry>
         <entry xml:id="microsoftBingWebsiteMetatag">AE39DA5613844228642EE48196AAA94A</entry>
-        <entry xml:id="version">3.2.1</entry><!-- Versionsnummer der WeGA-WebApp -->
-        <entry xml:id="ODDversion">3.2.0</entry><!-- Versionsnummer der WeGA-ODD Schemata -->
-        <entry xml:id="versionNews">A050356</entry>
-        <entry xml:id="versionDate">2018-01-08</entry>
+        <entry xml:id="version">3.3.0</entry><!-- Versionsnummer der WeGA-WebApp -->
+        <entry xml:id="ODDversion">3.3.0</entry><!-- Versionsnummer der WeGA-ODD Schemata -->
+        <entry xml:id="versionNews">A050169</entry>
+        <entry xml:id="versionDate">2018-07-17</entry>
         <entry xml:id="entriesPerPage">10</entry>
     </div>
     <div xml:id="externalPNDResources">

diff --git a/catalogues/urlMappings.xml b/catalogues/urlMappings.xml
@@ -39,4 +39,6 @@
     <!--/weberstudien.html-->
     <!--/werkedition.html-->
 
+    <mapping from="/duesseldorfveit.pdf" to="/downloads/Veit_2002_Duesseldorf.pdf"/>
+
 </mappings>
diff --git a/modules/config.xqm b/modules/config.xqm
@@ -71,8 +71,9 @@ declare variable $config:default-date-picture-string := function($lang as xs:str
 
 (: Temporarily suppressing internal links to persons, works etc. since those are not reliable :)
 declare variable $config:diaryYearsToSuppress as xs:integer* := 
-    if($config:isDevelopment) then () 
-    else (1821 to 1823);
+    if($config:isDevelopment) then ()
+    (: nothing to suppress anymore – this should be removed in the future :)
+    else ();
 
 (:~
  : get and set language variable

diff --git a/modules/wdt.xqm b/modules/wdt.xqm
@@ -377,7 +377,9 @@ declare function wdt:works($item as item()*) as map(*) {
             wdt:create-index-callback('works', wdt:works(())('init-collection')(), function($node) { 
                 functx:pad-integer-to-length(($node//mei:seriesStmt/mei:title[@level])[1]/xs:int(@n), 4) || 
                 $node//mei:altId[@type = 'WeV']/string(@subtype) || 
-                functx:pad-integer-to-length($node//mei:altId[@type = 'WeV']/xs:int(@n), 4) || 
+                (if($node//mei:altId[@type = 'WeV']/@n castable as xs:int) then
+                    functx:pad-integer-to-length($node//mei:altId[@type = 'WeV']/xs:int(@n), 4) 
+                else '9999') ||
                 $node//mei:altId[@type = 'WeV']/string() || 
                 ($node//mei:title)[1]
             }, ())

diff --git a/templates/page.html b/templates/page.html
@@ -278,22 +278,21 @@ <h3 class="item-title">Loading …</h3>
         <script type="text/javascript" src="$resources/js/init-min.js" data-template="app-shared:if-not-matches" data-template-key="environment" data-template-value="development"/>
 
         <div data-template="app-shared:if-matches" data-template-key="environment" data-template-value="production" data-template-wrap="false">
-            <!-- Piwik -->
+            <!-- Matomo -->
             <script type="text/javascript">
                 var _paq = _paq || [];
-                _paq.push(["setDomains", ["*.www.weber-gesamtausgabe.de"]]);
+                /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
                 _paq.push(['trackPageView']);
                 _paq.push(['enableLinkTracking']);
                 (function() {
-                  var u="//www.weber-gesamtausgabe.de/piwik/";
+                  var u="//matomo.euryanthe.de/";
                   _paq.push(['setTrackerUrl', u+'piwik.php']);
-                  _paq.push(['setSiteId', 1]);
+                  _paq.push(['setSiteId', '1']);
                   var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
                   g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
                 })();
             </script>
-            <noscript><p><img src="//www.weber-gesamtausgabe.de/piwik/piwik.php?idsite=1" style="border:0;" alt=""/></p></noscript>
-            <!-- End Piwik Code -->
+            <!-- End Matomo Code -->
         </div>
 
     </body>