Mercurial > dive4elements > river
changeset 1760:424e26041564
Configured datacage to hand out id of artifact that can produce the w_diff.
flys-artifacts/trunk@3073 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 25 Oct 2011 13:08:31 +0000 |
| parents | c51089a84d13 |
| children | 577e8843ceeb |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Tue Oct 25 12:43:58 2011 +0000 +++ b/flys-artifacts/ChangeLog Tue Oct 25 13:08:31 2011 +0000 @@ -1,6 +1,11 @@ 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> - * ./src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: + * doc/conf/meta-data.xml: Configured to include correct id to + clone artifact that produces w-diff. + +2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: Revert correct behaviour of Annotations (the small axis tick shall always be drawn). Minor refactoring.
--- a/flys-artifacts/doc/conf/meta-data.xml Tue Oct 25 12:43:58 2011 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Tue Oct 25 13:08:31 2011 +0000 @@ -397,7 +397,11 @@ <dc:choose> <dc:when test="dc:contains($artifact-outs, 'longitudinal_section')"> <dc:context> - <dc:statement> + <dc:statement> + SELECT a.gid as aid, f.id AS fid, f.name AS facet_name, f.num AS facet_num, f.description as facet_description + FROM outs as o, facets as f, artifacts as a + WHERE f.name = 'w_differences' and f.out_id = o.id and o.artifact_id = a.id; + </dc:statement> SELECT name AS facet_name, num as facet_num, description AS facet_description FROM facets WHERE name = 'w_differences' @@ -407,9 +411,9 @@ <differences> <dc:element name="${facet_name}"> <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> <dc:attribute name="factory" value="winfo"/> - <!--dc:attribute name="artifact-id" value="${a_gid}"/--> + <dc:attribute name="artifact-id" value="${aid}"/> + <dc:attribute name="ids" value="${aid}"/> <dc:attribute name="out" value="w_differences"/> </dc:element> </differences>