-
-
+
W. Digitale Bibliothek
-
diff --git a/edoc/modules/addin.xqm b/edoc/modules/addin.xqm
index 866b1916..606dc0fe 100644
--- a/edoc/modules/addin.xqm
+++ b/edoc/modules/addin.xqm
@@ -11,10 +11,10 @@ import module namespace wdbErr = "https://github.com/dariok/wdbplus/errors" at "
declare namespace wdbadd = "https://github.com/dariok/wdbplus/addins";
(: load the main XQuery module for the requested addin. It is mandatory these implement wdbadd:main($map as map(*)) :)
-declare function wdbAddinMain:body($node as node(), $model as map(*)) {
+declare function wdbAddinMain:body ( $node as node(), $model as map(*) ) as element()+ {
let $addinName := substring-before(substring-after(request:get-uri(), 'addins/'), '/')
- let $path := $wdb:edocBaseDB || "/addins/" || $addinName || "/addin.xqm"
- let $map := map { "location-hints": $path }
+ , $path := $wdb:edocBaseDB || "/addins/" || $addinName || "/addin.xqm"
+ , $map := map { "location-hints": $path }
let $module := try {
load-xquery-module("https://github.com/dariok/wdbplus/addins", $map)
diff --git a/edoc/modules/app.xqm b/edoc/modules/app.xqm
index 444b2573..3f191fd6 100644
--- a/edoc/modules/app.xqm
+++ b/edoc/modules/app.xqm
@@ -21,10 +21,8 @@ import module namespace xstring = "https://github.com/dariok/XStringUtils"
declare namespace config = "https://github.com/dariok/wdbplus/config";
declare namespace main = "https://github.com/dariok/wdbplus";
declare namespace meta = "https://github.com/dariok/wdbplus/wdbmeta";
-declare namespace mets = "http://www.loc.gov/METS/";
declare namespace rest = "http://exquery.org/ns/restxq";
declare namespace tei = "http://www.tei-c.org/ns/1.0";
-declare namespace xlink = "http://www.w3.org/1999/xlink";
(: ALL-PURPOSE VARIABLES :)
(:~
@@ -53,7 +51,7 @@ declare variable $wdb:data :=
where contains($path, '.xml')
order by string-length($path)
return $path
-
+
return replace(xstring:substring-before-last($paths[1], '/'), '//', '/')
;
@@ -204,59 +202,68 @@ declare
%templates:default("view", "")
%templates:default("p", "")
function wdb:getEE($node as node(), $model as map(*), $id as xs:string, $view as xs:string, $p as xs:string) as item()* {
- let $newModel := wdb:populateModel($id, $view, $model, $p)
-
- let $pathParts := tokenize(replace($newModel?fileLoc, '//', '/'), '/')
- , $collection := string-join($pathParts[not(position() = last())], '/')
- , $dateTime := xmldb:last-modified($collection, $pathParts[last()])
- , $adjusted := adjust-dateTime-to-timezone($dateTime,"-PT0H0M")
- , $modifiedWithoutMillisecs := xs:dateTime(format-dateTime($adjusted, "[Y]-[M01]-[D01]T[H01]:[m]:[s]Z"))
- , $last-modified := format-dateTime($adjusted, "[FNn,3-3], [D00] [MNn,3-3] [Y] [H01]:[m]:[s] GMT")
+ try {
+ let $newModel := wdb:populateModel($id, $view, $model, $p)
- let $requestedModified := (
- request:get-attribute("if-modified"),
- request:get-header("If-Modified-Since")
- )[1]
- , $requestedModifiedParsed := parse-ietf-date($requestedModified)
-
- (: TODO: use a function to get the actual content language :)
- return if ( count($newModel) = 1
- and (
- $requestedModifiedParsed lt $modifiedWithoutMillisecs
- or empty($requestedModified)
- or $requestedModified = ''
- ) ) then
- (
- response:set-header("Last-Modified", $last-modified),
-
- {
- for $h in $node/* return
- if ( $h/*[@data-template] ) then
- for $c in $h/* return try {
- templates:apply($c, $wdb:lookup, $newModel)
- } catch * {
- util:log("error", $err:description)
- }
- else
- try {
- templates:apply($h, $wdb:lookup, $newModel)
- } catch * {
- util:log("error", $err:description)
- }
- }
-
- )
- else if ( $requestedModifiedParsed ge $modifiedWithoutMillisecs ) then
- response:set-status-code(304)
- else
-
-
-
- { transform:transform(doc($file), doc($xslt), $params, $attr, "expand-xincludes=no") }
+ { transform:transform(doc($file), doc($xslt), $params, $attr, "") }
{ wdb:getLeftFooter($node, $model) }
} catch * { (util:log("error",
@@ -577,15 +567,28 @@ declare function wdb:getFilePath ( $id as xs:string ) as xs:string {
(: do not just return a random URI but add some checks for better error messages:
: no files found or more than one TEI file found or only wdbmeta entry but no other info :)
let $pathToFile := if ( count($files) = 0 ) then
- fn:error(fn:QName('https://github.com/dariok/wdbErr', 'wdb0000'), "no file with ID " || $id || " in " || $wdb:data)
+ error(
+ QName('https://github.com/dariok/wdbErr', 'wdb0000'),
+ "no file with ID " || $id || " in " || $wdb:data,
+ map { "id": $id, "request": request:get-url() }
+ )
else if ( count($files) > 1 ) then
- fn:error(fn:QName('https://github.com/dariok/wdbErr', 'wdb0001'), "multiple files with ID " || $id || " in " || $wdb:data)
+ error(
+ QName('https://github.com/dariok/wdbErr', 'wdb0001'),
+ "multiple files with ID " || $id || " in " || $wdb:data,
+ map { "id": $id, "request": request:get-url() }
+ )
else if ( local-name($files[1]) = 'id' ) then
base-uri($files[1]) || '#' || $id
else
xstring:substring-before-last(base-uri($files[1]), '/') || '/' || $files[1]
- return $pathToFile
+ return if ( starts-with($files[1], '$') )
+ then
+ let $peer := $files[1] => substring(2) => substring-before('/')
+ , $id := $files[1] => substring-after('/')
+ return $wdb:configFile/id($peer) || '/' || $id
+ else $pathToFile
};
(:~
@@ -597,8 +600,7 @@ declare function wdb:getFilePath ( $id as xs:string ) as xs:string {
: @returns the path (relative) to the app root
:)
declare function wdb:getEdPath($id as xs:string, $absolute as xs:boolean) as xs:string {
- let $file := (collection($wdb:data)/id($id)[local-name() = ('file', 'projectMD', 'struct', 'mets')],
- collection($wdb:data)//mets:file[@ID = $id])[1]
+ let $file := collection($wdb:data)/id($id)[self::meta:file or self::meta:projectMD or self::meta:struct]
let $edPath := if ( count($file) = 1 ) then
xstring:substring-before-last(base-uri($file), '/')
@@ -640,11 +642,8 @@ declare function wdb:getAbsolutePath ( $ed as xs:string, $path as xs:string ) {
: @return the ID of the project
:)
declare function wdb:getEdFromFileId ($id as xs:string) as xs:string {
- let $file := (collection($wdb:data)/id($id)[self::meta:file],
- collection($wdb:data)//mets:file[@ID = $id])[1]
- return if ($file[self::meta:file])
- then $file/ancestor::meta:projectMD/@xml:id
- else $file/ancestor::mets:mets/@OBJID
+ let $file := collection($wdb:data)/id($id)[self::meta:file]
+ return $file/ancestor::meta:projectMD/@xml:id
};
(: ~
@@ -667,12 +666,10 @@ declare function wdb:getEdFromPath($path as xs:string, $absolute as xs:boolean)
wdbErr:error(map{"code": "wdbErr:wdb2001", "additional": {$path}
-
- case element(tei:org) return
-
-
- case element(tei:persName) return wdbe:persName($node, $model)
- case element(tei:birth) return wdbe:bd($node, $model)
- case element(tei:death) return wdbe:bd($node, $model)
- case element(tei:floruit) return wdbe:bd($node, $model)
- case element(tei:listBibl) return wdbe:listBibl($node, $model)
- case element(tei:note) return wdbe:note($node, $model)
- case element(tei:bibl) return
- if ($node/ancestor::tei:person or count($node/ancestor::tei:place)>0) (: Literatur zu anderen Entitäten: Kurzausgabe :)
- then wdbe:listBiblBibl($node, $model)
- else wdbe:bibl($node)
- case element(tei:name) return
- if ($node/parent::tei:abbr)
- then {$node}
- else wdbe:passthrough($node, $model)
- case element(tei:title) return
- if ($node/parent::tei:abbr)
- then {string($node)}
- else wdbe:passthrough($node, $model)
- case element(tei:placeName) return
- if ($node/ancestor::tei:person)
- then wdbe:shortPlace($node)
- else wdbe:placeName($node)
- case element(tei:place) return {wdbe:passthrough($node, $model)}
- case element(tei:idno) return wdbe:idno($node)
- case element(tei:occupation) return
-
- { if ( $node/@type ) then "Titel" else "Beruf" }
- { normalize-space($node) }
-
- case element(tei:orgName) return wdbe:persName($node, $model)
-
-(: default return wdbe:passthrough($node):)
- (:default return concat("def: ", name($node)):)
- default return $node
-};
-
-declare function wdbe:passthrough($nodes as node()*, $model) as item()* {
- if (count($nodes) > 1 or $nodes instance of text())
- then for $node in $nodes return wdbe:transform($node, $model)
- else for $node in $nodes/node() return wdbe:transform($node, $model)
-};
-
-(: die folgenden neu 2016-08-16 DK :)
-declare function wdbe:persName($node, $model) {
-
- Name
- { normalize-space($node) }
-
-};
-
-declare function wdbe:names($node) {
-
- {
- typeswitch($node)
- case element(tei:forename) return "Vorname"
- case element(tei:surname) return "Nachname"
- case element(tei:nameLink) return "Prädikat"
- case element(tei:roleName) return "Amt/Titel"
- case element(tei:genName) return ""
- case element(tei:addName) return wdbe:addName($node)
- default return local-name($node)
- }
- {$node/text()}
-
-};
-
-declare function wdbe:addName($node) as xs:string {
-let $resp :=
- if ($node/@type = "toponymic") then 'toponymischer Beiname'
- else if ($node/@type = 'cognomen') then 'Cognomen'
- else "Beiname"
-
- return $resp
-};
-
-declare function wdbe:bd($node, $model) {
-
- {
- typeswitch($node)
- case element(tei:birth) return "geb."
- case element(tei:death) return "gest."
- default return "lebte"
- }
- {wdbe:passthrough($node, $model)}
-
-};
-
-declare function wdbe:listBibl($node, $model) {
-
- Literatur
-
-};
-
-(: Kurztitelausgaben in einer listBibl; 2016-08-17 DK :)
-declare function wdbe:listBiblBibl($node, $model) {
- if ($node/@ref) then
- let $id := substring-after($node/@ref, '#')
- let $entry := collection(concat('/db/', $model('ed')))/id($id)
-(: let $ln := $wdb:edocBaseURL || '/entity.html?id=' || $id || '&ed=' || $model('ed'):)
- let $ln := "javascript:show_annotation('" || $model('ed') || "', '/db/" || $model('ed') || "/register/bibliography.xml', '"
- || $wdb:edocBaseDB || "/resource/bibl.xsl', '" || $id || "', 0, 0);"
- return {wdbe:passthrough($entry/tei:abbr, $model)}{string($node)}
- else
- let $link := $node/tei:ref/@target
- let $text := $node/tei:ref/text()
- return {$text}
-};
-
-(: Ausgabe einer bibliographischen Langangabe; 2016-08-17 DK :)
-declare function wdbe:bibl($node) {
- (: TODO erweitern für strukturierte Angaben! :)
- Anmerkung {wdbe:passthrough($node, $model)} Name {replace($node/tei:settlement, '!', ', ')} Land {string($node/tei:country)} Name {replace($node/tei:settlement, '!', ', ')} Normdaten-ID {$node} ERROR
+
,
+ head
-
)
diff --git a/edoc/modules/function.xqm b/edoc/modules/function.xqm
index 0a6ec1f4..571d8a09 100644
--- a/edoc/modules/function.xqm
+++ b/edoc/modules/function.xqm
@@ -10,6 +10,7 @@ import module namespace wdba = "https://github.com/dariok/wdbplus/auth"
import module namespace wdbAddinMain = "https://github.com/dariok/wdbplus/addins-main" at "/db/apps/edoc/modules/addin.xqm";
import module namespace wdbe = "https://github.com/dariok/wdbplus/entity" at "/db/apps/edoc/modules/entity.xqm";
import module namespace wdbErr = "https://github.com/dariok/wdbplus/errors" at "/db/apps/edoc/modules/error.xqm";
+import module namespace wdbpq = "https://github.com/dariok/wdbplus/pquery" at "/db/apps/edoc/modules/pquery.xqm";
import module namespace wdbs = "https://github.com/dariok/wdbplus/stats" at "stats.xqm";
import module namespace wdbSearch = "https://github.com/dariok/wdbplus/wdbs" at "/db/apps/edoc/modules/search.xqm";
import module namespace wdbst = "https://github.com/dariok/wdbplus/start" at "/db/apps/edoc/modules/start.xqm";
@@ -57,15 +58,20 @@ declare function wdbfp:populateModel ( $id as xs:string?, $ed as xs:string, $p a
else if ( request:exists() and request:get-uri() => ends-with('/entity.html') ) then
let $regFile := switch ( $q )
case "per"
- return collection(wdb:getEdPath($ed, true()))//*:listPerson
+ return collection(wdb:getEdPath($ed, true()))//*:listPerson[ancestor::*:text]
case "org"
- return collection(wdb:getEdPath($ed, true()))//*:listOrg
+ return collection(wdb:getEdPath($ed, true()))//*:listOrg[ancestor::*:text]
+ case "pla"
+ return collection(wdb:getEdPath($ed, true()))//*:listPlace[ancestor::*:text]
default
- return ""
+ return error(xs:QName("wdbErr:wdb3010"), "unknown entity type", map { "type": $q })
let $entryEd := $regFile/id($id)
+ , $pathToEd := if ( $ed = "" )
+ then $wdb:data
+ else wdb:getEdPath($ed, true())
(: TODO: this only uses a project specific list* file; we want ot use (or at least support) globals files :)
- return map { "entry": $entryEd, "id": $id, "ed": $ed }
+ return map { "entry": $entryEd, "id": $id, "ed": $ed, "pathToEd": $pathToEd }
else if ( $id = "" ) then
(: no ID: related to a project :)
let $pathToEd := if ( $ed = "" )
@@ -120,20 +126,43 @@ declare function wdbfp:populateModel ( $id as xs:string?, $ed as xs:string, $p a
}
return map:merge(($map, $mmap))
else $map (: if it is an element, this usually means that populateModel has returned an error :)
+ } catch *:wdb0200 {
+ (: app.xqm: no file with ID :)
+ error(
+ xs:QName("wdbErr:wdb0200"),
+ "project not found",
+ map {
+ "id": $id,
+ "ed": $ed,
+ "p": $p,
+ "q": $q,
+ "wdb:data": $wdb:data,
+ "request": request:get-url()
+ }
+ )
} catch * {
- wdbErr:error(map {
- "code": "wdbErr:wdb3001",
- "id": $id,
- "ed": $ed,
- "p": $p,
- "q": $q,
- "wdb:data": $wdb:data,
- "errC": $err:code,
- "errA": $err:additional,
- "errM": $err:description,
- "errLocation": $err:module || '@' || $err:line-number ||':'||$err:column-number
- })
- }
+ let $errorMap := map {
+ "code": "wdbErr:wdb3001",
+ "id": $id,
+ "ed": $ed,
+ "p": $p,
+ "q": $q,
+ "wdb:data": $wdb:data,
+ "errC": $err:code,
+ "errA": $err:additional,
+ "errM": $err:description,
+ "errLocation": $err:module || '@' || $err:line-number ||':'||$err:column-number,
+ "request": request:get-url()
+ }
+ return (
+ util:log("error", $errorMap),
+ error(
+ xs:QName("wdbErr:wdb3001"),
+ "error creating map in function.xqm",
+ $errorMap
+ )
+ )
+ }
};
(:~
@@ -144,34 +173,41 @@ declare
%templates:default("p", "")
%templates:default("id", "")
%templates:default("ed", "")
- %templates:wrap
function wdbfp:start ( $node as node(), $model as map(*), $id as xs:string, $ed as xs:string, $p as xs:string,
$q as xs:string ) as item()* {
- let $newModel := wdbfp:populateModel($id, $ed, $p, $q)
+ try {
+ let $newModel := wdbfp:populateModel($id, $ed, $p, $q)
- (: TODO: use a function to get the actual content language :)
- return
-
- {
- for $h in $node/* return
- if ( $h/*[@data-template] )
- then for $c in $h/* return
- try {
+ (: TODO: use a function to get the actual content language :)
+ return
+
+ {
+ for $h in $node/* return
+ if ( $h/*[@data-template] )
+ then for $c in $h/* return
templates:apply($c, $wdbfp:lookup, $newModel)
- } catch * {
- util:log("info", $newModel),
- util:log("error", $err:description),
- error(xs:QName("wdbErr:e1234"), $err:description, $newModel)
- }
- else try {
- templates:apply($h, $wdbfp:lookup, $newModel)
- } catch * {
- util:log("info", $newModel),
- util:log("error", $err:description),
- error(xs:QName("wdbErr:e1234"), $err:description, $newModel)
- }
- }
-
+ else
+ templates:apply($h, $wdbfp:lookup, $newModel)
+ }
+
+ } catch *:wdb0200 {
+ util:log("error", "project not found: " || $err:value?ed || " from request " || $err:value?request),
+ wdbErr:error(map{
+ "code": $err:code,
+ "err:description": "project not found",
+ "err:additional": $err:additional
+ })
+ } catch * {
+ util:log("error", "error when applying templates in function.xqm: " || $err:description),
+ wdbErr:error(map{
+ "code": $err:code,
+ "model": $newModel,
+ "err:value": $err:value,
+ "err:description": $err:description,
+ "err:additional": $err:additional,
+ "location": $err:module || '@' || $err:line-number || ':' || $err:column-number
+ })
+ }
};
declare function wdbfp:getVal ($node as node(), $model as map(*), $key as xs:string) {
@@ -180,6 +216,13 @@ declare function wdbfp:getVal ($node as node(), $model as map(*), $key as xs:str
}
};
+declare function wdbfp:evalForAttribute ( $node as node(), $model as map(*), $attribute as xs:string, $expression as xs:string ) {
+ element { local-name($node) } {
+ attribute { $attribute } { util:eval($expression) },
+ $node/node()
+ }
+};
+
declare function wdbfp:getHead ( $node as node(), $model as map(*), $templateFile as xs:string* ) as element(head) {
diff --git a/edoc/modules/search.xqm b/edoc/modules/search.xqm
index 1188b6d6..a7b8fc76 100644
--- a/edoc/modules/search.xqm
+++ b/edoc/modules/search.xqm
@@ -10,51 +10,50 @@ import module namespace wdbRe = "https://github.com/dariok/wdbplus/RestEntities"
import module namespace wdbRs = "https://github.com/dariok/wdbplus/RestSearch" at "../rest/rest-search.xql";
import module namespace wdb = "https://github.com/dariok/wdbplus/wdb" at "app.xqm";
-declare function wdbSearch:getLeft ( $node as node(), $model as map(*) ) {(
-
, -
, -
, +
, +
- {$request-headers}
- )//(*:div)[1]
- } catch * {
-
Eintrag
Titel
- {if ($admin = true()) then
- (
- Metadaten-Datei ,
- verwalten
+ {
+ if ( $admin ) then (
+ Metadaten-Datei ,
+ verwalten
)
else ()
}
- {(
- for $mets in $editionsM
- let $name := $mets/mets:dmdSec[1]/mets:mdWrap[1]/mets:xmlData[1]/mods:mods[1]/mods:titleInfo[1]/mods:title[1]
- let $metsFile := document-uri(root($mets))
- let $id := wdb:getEdPath($metsFile)
- order by $id
- return
-
- (M) {$id}
- {normalize-space($name)}
- {if ($admin = true()) then
- (
- {$metsFile} ,
- verwalten
- )
- else ()
- }
- ,
+ {
for $w in $editionsW
let $name := $w/wdbmeta:titleData/wdbmeta:title[1]
- let $metaFile := document-uri(root($w))
- let $id := $w/@xml:id
- let $pa := substring-before(substring-after($metaFile, $wdb:data), "/wdbmeta.xml")
- let $padding := count(tokenize($pa, '/')) + 0.2
+ , $metaFile := document-uri(root($w))
+ , $id := $w/@xml:id
+ , $pa := substring-before(substring-after($metaFile, $wdb:data), "/wdbmeta.xml")
+ , $padding := count(tokenize($pa, '/')) + 0.2
order by $pa
return
{$id}
{normalize-space($name)}
- {if ($admin = true()) then (
- {xs:string($metaFile)} ,
- verwalten
- )
- else ()
+ {
+ if ( $admin ) then (
+ {xs:string($metaFile)} ,
+ verwalten
+ )
+ else ()
}
- )}
+ }
};
diff --git a/edoc/modules/wdb-files.xqm b/edoc/modules/wdb-files.xqm
index 9312f216..8579ea14 100644
--- a/edoc/modules/wdb-files.xqm
+++ b/edoc/modules/wdb-files.xqm
@@ -12,47 +12,96 @@ xquery version "3.1";
module namespace wdbFiles = "https://github.com/dariok/wdbplus/files";
-import module namespace functx = "http://www.functx.com" at "/db/system/repo/functx-1.0.1/functx/functx.xq";
+import module namespace functx = "http://www.functx.com" at "/db/system/repo/functx-1.0.1/functx/functx.xq";
declare namespace meta = "https://github.com/dariok/wdbplus/wdbmeta";
-declare namespace mets = "http://www.loc.gov/METS/";
declare namespace wdbErr = "https://github.com/dariok/wdbplus/errors";
-declare namespace xlink = "http://www.w3.org/1999/xlink";
(:~
: Return the path to all Resources with a given ID
:
- : This function looks within metadata files, i.e. wdbmeta.xml and mets.xml, and returns all paths found. If a file has
- : an xml:id but is not “registered” with its project’s metadata, it wont’t be returned. Also, this function will
- : return all files; it is up to the caller to act upon this accordingly.
+ : This function looks within a project’s metadata file, i.e. wdbmeta.xml, and returns all paths found. If a file has no
+ : xml:id or has an xml:id but is not “registered” with its project’s metadata, it wont’t be returned. Also, this
+ : function will return all files with a given ID; it is up to the caller to act upon this accordingly.
:
- : @param $collection as xs:string: ID of the collection in which to search
+ : @param $collection as xs:string: path the collection in which to search
: @param $id as xs:string: the ID value to be used
: @return attribute()* the path attributes to the files as stored in the meta data files
:)
- declare function wdbFiles:getFilePaths ( $collection, $id ) as attribute()* {
- (
- collection($collection)//id($id)[self::meta:file]/@path,
- collection($collection)//id($id)[self::meta:struct]/@xml:id,
- collection($collection)//mets:file[@ID = $id]/mets:FLocat/@xlink:href
+ declare function wdbFiles:getFilePaths ( $collection as xs:string, $id as xs:string ) as attribute()* {
+ let $candidates := collection($collection)//id($id)
+
+ return (
+ $candidates[self::meta:file]/@path,
+ $candidates[self::meta:struct]/@xml:id
)
};
(:~
: Return the absolute Path to the file identified by the path attribute
:
- : @param $path as attribute() an attribute node from wdbmeta or METS
+ : @param $path as attribute() an attribute node from wdbmeta
: @return xs:anyURI
:)
-declare function wdbFiles:getAbsolutePath ( $path as attribute() ) {
- let $base :=functx:substring-before-last(base-uri($path), '/')
- let $val := string($path)
+declare function wdbFiles:getAbsolutePath ( $path as attribute() ) as xs:anyURI {
+ let $base := functx:substring-before-last(base-uri($path), '/')
+ , $val := string($path)
- return if (starts-with($val, $base))
+ return if ( starts-with($val, $base) )
then xs:anyURI($val)
else xs:anyURI($base || '/' || $val)
};
+(:~
+ : return a map with the path to a file split into its parent collection (which may be different from the
+ : project collection) and its file name
+ :
+ : @param $id as xs:string: the ID of the file (which should be unique)
+ : @return map(string, string) with keys "collectionPath", "fileName", "projectPath"
+ : @throws wdbErr:wdb0000
+ : @throws wdbErr:wdb0001
+:)
+declare function wdbFiles:getFullPath ( $id as xs:string ) as map( xs:string, xs:string, xs:string? )? {
+ let $file := collection("/db")/id($id)[self::meta:file]
+
+ return if ( count($file) = 0 ) then
+ error(
+ QName('https://github.com/dariok/wdbErr', 'wdb0000'),
+ "no file with ID " || $id,
+ map { "id": $id, "request": request:get-url() }
+ )
+ else if ( count($file) > 1 ) then
+ error(
+ QName('https://github.com/dariok/wdbErr', 'wdb0001'),
+ "multiple files with ID " || $id,
+ map { "id": $id, "request": request:get-url() }
+ )
+ else if ( $file[self::meta:projectMD] ) then
+ let $projectPath := base-uri($file) => substring-before("wdbmeta.xml")
+ return map {
+ "projectPath": $projectPath,
+ "collectionPath": $projectPath,
+ "fileName": "wdbmeta.xml"
+ }
+ else if ( starts-with($file/@path, '$') ) then
+ let $projectPath := base-uri($file) => substring-before("wdbmeta.xml")
+ , $peer := $file => substring(2) => substring-before('/')
+ , $id := $file => substring-after('/')
+ return map {
+ "projectPath": $projectPath,
+ "fileURL": doc("../config.xml")/id($peer) || '/' || $id
+ }
+ else
+ let $projectPath := base-uri($file) => substring-before("wdbmeta.xml")
+ , $path := $projectPath || $file/@path
+
+ return map{
+ "projectPath": $projectPath,
+ "collectionPath": functx:substring-before-last($path, '/') ,
+ "fileName": functx:substring-after-last($path, '/')
+ }
+};
+
(:~
: Check whether the current user has the right to access the file with the given mode
:
@@ -72,3 +121,58 @@ declare function wdbFiles:hasAccess ( $collection as xs:string, $id as xs:string
return if (sm:has-access($path, $mode)) then $path else false()
else error(xs:QName("wdbErr:wdb0001"))
};
+
+(:~
+ : Return the modification date adjusted to GMT, without milliseconds
+ :
+ : @param $collectionPath xs:string path to the base collection
+ : @param $id xs:string ID of the file
+ : @return xs:dateTime
+ :)
+declare function wdbFiles:getModificationDate ( $id as xs:string ) as xs:dateTime {
+ let $path := wdbFiles:getFullPath($id)
+
+ return wdbFiles:getModificationDate($path?collectionPath, $path?fileName)
+};
+
+(:~
+ : Return the modification date adjusted to GMT, without milliseconds
+ :
+ : @param $collectionPath xs:string path to the base collection
+ : @param $fileName xs:string the name of the file
+ : @return xs:dateTime
+ :)
+declare function wdbFiles:getModificationDate ( $collectionPath as xs:string, $fileName as xs:string ) as xs:dateTime {
+ let $dateTime := xmldb:last-modified($collectionPath, $fileName)
+ , $adjusted := adjust-dateTime-to-timezone($dateTime,"-PT0H0M")
+
+ return xs:dateTime(format-dateTime($adjusted, "[Y]-[M01]-[D01]T[H01]:[m]:[s]Z"))
+};
+
+declare function wdbFiles:evaluateIfModifiedSince ( $id as xs:string, $requestedModified as xs:string+ ) as xs:double {
+ let $path := wdbFiles:getFullPath($id)
+
+ return wdbFiles:evaluateIfModifiedSince($path?collectionPath, $path?fileName, $requestedModified)
+};
+
+(:~
+ : evaluate If-Modified-Since and return either 200 or 304
+ :)
+declare function wdbFiles:evaluateIfModifiedSince ( $collectionPath as xs:string, $fileName as xs:string, $requestedModified as xs:string+ ) as xs:double {
+ let $modifiedWithoutMillisecs := wdbFiles:getModificationDate($collectionPath, $fileName)
+ , $requestedModifiedParsed := parse-ietf-date(string-join($requestedModified))
+
+ return if ( $requestedModifiedParsed lt $modifiedWithoutMillisecs )
+ then 200
+ else 304
+};
+
+(:~
+ : format da given datetime as IETF date
+ :
+ : @param gmtDateTime an xs:dataTime adjust to GMT
+ : @returns xs:string formated as an IETF date
+ :)
+declare function wdbFiles:ietfDate ( $gmtDateTime as xs:dateTime ) as xs:string {
+ format-dateTime($gmtDateTime, "[FNn,3-3], [D00] [MNn,3-3] [Y] [H01]:[m]:[s] GMT")
+};
diff --git a/edoc/post-install.xql b/edoc/post-install.xql
index aad81d2f..8153df4d 100644
--- a/edoc/post-install.xql
+++ b/edoc/post-install.xql
@@ -2,7 +2,21 @@ xquery version "3.1";
let $targetCollection := '/db/apps/edoc'
-let $cp := xmldb:copy-collection($targetCollection || '/config/edoc', '/db/system/config/db/apps')
+(: let $cp := xmldb:copy-collection($targetCollection || '/config/edoc', '/db/system/config/db/apps') :)
+(: It seems that copying and then re-indexing does not suffice. A workaround reported in
+ : https://github.com/eXist-db/exist/issues/5099#issuecomment-1775120346 suggests that storing
+ : a collection.xconf might help. :)
+let $indexConfig := (
+ xmldb:create-collection("/db/system/config/db/apps", "edoc"),
+ xmldb:create-collection("/db/system/config/db/apps/edoc", "addins"),
+ xmldb:create-collection("/db/system/config/db/apps/edoc", "annotations"),
+ xmldb:create-collection("/db/system/config/db/apps/edoc", "data"),
+ xmldb:create-collection("/db/system/config/db/apps/edoc", "rest"),
+ xmldb:store("/db/system/config/db/apps/edoc/addins", "collection.xconf", doc($targetCollection || "/config/edoc/addins/collection.xconf")),
+ xmldb:store("/db/system/config/db/apps/edoc/annotations", "collection.xconf", doc($targetCollection || "/config/edoc/annotations/collection.xconf")),
+ xmldb:store("/db/system/config/db/apps/edoc/data", "collection.xconf", doc($targetCollection || "/config/edoc/data/collection.xconf")),
+ xmldb:store("/db/system/config/db/apps/edoc/rest", "collection.xconf", doc($targetCollection || "/config/edoc/rest/collection.xconf"))
+)
let $collsr := (
"/modules", "/templates", "/resources/css", "/resources/scripts", "/resources/xsl"
@@ -37,7 +51,8 @@ let $chmod := (
let $reindex := (
xmldb:reindex($targetCollection || '/data'),
xmldb:reindex($targetCollection || '/rest'),
- xmldb:reindex($targetCollection || '/annotation')
+ xmldb:reindex($targetCollection || '/annotation'),
+ xmldb:reindex($targetCollection || '/addins')
)
return ($reindex, $chmod)
\ No newline at end of file
diff --git a/edoc/resources/mets.xsl b/edoc/resources/mets.xsl
deleted file mode 100644
index 8472698f..00000000
--- a/edoc/resources/mets.xsl
+++ /dev/null
@@ -1,494 +0,0 @@
-
-
-
-
-
-
-
-
- Contents
-
-
- Inhalt
-
-
- Parallel Views
-
-
- Parallele Anzeige
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ,
-
-
-
-
-
-
- .
-
-
- :
-
-
- .
-
-
- :
-
-
- [
-
-
-
- _blank
- ↗opac
-
- ]
-
-
-
-
-
-
-
-
-
-
-
- ;
-
-
-
-
-
- ,
-
-
-
-
-
- :
-
-
-
-
-
- ;
-
-
-
-
-
- ,
-
-
-
-
-
- :
-
-
-
-
-
-
- .
-
-
-
-
-
- :
-
-
-
-
- .
-
-
- (
- )
-
-
-
-
-
-
- ,
-
-
-
-
- [
-
-
-
-
-
-
-
-
-
-
-
- _blank
- ↗
- ]
-
-
-
-
-
-
-
-
- (
- )
-
-
-
-
-
-
- .
-
-
-
- —
-
-
-
- ×
-
- —
-
-
-
- —
-
-
-
- .
-
-
-
-
- ,
-
-
- .
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- _blank
-
-
- _top
-
-
- display2
-
-
-
-
-
-
-
-
- ?id=
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edoc/resources/nav.xsl b/edoc/resources/nav.xsl
index 7550f1ca..5310527f 100644
--- a/edoc/resources/nav.xsl
+++ b/edoc/resources/nav.xsl
@@ -51,7 +51,7 @@
-
+Kilroy was here
-
+
diff --git a/edoc/expath-pkg.xml b/edoc/expath-pkg.xml
index 7b21c517..fe43428b 100644
--- a/edoc/expath-pkg.xml
+++ b/edoc/expath-pkg.xml
@@ -1,4 +1,4 @@
-
+
-
\ No newline at end of file
+Kilroy was here
-
-
- { util:log("error", $newModel) }
-
+ return if ( contains($newModel?fileLoc, 'http') ) then
+ $newModel
+ else
+ let $last-modified :=
+ wdbFiles:getModificationDate($newModel?filePathInfo?collectionPath, $newModel?filePathInfo?fileName)
+ => wdbFiles:ietfDate()
+
+ let $requestedModified := (
+ request:get-attribute("if-modified"),
+ request:get-header("If-Modified-Since")
+ )[1]
+ let $isModified := if ( $requestedModified != '' )
+ then wdbFiles:evaluateIfModifiedSince($id, $requestedModified)
+ else 200
+
+ (: TODO: use a function to get the actual content language :)
+ return if ( count($newModel) = 1 and $isModified = 200 )
+ then (
+ response:set-header("Last-Modified", $last-modified),
+
+ {
+ for $h in $node/* return
+ if ( $h/*[@data-template] ) then
+ for $c in $h/* return try {
+ templates:apply($c, $wdb:lookup, $newModel)
+ } catch * {
+ util:log("error", $err:description)
+ }
+ else
+ try {
+ templates:apply($h, $wdb:lookup, $newModel)
+ } catch * {
+ util:log("error", $err:description)
+ }
+ }
+
+ )
+ else if ( $isModified = 304 ) then
+ response:set-status-code(304)
+ else
+
+
+ An unknown error has occurred
-
+
+
+ { util:log("error", $newModel) }
+
+ } catch * {
+ util:log("error", $err:code || ': ' || $err:description),
+ wdbErr:error(map {
+ "code": $err:code,
+ "model": $model,
+ "err:value": $err:value,
+ "err:description": $err:description,
+ "err:additional": $err:additional,
+ "location": $err:module || '@' || $err:line-number || ':' || $err:column-number
+ })
+ }
};
(:~
@@ -272,29 +279,22 @@ declare function wdb:populateModel ( $id as xs:string, $view as xs:string, $mode
wdb:populateModel($id, $view, $model, "")
};
declare function wdb:populateModel ( $id as xs:string, $view as xs:string, $model as map(*), $p as xs:string ) as item()* {
- try {
- let $pTF := wdb:getFilePath($id)
- let $pathToFile := if ( sm:has-access($pTF, "r") )
- then $pTF
- else error(xs:QName("wdbErr:wdb0004"))
-
- let $pathToEd := wdb:getEdPath($id, true())
- let $pathToEdRel := substring-after($pathToEd, $wdb:edocBaseDB||'/')
-
- (: The meta data are taken from wdbmeta.xml or a mets.xml as fallback :)
- let $infoFileLoc := wdb:getMetaFile($pathToEd)
-
- let $ed := if (ends-with($infoFileLoc, 'wdbmeta.xml'))
- then string(doc($infoFileLoc)/meta:projectMD/@xml:id)
- else string(doc($infoFileLoc)/mets:mets/@OBJID)
+ let $filePathInfo := wdbFiles:getFullPath($id)
+ , $pathToFile := if ( map:keys($filePathInfo) = 'fileURL' )
+ then
+ $filePathInfo?fileURL
+ else
+ $filePathInfo?collectionPath || '/' || $filePathInfo?fileName
+ , $pathToEd := $filePathInfo?projectPath
+ , $infoFileLoc := $filePathInfo?projectPath || '/wdbmeta.xml'
- let $xsl := if ( contains($pTF, 'wdbmeta.xml') ) then
- (: TODO get path to XSL via function (use what’s in rest-files.xql) :)
- xs:anyURI($wdb:data || '/resources/nav.xsl')
- else if ( ends-with($infoFileLoc, 'wdbmeta.xml') ) then
- wdb:getXslFromWdbMeta($infoFileLoc, $id, 'html')
- else
- wdb:getXslFromMets($infoFileLoc, $id, $pathToEdRel)
+ let $ed := string(doc($infoFileLoc)/meta:projectMD/@xml:id)
+
+ let $xsl := if ( $filePathInfo?fileName = "wdbmeta.xml" )
+ then
+ (: TODO get path to XSL via function (use what’s in rest-files.xql) :)
+ xs:anyURI($wdb:data || '/resources/nav.xsl')
+ else wdb:getXslFromWdbMeta($infoFileLoc, $id, 'html')
let $xslt := if (doc-available($xsl))
then $xsl
@@ -324,6 +324,7 @@ declare function wdb:populateModel ( $id as xs:string, $view as xs:string, $mode
let $map := map {
"ed": $ed,
"fileLoc": $pathToFile,
+ "filePathInfo": $filePathInfo,
"functions": map { "project": $projectFunctions, "instance": $instanceFunctions },
"header": $header,
"id": $id,
@@ -340,17 +341,6 @@ declare function wdb:populateModel ( $id as xs:string, $view as xs:string, $mode
}
return $map
- } catch * {
- wdbErr:error(map {
- "code": $err:code,
- "pathToEd": $wdb:data,
- "ed": $wdb:data,
- "model": $model,
- "value": $err:value,
- "desc": $err:description,
- "location": $err:module || '@' || $err:line-number ||':'||$err:column-number
- })
- }
};
(: ~
@@ -497,7 +487,7 @@ declare function wdb:getContent($node as node(), $model as map(*)) {
return
try {
An unknown error has occurred
+{ - typeswitch ($entryEd) - case element(tei:person) - return if ($entryEd/tei:persName[@type='index']) - then wdbe:passthrough($entryEd/tei:persName[@type='index'], $model) - else wdbe:shortName($entryEd/tei:persName[1]) - case element(tei:bibl) - return wdbe:shortTitle($entryEd, $model) - case element(tei:place) - return normalize-space($entryEd/tei:placeName) - default - return name($entryEd[1]) - }
+ return map { "entry": $entry, "ent": $ent, "ed": $ed, "pathToEd": $edPath } }; -declare function wdbe:getEntityBody($node as node(), $model as map(*)) { - let $ent := $model("entry") +declare function wdbe:getEntityBody( $node as node(), $model as map(*) ) as element() { + let $xsl := if ( doc-available($model?pathToEd || "/resources/tei-index.xsl") ) + then doc($model?pathToEd || "/resources/tei-index.xsl") + else doc("/db/apps/edoc/resources/tei-index.xsl") + , $result := transform:transform($model?entry, $xsl, ()) - return wdbe:transform($ent, $model) -}; - -(: TODO replace by proper XSLT and the usual means of project specifics; 2019-08-23 DK :) -declare function wdbe:transform($node, $model as map(*)) as item()* { - typeswitch ($node) - case text() return $node - case element(tei:person) return -| - - - - - | -Person | -
| - - - - - | -Organisation / Körperschaft | -
- {
- for $bibs in $node return wdbe:passthrough($bibs, $model)
- }
{$node/node()[not(self::tei:abbr)]}
-}; - -(: zur Ausgabe von Kurztiteln eines Buches; 2016-08-17 DK :) -(: $node ein Element tei:bibl - Ausgabe formatierter Kurztitel :) -declare function wdbe:shortTitle($node, $model) { - (: Kurztitel: Verarbeitung von tei:abbr. Evtl. enthaltenes tei:name in Kapitälchen, tei:title kursiv :) - if ($node/tei:abbr) then wdbe:passthrough($node/tei:abbr, $model) - else substring($node, 1, 50) -}; - -declare function wdbe:shortName($node) { - { - if ($node/tei:name) then $node/tei:name - else - let $tr := string-join(($node/tei:surname, $node/tei:forename), ", ") - let $add := if ($node/tei:addName) then concat(' (', $node/tei:addName, ')') else "" - return concat($tr, ' ', $node/tei:nameLink, $add) - } -}; - -declare function wdbe:note($node, $model) { -Keine Informationen gefunden.
+
+ else
+ Seite nicht gefunden
+Leider konnten wir die angegebene Seite nicht finden
+
+
+
return (
- console:log($error),
- response:set-status-code(418),
+ util:log("error", $error),
+ util:log("info", $data),
+ response:set-status-code($statusCode),
Something has gone wrong...
+{$error}
+ { wdbErr:get(map:merge(($data, map:entry("user", sm:id()))), '') } +
-
+ { $errorContent }
Something has gone wrong...
-{$error}
- { wdbErr:get(map:merge(($data, map:entry("user", sm:id()))), '') } -
-
,
- Volltextsuche
- -Wildcard: * (nicht an erster Stelle!)
Suche mit RegEx ist möglich mit Delimiter '/': /[k|K][e|a].+/
, -
-
,
- Registersuche
- -, -
-
-)
+declare function wdbSearch:getLeft ( $node as node(), $model as map(*) ) {
+ let $options := local:selectEd($model)
+
+ return (
+ Registerliste
- -
+
,
+ Volltextsuche
+ +Wildcard: * (nicht an erster Stelle!)
Suche mit RegEx ist möglich mit Delimiter '/': /[k|K][e|a].+/
, +
+
,
+ Registersuche
+ +, +
+
+ )
};
declare function wdbSearch:search ( $node as node(), $model as map(*) ) {
- let $start := if ( $model?p instance of map(*) and map:contains($model?p, "start"))
- then '&start=' || $model?p?start
- else 1
-
let $job := if ( $model?p instance of map(*) )
then $model?p?job
else "err"
@@ -68,50 +67,16 @@ declare function wdbSearch:search ( $node as node(), $model as map(*) ) {
response:set-header("Cache-Control", "no-cache"),
switch ( $job )
case "fts"
- return wdbRs:collectionHtml($model?ed, $model?q, $start)
+ return wdbRs:collectionHtml($model?ed, $model?q, $model?p?start)
case "search"
return wdbRe:scanHtml($model?ed, $model?p?type, $model?q)
case "list"
- return wdbRe:collectionEntityHtml($model?ed, $model?p?type, $model?p?id, $start)
+ return wdbRe:collectionEntityHtml($model?ed, $model?p?type, $model?p?id, $model?p?start)
case "entries"
return wdbRe:scanHtml($model?ed, $model?p?type, lower-case($model?q))
default
return response:set-status-code(400)
)
-
- (:
- let $ln := switch ($job)
- case "fts" return $wdb:restURL || "search/collection/" || $model?ed || ".html?q=" || encode-for-uri($model?q) || "&p=" || encode-for-uri($json)
- case "search" return $wdb:restURL || "entities/scan/" || $model?p?type || '/' || $model?ed || ".html?q=" || encode-for-uri($model?q) || "&p=" || encode-for-uri($json)
- case "entries" return $wdb:restURL || 'entities/scan/' || $model?p?type || '/' || $model?ed || '.html?q=' || lower-case($model?q) || '&p=' || encode-for-uri($json)
- case "list" return $wdb:restURL || "entities/collection/" || $model?ed || "/" || $model?p?type || "/" || $model?p?id || ".html?p=" || encode-for-uri($json)
- default return ""
- let $url := xs:anyURI($ln || $start),
- $auth := request:get-cookie-value("wdbplus")
-
- let $request-headers := (
- Registerliste
+ +
- klick
-
- } :)
else
};
@@ -120,11 +85,11 @@ declare function local:selectEd ($model) {(
let $md := doc($wdb:data || '/wdbmeta.xml')
let $opts := for $file in $md//meta:ptr
let $id := $file/@xml:id
- let $label := $md//meta:struct[@file = $id]/@label
+
return
return (
if ( count($opts) gt 1 ) then else (),
diff --git a/edoc/modules/stats.xqm b/edoc/modules/stats.xqm
index b1485434..ab5984a8 100644
--- a/edoc/modules/stats.xqm
+++ b/edoc/modules/stats.xqm
@@ -5,8 +5,6 @@ module namespace wdbs = "https://github.com/dariok/wdbplus/stats";
import module namespace wdb = "https://github.com/dariok/wdbplus/wdb" at "app.xqm";
import module namespace templates = "http://exist-db.org/xquery/html-templating";
-declare namespace mets = "http://www.loc.gov/METS/";
-declare namespace mods = "http://www.loc.gov/mods/v3";
declare namespace tei = "http://www.tei-c.org/ns/1.0";
declare namespace wdbc = "https://github.com/dariok/wdbplus/config";
declare namespace wdbmeta = "https://github.com/dariok/wdbplus/wdbmeta";
@@ -24,7 +22,6 @@ declare function wdbs:projectList($admin as xs:boolean, $ed) {
wdb:getEdPath($ed, true())
} catch * {()}
- let $editionsM := collection($pathToEd)//mets:mets
let $editionsW := collection($pathToEd)//wdbmeta:projectMD
return
@@ -32,51 +29,35 @@ declare function wdbs:projectList($admin as xs:boolean, $ed) {
-
-
- {$err:code} -
- {$err:description} -
- {$err:module || '@' || $err:line-number ||':'||$err:column-number} -
- {$err:additional} -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [
-
-
-
- _blank
- ↗opac
-
- ]
-
-
-
- No title found - please contact
- the library
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
-
-
-
- -
-
-
-
+ Lizenzinformationen:
Error transforming meta data file {$model?infoFileLoc} to navigation HTML:
{$err:description}
Error transforming meta data file {$model?infoFileLoc} to navigation HTML:
{$err:description}