Mercurial > dive4elements > river
changeset 3627:096598c3bd30
fix issue817, removed double entries from dc conf.
flys-artifacts/trunk@5325 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Fri, 31 Aug 2012 11:11:17 +0000 |
parents | d3e3a7aaeddf |
children | 7467b091fb8e |
files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml |
diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Aug 30 15:16:49 2012 +0000 +++ b/flys-artifacts/ChangeLog Fri Aug 31 11:11:17 2012 +0000 @@ -1,3 +1,9 @@ +2012-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Fix issue817 (double datacage entries). + + * doc/conf/meta-data.xml: removed double entries. + 2012-08-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> issue729, default line labels for waterlines in cross sections.
--- a/flys-artifacts/doc/conf/meta-data.xml Thu Aug 30 15:16:49 2012 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Fri Aug 31 11:11:17 2012 +0000 @@ -628,10 +628,10 @@ <dc:call-macro name="basedata_4_heightmarks-points"/> <dc:call-macro name="basedata_5_flood-protections"/> </dc:if> - <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"> + <!--dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"> <dc:call-macro name="basedata_0_wq"/> <dc:call-macro name="basedata_4_heightmarks-wq"/> - </dc:if> + </dc:if--> <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))"> <dc:call-macro name="basedata_0"/> <dc:call-macro name="basedata_1_additionals"/> @@ -754,13 +754,9 @@ <!-- former flood-water-marks --> <dc:call-macro name="basedata_4_heightmarks-points"/> - </dc:if> - <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"><!-- or (dc:contains($artifact-outs, 'discharge_curve'))"--> - <!-- && parameter contains recommended/ation --> <computed_discharge_curve> <dc:call-macro name="mainvalues"/> </computed_discharge_curve> - <dc:call-macro name="basedata_2_fixations_wst"/> </dc:if> <dc:if test="dc:contains($artifact-outs, 'duration_curve')">