Skip to content

Commit

Permalink
Add id as filter
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinFechner committed Jun 7, 2022
1 parent a33cfc3 commit 8f1612b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
8 changes: 4 additions & 4 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#Mon, 25 Apr 2022 18:56:16 +0200
#Wed, 25 May 2022 16:21:44 +0200
project.version.major=1
project.version.minor=18
project.version.patch=2
project.version.patch=3

project.app.name=ediarum.web
project.app.folder=.

repository.version=v1.17.4-3-g4318dee
repository.version=v1.17.4-9-gdac7634

project.version.date=2022-04-25.18-56-16
project.version.date=2022-05-25.16-21-44
Binary file not shown.
16 changes: 15 additions & 1 deletion content/edweb-api.xql
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,20 @@ declare function edwebapi:get-object-list(
let $filters := $object-def/appconf:filters/appconf:filter
let $filter :=
map:merge((
map:entry(
"id",
map:merge((
map:entry("id", "id"),
map:entry("name", "ID"),
map:entry("n", 0),
map:entry("type", "id"),
map:entry("depends", ""),
map:entry("xpath", $object-def/appconf:item/appconf:id),
map:entry(
"label-function", "function($string) { $string }"
)
))
),
for $f at $pos in $filters
let $key := $f/@xml:id/string()
return
Expand Down Expand Up @@ -1054,7 +1068,7 @@ declare function edwebapi:get-objects(
(: } :)
(: catch * { error(xs:QName("edwebapi:get-objects-001"), "Can't load objects. data-collection: " :)
(: ||$data-collection||", collection: "||$collection||", root: "||$root) :)
}
(: } :)
(: TODO: Hack for exist-db 4.6.1 This can probably be solved more elegantly :)
(:~ util:eval("collection('" || $collection || "')//" || $xpath) ~:)
};
Expand Down
2 changes: 1 addition & 1 deletion expath-pkg.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<package xmlns="http://expath.org/ns/pkg" name="http://www.bbaw.de/telota/software/ediarum/web/lib" abbrev="edweb" version="1.18.2" spec="1.0">
<package xmlns="http://expath.org/ns/pkg" name="http://www.bbaw.de/telota/software/ediarum/web/lib" abbrev="edweb" version="1.18.3" spec="1.0">
<title>ediarum.web</title>
<dependency package="http://www.functx.com"/>
<xquery>
Expand Down

0 comments on commit 8f1612b

Please sign in to comment.