Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace proprietary exist:serialize options #418

Merged
merged 4 commits into from
Sep 10, 2024
Merged

replace proprietary exist:serialize options #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e909924
replace proprietary exist:serialize options
peterstadler Sep 6, 2024
d532d13
Merge branch 'develop' into fix-362-leftovers
bwbohl Sep 9, 2024
0a059ec
Merge branch 'develop' into fix-362-leftovers
bwbohl Sep 9, 2024
39e22fe
remove unnecessary serialization options
peterstadler Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions add/controller.xql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
xquery version "3.1";

(: IMPORTS ================================================================= :)

import module namespace edition="http://www.edirom.de/xquery/edition" at "data/xqm/edition.xqm";
import module namespace eutil = "http://www.edirom.de/xquery/util" at "data/xqm/util.xqm";

(: NAMESPACE DECLARATIONS ================================================== :)

declare namespace exist="http://exist.sourceforge.net/NS/exist";
declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
declare namespace request="http://exist-db.org/xquery/request";

(: VARIABLE DECLARATIONS =================================================== :)

declare variable $exist:path external;
declare variable $exist:resource external;
declare variable $exist:prefix external;
declare variable $exist:controller external;

declare option exist:serialize "method=xhtml media-type=application/xhtml+html";

let $langVal := eutil:getLanguage(request:get-parameter("edition", ""))

return
Expand Down
17 changes: 15 additions & 2 deletions add/index.xql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
xquery version "3.1";

(: IMPORTS ================================================================= :)

import module namespace edition = "http://www.edirom.de/xquery/edition" at "data/xqm/edition.xqm";

(: NAMESPACE DECLARATIONS ================================================== :)

declare namespace edirom = "http://www.edirom.de/ns/1.3";
declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
declare namespace request = "http://exist-db.org/xquery/request";

(: OPTION DECLARATIONS ===================================================== :)

declare option output:media-type "text/html";
declare option output:method "html5";
declare option output:indent "yes";
declare option output:omit-xml-declaration "yes";

(: VARIABLE DECLARATIONS =================================================== :)

declare variable $edition := request:get-parameter("edition", "");
declare variable $editionUri := edition:findEdition($edition);
declare variable $preferences := doc(edition:getPreferencesURI($editionUri));

declare option exist:serialize "method=html5 media-type=text/html omit-xml-declaration=yes indent=yes";

let $eoEditionFiles := collection('/db/apps')//edirom:edition[@xml:id]
let $eoEditionFilesCount := count($eoEditionFiles)

Expand Down