From 7d1a3e1faff7bb1330e8c317689f15b940ed2052 Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Wed, 13 Feb 2019 17:57:14 +0100 Subject: [PATCH] more renaming for relocated smufl-browser --- controller.xql | 12 ++++++------ modules/app.xql | 4 ++-- modules/config.xqm | 4 ++-- modules/tei-funcs.xqm | 4 ++-- modules/view.xql | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/controller.xql b/controller.xql index c52838a..3054acb 100755 --- a/controller.xql +++ b/controller.xql @@ -3,6 +3,12 @@ xquery version "3.0"; declare namespace exist="http://exist.sourceforge.net/NS/exist"; declare namespace tei="http://www.tei-c.org/ns/1.0"; declare namespace response="http://exist-db.org/xquery/response"; +declare namespace request="http://exist-db.org/xquery/request"; + +import module namespace config="http://smufl-browser.edirom.de/config" at "modules/config.xqm"; +import module namespace tei-funcs="http://smufl-browser.edirom.de/tei-funcs" at "modules/tei-funcs.xqm"; +import module namespace json="http://www.json.org"; +import module namespace functx="http://www.functx.com"; declare variable $exist:path external; declare variable $exist:resource external; @@ -10,12 +16,6 @@ declare variable $exist:controller external; declare variable $exist:prefix external; declare variable $exist:root external; -import module namespace config="http://edirom.de/smufl-browser/config" at "modules/config.xqm"; -import module namespace tei-funcs="http://edirom.de/smufl-browser/tei-funcs" at "modules/tei-funcs.xqm"; -(:import module namespace xqjson="http://xqilla.sourceforge.net/lib/xqjson";:) -import module namespace json="http://www.json.org"; -import module namespace functx="http://www.functx.com"; - (:~ : Content Negotiation : Evaluate Accept header and resource suffix to serve appropriate media type diff --git a/modules/app.xql b/modules/app.xql index 2993f67..ff4b280 100755 --- a/modules/app.xql +++ b/modules/app.xql @@ -1,9 +1,9 @@ xquery version "3.0"; -module namespace app="http://edirom.de/smufl-browser/app"; +module namespace app="http://smufl-browser.edirom.de/app"; import module namespace templates="http://exist-db.org/xquery/templates" ; -import module namespace config="http://edirom.de/smufl-browser/config" at "config.xqm"; +import module namespace config="http://smufl-browser.edirom.de/config" at "config.xqm"; import module namespace functx="http://www.functx.com"; declare namespace tei="http://www.tei-c.org/ns/1.0"; diff --git a/modules/config.xqm b/modules/config.xqm index a045363..6e84540 100755 --- a/modules/config.xqm +++ b/modules/config.xqm @@ -4,7 +4,7 @@ xquery version "3.0"; : A set of helper functions to access the application context from : within a module. :) -module namespace config="http://edirom.de/smufl-browser/config"; +module namespace config="http://smufl-browser.edirom.de/config"; declare namespace templates="http://exist-db.org/xquery/templates"; @@ -40,7 +40,7 @@ declare variable $config:charDecl := doc(concat($config:app-root, "/data/charDec declare variable $config:valid-unicode-range-regex := '^([Ee][a-fA-F0-9]{3})|(1[dD]1[a-fA-F0-9]{2})|(266[defDEF])$'; -declare variable $config:server-url := 'http://edirom.de/smufl-browser'; +declare variable $config:server-url := 'https://smufl-browser.edirom.de'; (:~ : Resolve the given path using the current application context. diff --git a/modules/tei-funcs.xqm b/modules/tei-funcs.xqm index cf1dd3b..3f5f08a 100644 --- a/modules/tei-funcs.xqm +++ b/modules/tei-funcs.xqm @@ -3,12 +3,12 @@ xquery version "3.0"; (:~ : A set of TEI related functions :) -module namespace tei-funcs="http://edirom.de/smufl-browser/tei-funcs"; +module namespace tei-funcs="http://smufl-browser.edirom.de/tei-funcs"; declare namespace request="http://exist-db.org/xquery/request"; declare namespace transform="http://exist-db.org/xquery/transform"; declare namespace tei="http://www.tei-c.org/ns/1.0"; -import module namespace config="http://edirom.de/smufl-browser/config" at "config.xqm"; +import module namespace config="http://smufl-browser.edirom.de/config" at "config.xqm"; declare function tei-funcs:index() as document-node() { let $range := request:get-parameter('range', 'all') diff --git a/modules/view.xql b/modules/view.xql index bac84dc..8a6edda 100755 --- a/modules/view.xql +++ b/modules/view.xql @@ -11,8 +11,8 @@ import module namespace templates="http://exist-db.org/xquery/templates" ; : The following modules provide functions which will be called by the : templating. :) -import module namespace config="http://edirom.de/smufl-browser/config" at "config.xqm"; -import module namespace app="http://edirom.de/smufl-browser/app" at "app.xql"; +import module namespace config="http://smufl-browser.edirom.de/config" at "config.xqm"; +import module namespace app="http://smufl-browser.edirom.de/app" at "app.xql"; declare option exist:serialize "method=xhtml5 media-type=text/html enforce-xhtml=yes";