Merge branch 'develop' into ftr/shell-to-start-sencha

Edirom · Oct 11, 2024 · 2a32673 · 2a32673
2 parents 78ceff4 + c96595d
commit 2a32673
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 88 deletions.
diff --git a/add/data/xql/getRendering.xql b/add/data/xql/getRendering.xql
diff --git a/add/data/xqm/util.xqm b/add/data/xqm/util.xqm
@@ -91,7 +91,7 @@ declare function eutil:getLocalizedName($node, $lang) {
         if($node/edirom:names) then
             ($name)
         else
-            ($name => string-join(' ') => normalize-space())
+            (eutil:joinAndNormalize($name))
 
 };
 
@@ -107,26 +107,26 @@ declare function eutil:getLocalizedTitle($node as node(), $lang as xs:string?) a
     let $namespace := eutil:getNamespace($node)
 
     let $titleMEI :=
-        if ($lang != '' and $lang = $node/mei:title/@xml:lang and not($node/mei:title/mei:titlePart)) then
-            ($node/mei:title[@xml:lang = $lang]//text() => string-join() => normalize-space())
-        else if ($lang != '' and $lang = $node/mei:title/@xml:lang and $node/mei:title/mei:titlePart) then
-            ($node/mei:title[@xml:lang = $lang]/mei:titlePart[1]//text() => string-join() => normalize-space())
+        if ($lang != '' and $lang = $node/mei:title[mei:titlePart]/@xml:lang) then
+            (eutil:joinAndNormalize($node/mei:title[@xml:lang = $lang]/mei:titlePart, '. '))
+        else if ($lang != '' and $lang = $node/mei:title[not(mei:titlePart)]/@xml:lang) then
+            (eutil:joinAndNormalize($node/mei:title[@xml:lang = $lang]))
         else
-            (($node//mei:title)[1]//text() => string-join() => normalize-space())
+            (eutil:joinAndNormalize(($node//mei:title)[1]))
 
     let $titleTEI :=
         if ($lang != '' and $lang = $node/tei:title/@xml:lang) then
-            $node/tei:title[@xml:lang = $lang]/text()
+            eutil:joinAndNormalize($node/tei:title[@xml:lang = $lang])
         else
-            $node/tei:title[1]/text()
+            eutil:joinAndNormalize($node/tei:title[1])
 
     return
-        if ($namespace = 'mei') then
+        if ($namespace = 'mei' and $titleMEI != '') then
             ($titleMEI)
-        else if ($namespace = 'tei') then
+        else if ($namespace = 'tei' and $titleTEI != '') then
             ($titleTEI)
         else
-            ('unknown')
+            ('[No title found!]')
 
 };
 (:~
@@ -240,7 +240,7 @@ declare function eutil:getPartLabel($measureOrPerfRes as node(), $type as xs:str
             upper-case($i)
 
     return
-        normalize-space(string-join(($label, $numbering),' '))
+        eutil:joinAndNormalize(($label, $numbering))
 
 };
 
@@ -398,3 +398,24 @@ declare function eutil:request-lang-preferred-iso639() as xs:string {
             "en"
 
 };
+
+(:~
+ : Returns one joined and normalized string
+ :
+ : @param $strings The string(s) to be processed
+ : @return The string (joined with whitespace and normalized space)
+ :)
+declare function eutil:joinAndNormalize($strings as xs:string*) as xs:string {
+    $strings => string-join(' ') => normalize-space()
+};
+
+(:~
+ : Returns one joined and normalized string
+ :
+ : @param $strings The string(s) to be processed
+ : @param $separator One ore more characters as separators for joining the string
+ : @return The string (joined and normalized space)
+ :)
+declare function eutil:joinAndNormalize($strings as xs:string*, $separator as xs:string) as xs:string {
+    $strings => string-join($separator) => normalize-space()
+};
diff --git a/app/Application.js b/app/Application.js
@@ -182,7 +182,9 @@ Ext.define('EdiromOnline.Application', {
 
     openStartDocuments: function() {
         var me = this;
-        var uris = me.getController('PreferenceController').getPreference('start_documents_uri');
-        window.loadLink(uris);
+        var uris = me.getController('PreferenceController').getPreference('start_documents_uri', true);
+        if(uris){
+            window.loadLink(uris);
+        }
     }
 });
diff --git a/app/controller/PreferenceController.js b/app/controller/PreferenceController.js
@@ -64,6 +64,7 @@ Ext.define('EdiromOnline.controller.PreferenceController', {
     getPreference: function(key, lax) {
         var me = this;
 
+        // if key does not exist but lax is true, return null
         if(!me.preferences[key] && lax)
             return null;
 
@@ -86,7 +87,7 @@ Ext.define('EdiromOnline.controller.PreferenceController', {
                 key: key,
                 level: 'warn' //warn, error, fatal
             });
-
+        
             return null;
         }