added HTML title and description for error page

Edirom · Dec 18, 2016 · 620b87d · 620b87d
1 parent 0813865
commit 620b87d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/catalogues/dictionary_de.xml b/catalogues/dictionary_de.xml
@@ -317,6 +317,8 @@
     <entry xml:id="metaTitleIndex-documents">Register der Dokumente</entry>
     <entry xml:id="metaTitleIndex-indices">Vollständiges Register</entry>
     <entry xml:id="metaTitleIndex-thematicCommentaries">Register der Themenkommentare</entry>
+    <entry xml:id="metaTitleError">Das klingt gar nicht gut!</entry>
+    <entry xml:id="metaDescriptionError">Fehlerseite</entry>
 <!--    <entry xml:id="metaTitleDiscoBiblio">Discographie – Bibliographie</entry>-->
 <!--    <entry xml:id="metaTitleScoresBiblio">Noten – Bibliographie</entry>-->
 <!--    <entry xml:id="metaTitleWeberStudiesPublications">Weber-Studien – Publikationen</entry>-->

diff --git a/catalogues/dictionary_en.xml b/catalogues/dictionary_en.xml
@@ -290,6 +290,8 @@
     <entry xml:id="metaTitleIndex-documents">Index of documents</entry>
     <entry xml:id="metaTitleIndex-indices">Complete Index</entry>
     <entry xml:id="metaTitleIndex-thematicCommentaries">Index of thematic commentaries</entry>
+    <entry xml:id="metaTitleError">That doesn't sound good!</entry>
+    <entry xml:id="metaDescriptionError">Error page</entry>
     <!--<entry xml:id="metaTitleDiscoBiblio">Discography – Bibliography</entry>-->
     <!--<entry xml:id="metaTitleScoresBiblio">Scores – Bibliography</entry>-->
     <!--<entry xml:id="metaTitleWeberStudiesPublications">Weber-Studies – Publications</entry>-->

diff --git a/modules/controller.xqm b/modules/controller.xqm
@@ -159,6 +159,7 @@ declare function controller:error($exist-vars as map(*), $errorCode as xs:int) a
     	<view>
          <forward url="{str:join-path-elements((map:get($exist-vars, 'controller'), '/modules/view-html.xql'))}">
              <set-attribute name="lang" value="{$exist-vars('lang')}"/>
+             <set-attribute name="docType" value="error"/>
              <set-attribute name="modified" value="true"/>
              <cache-control cache="yes"/>
          </forward>

diff --git a/modules/html-meta.xqm b/modules/html-meta.xqm
@@ -89,6 +89,7 @@ declare %private function html-meta:DC.description($model as map(*), $lang as xs
         case 'diaries' return str:shorten-text($model('doc')/tei:ab, 150)
         case 'news' case 'var' case 'thematicCommentaries' return str:shorten-text(string-join($model('doc')//tei:text//tei:p[not(starts-with(., 'Sorry'))], ' '), 150)
         case 'orgs' return wdt:orgs($model('doc'))('title')('txt') || ': ' || str:list($model('doc')//tei:state[tei:label='Art der Institution']/tei:desc, $lang, 0)
+        case 'error' return lang:get-language-string('metaDescriptionError', $lang)
         default return core:logToFile('warn', 'Missing HTML meta description for ' || $model('docID') || ' – ' || $model('docType') || ' – ' || request:get-uri())
 };
 
@@ -106,6 +107,7 @@ declare %private function html-meta:page-title($model as map(*), $lang as xs:str
         case 'letters' case 'writings' case 'news' case 'var' case 'thematicCommentaries' case 'documents' return wdt:lookup($model('docType'), $model('doc'))('title')('txt')
         case 'diaries' return concat(query:get-authorName($model('doc')), ' – ', lang:get-language-string('diarySingleViewTitle', wdt:lookup($model('docType'), $model('doc'))('title')('txt'), $lang))
         case 'orgs' return query:title($model('docID')) || ' (' || str:list($model('doc')//tei:state[tei:label='Art der Institution']/tei:desc, $lang, 0) || ') – ' || lang:get-language-string('tabTitle_bioOrgs', $lang)
+        case 'error' return lang:get-language-string('metaTitleError', $lang)
         default return core:logToFile('warn', 'Missing HTML page title for ' || $model('docID') || ' – ' || $model('docType') || ' – ' || request:get-uri())
 };