Merge pull request #2 from BeethovensWerkstatt/develop

Beethoven features * search for edition and work * alternatively get source labels from different xpath, but always return a string * reactivate concordance navigator all seem plausible to me
Edirom · Feb 9, 2021 · 1bb49fb · 1bb49fb
2 parents ca0dd05 + 1e019ec
commit 1bb49fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/add/data/xqm/source.xqm b/add/data/xqm/source.xqm
@@ -64,7 +64,16 @@ declare function source:getLabels($sources as xs:string*, $edition as xs:string)
 declare function source:getLabel($source as xs:string, $edition as xs:string) as xs:string {
 
     let $language := eutil:getLanguage($edition)
-    return doc($source)//mei:source/mei:titleStmt/data(mei:title[not(@xml:lang) or @xml:lang = $language])
+    let $label := doc($source)//mei:source/mei:titleStmt/mei:title[not(@xml:lang) or @xml:lang = $language]
+    let $label := if($label)
+                    then($label)
+                    else(doc($source)//mei:meiHead/mei:fileDesc/mei:titleStmt/mei:title[not(@xml:lang) or @xml:lang = $language])
+    let $label := if($label)
+                    then($label)
+                    else('unknown title')
+    return
+        string($label)
+
 };
 
 (:~
@@ -98,4 +107,4 @@ declare function source:getSiglaAsArray($sources as xs:string*) as xs:string* {
 declare function source:getSiglum($source as xs:string) as xs:string? {
 
     doc($source)//mei:source/mei:identifier[@type eq 'siglum'][1]//text()
-};
+};
diff --git a/app/Application.js b/app/Application.js
@@ -61,9 +61,8 @@ Ext.define('EdiromOnline.Application', {
         'EdiromOnline.view.desktop.App'
     ],
 
-    //TODO:
-    activeEdition: 'xmldb:exist:///db/contents/h-moll/edition.xml',
-   /* activeWork: 'edirom_work_743373fb-4dcf-4329-90c0-fd1eacc9ea69', */
+    activeEdition: '',
+    activeWork: '',
 
     launch: function() {
         var me = this;

diff --git a/app/view/desktop/TaskBar.js b/app/view/desktop/TaskBar.js
@@ -62,7 +62,7 @@ Ext.define('EdiromOnline.view.desktop.TaskBar', {
             me.windowSort,
             me.globalTools,
             //me.desktopSwitch,
-            //me.quickStart,
+            me.quickStart,
             {
                 xtype: 'splitter', html: '&#160;',
                 height: 14, width: 2, // TODO - there should be a CSS way here