solved conflict

Edirom · Dec 2, 2024 · 563ad6c · 563ad6c
2 parents 8a995ef + bdab565
commit 563ad6c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/add/data/xql/getHelp.xql b/add/data/xql/getHelp.xql
@@ -21,6 +21,7 @@ declare option output:omit-xml-declaration "yes";
 
 let $lang := request:get-parameter('lang', 'en')
 let $idPrefix := request:get-parameter('idPrefix', '')
+let $contextPath := request:get-context-path()
 
 let $base := replace(system:get-module-load-path(), 'embedded-eXist-server', '') (:TODO:)
 
@@ -35,14 +36,17 @@ let $doc :=
         </parameters>
     )
 
-let $xsl := doc('../xslt/teiBody2HTML.xsl')
+let $xsl := doc('../xslt/tei/profiles/edirom-body/teiBody2HTML.xsl')
 let $doc :=
     transform:transform($doc, $xsl,
         <parameters>
             <param name="base" value="{concat($base, '/../xslt/')}"/>
             <param name="lang" value="{$lang}"/>
             <param name="tocDepth" value="1"/>
             <param name="graphicsPrefix" value="help/"/>
+            <param name="contextPath" value="{$contextPath}"/>
+            (: == passing empty value for docUri (XSLT expects xs:anyURI, but ExtJS view does not provide value) -> github#480 == :)
+            <param name="docUri" value="''"/>
         </parameters>
     )
 

diff --git a/add/data/xql/getLinkTarget.xql b/add/data/xql/getLinkTarget.xql
@@ -102,8 +102,11 @@ declare function local:getView($type as xs:string, $docUri as xs:string, $doc as
         else if ($type = 'mei_annotationView') then
             (exists($doc//mei:annot[@type = 'editorialComment']))
 
-        else if ($type = 'xml_xmlView') then
-            (true())
+        else if($type = 'html_iFrameView')
+        then(true())
+
+        else if($type = 'xml_xmlView')
+        then(true())
 
         else if ($type = 'desc_xmlView') then
             (exists($doc//mei:annot[@type = 'descLink']))
@@ -134,6 +137,7 @@ declare function local:getViews($type as xs:string, $docUri as xs:string, $doc a
         'tei_facsimileView',
         'tei_textFacsimileSplitView',
         'mei_annotationView',
+        'html_iFrameView',
         'xml_xmlView',
         'desc_xmlView'
     )

diff --git a/add/data/xql/search.xql b/add/data/xql/search.xql
@@ -8,8 +8,8 @@ xquery version "3.1";
 import module namespace kwic = "http://exist-db.org/xquery/kwic";
 import module namespace transform="http://exist-db.org/xquery/transform";
 
-import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/eutil" at "../xqm/eutil.xqm";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
 (: NAMESPACE DECLARATIONS ================================================== :)
 

diff --git a/app/controller/window/HelpWindow.js b/app/controller/window/HelpWindow.js
@@ -42,7 +42,6 @@ Ext.define('EdiromOnline.controller.window.HelpWindow', {
         window.doAJAXRequest('data/xql/getHelp.xql',
             'GET', 
             {
-                uri: win.uri,
                 lang: window.getLanguage(),
                 idPrefix: win.id
             },

diff --git a/app/view/desktop/Desktop.js b/app/view/desktop/Desktop.js
@@ -172,7 +172,7 @@ Ext.define('EdiromOnline.view.desktop.Desktop', {
         });
 
         if(help == null) {
-            help = Ext.create('EdiromOnline.view.window.HelpWindow', me.getSizeAndPosition(500, 400));
+            help = Ext.create('EdiromOnline.view.window.HelpWindow', me.getSizeAndPosition(750, 600));
             me.addWindow(help);
             help.show();
 

diff --git a/app/view/desktop/TaskBar.js b/app/view/desktop/TaskBar.js
@@ -73,7 +73,7 @@ Ext.define('EdiromOnline.view.desktop.TaskBar', {
             me.windowBar3,
             me.windowBar4,
             '-',
-            //me.helpPrefs,
+            me.helpPrefs,
             me.tray
         ];
 
@@ -238,8 +238,8 @@ Ext.define('EdiromOnline.view.desktop.TaskBar', {
         return {
             width: 64,
             items: [
-                me.helpButton,
-                me.langButton/*,
+                me.helpButton/*,
+                me.langButton,
                 me.prefButton*/
             ]
         };