Updates to tei view

Author: wsalesky

srophe-app/modules/config.xqm

@@ -29,12 +29,74 @@ declare variable $config:app-root :=
         substring-before($modulePath, "/modules")
 ;
 
-declare variable $config:data-root := $config:app-root || "/data";
-
 declare variable $config:repo-descriptor := doc(concat($config:app-root, "/repo.xml"))/repo:meta;
 
 declare variable $config:expath-descriptor := doc(concat($config:app-root, "/expath-pkg.xml"))/expath:package;
 
+(: Srophe variables :)
+(: Get repo-config.xml to parse global varaibles :)
+declare variable $config:get-config := doc($config:app-root || '/repo-config.xml');
+
+(: Get access-config.xml to parse global varaibles for git-sync and recaptcha  :)
+declare variable $config:get-access-config := doc($config:app-root || '/access-config.xml');
+
+(: Establish eXist-db data root defined in repo.xml 'data-root':)
+declare variable $config:data-root := 
+    let $app-root := $config:get-config//repo:app-root/text()  
+    let $data-root := concat($config:get-config//repo:data-root/text(),'/data') 
+    return replace($config:app-root, $app-root, $data-root);
+
+(: Establish main navigation for app, used in templates for absolute links. :)
+declare variable $config:nav-base := 
+    if($config:get-config//repo:nav-base/text() != '') then $config:get-config//repo:nav-base/text()
+    else if($config:get-config//repo:nav-base/text() = '/') then ''
+    else '';
+
+(: Base URI used in record tei:idno :)
+declare variable $config:base-uri := $config:get-config//repo:base_uri/text();
+
+(: Webapp title :)
+declare variable $config:app-title := $config:get-config//repo:title/text();
+
+(: Webapp URL :)
+declare variable $config:app-url := $config:get-config//repo:url/text();
+
+(: Element to use as id xml:id or idno :)
+declare variable $config:document-id := $config:get-config//repo:document-ids;
+
+(: Map rendering, google or leaflet :)
+declare variable $config:app-map-option := $config:get-config//repo:maps/repo:option[@selected='true']/text();
+declare variable $config:map-api-key := $config:get-config//repo:maps/repo:option[@selected='true']/@api-key;
+
+
+(: Recaptcha Key :)
+declare variable $config:recaptcha := 
+    if($config:get-access-config//recaptcha/site-key-variable != '') then 
+        environment-variable($config:get-access-config//recaptcha/site-key-variable/text())
+    else if($config:get-access-config//private-key/text() != '') then $config:get-access-config//private-key/text() 
+    else ();
+
+(:~
+ : Get collection data
+ : @param $collection match collection name in repo-config.xml 
+:)
+declare function config:collection-vars($collection as xs:string?) as node()?{
+    let $collection-config := $config:get-config//repo:collections
+    for $collection in $collection-config/repo:collection[@name = $collection]
+    return $collection
+};
+
+(:~
+ : Get collection data
+ : @param $collection match collection name in repo-config.xml 
+:)
+declare function config:collection-title($node as node(), $model as map(*), $collection as xs:string?) as xs:string?{
+    if(config:collection-vars($collection)/@title != '') then 
+        string(config:collection-vars($collection)/@title)
+    else $config:app-title
+  
+};
+
 (:~
  : Resolve the given path using the current application context.
  : If the app resides in the file system,
@@ -97,4 +159,5 @@ declare function config:app-info($node as node(), $model as map(*)) {
                 <td>{ request:get-attribute("$exist:controller") }</td>
             </tr>
         </table>
-};
+};
+

srophe-app/modules/content-negotiation/content-negotiation.xql

@@ -12,8 +12,7 @@ import module namespace config="http://syriaca.org/config" at "../config.xqm";
 import module namespace cntneg="http://syriaca.org/cntneg" at "content-negotiation.xqm";
 import module namespace tei2html="http://syriaca.org/tei2html" at "tei2html.xqm";
 
-(: Data processing module. :)
-import module namespace data="http://syriaca.org/data" at "../lib/data.xqm";
+import module namespace global="http://syriaca.org/global" at "../lib/global.xqm";
 
 (: Import KWIC module:)
 import module namespace kwic="http://exist-db.org/xquery/kwic";
@@ -32,47 +31,20 @@ let $path := if(request:get-parameter('id', '')  != '') then
              else ()   
 let $data :=
     if(request:get-parameter('id', '') != '' or request:get-parameter('doc', '') != '') then
-        data:get-document()
-    else if(request:get-parameter-names() != '') then 
-        let $hits := data:search('','','')
-        return 
-            if(count($hits) gt 0) then 
-                <root>
-                    <action>{string-join(
-                                for $param in request:get-parameter-names()
-                                return concat('&amp;',$param, '=',request:get-parameter($param, '')),'')}</action>
-                    <info>hits: {count($hits)}</info>
-                    <start>1</start>
-                    <results>{
-                        let $start := if(request:get-parameter('start', 1)) then request:get-parameter('start', 1) else 1
-                        let $perpage := if(request:get-parameter('perpage', 10)) then request:get-parameter('perpage', 10) else 10
-                        for $hit in subsequence($hits,$start,$perpage)
-                        let $id := replace($hit/descendant::tei:idno[starts-with(.,$config:base-uri)][1],'/tei','')
-                        let $title := $hit/descendant::tei:titleStmt/tei:title
-                        let $expanded := kwic:expand($hit)
-                        return 
-                            <json:value json:array="true">
-                                <id>{$id}</id>
-                                {$title}
-                                <hits>{normalize-space(string-join((tei2html:output-kwic($expanded, $id)),' '))}</hits>
-                            </json:value>
-                        }
-                    </results>
-                </root>
-            else 
-                <root>
-                    <json:value json:array="true">
-                        <action>{string-join(
-                                for $param in request:get-parameter-names()
-                                return concat('&amp;',$param, '=',request:get-parameter($param, '')),'')}</action>
-                        <info>No results</info>
-                        <start>0</start>
-                    </json:value>
-                </root>
+        let $id := request:get-parameter('id', '')
+        let $parse-id :=
+            if(contains($id,$global:base-uri) or starts-with($id,'http://')) then $id
+            else if(contains(request:get-uri(),$global:nav-base)) then 
+            replace(request:get-uri(),$global:nav-base, $global:base-uri)
+            else if(contains(request:get-uri(),$global:base-uri)) then request:get-uri()
+            else $id
+        let $final-id := if(ends-with($parse-id,'.html')) then substring-before($parse-id,'.html')
+                         else if(ends-with($parse-id,'/tei')) then substring-before($parse-id,'/tei') 
+                         else $parse-id
+        return global:get-rec($final-id)
     else ()
 let $format := if(request:get-parameter('format', '') != '') then request:get-parameter('format', '') else 'xml'    
 return  
     if(not(empty($data))) then
         cntneg:content-negotiation($data, $format, $path)    
-    else ()
-    
+    else ()