Mercurial > dive4elements > river
comparison flys-artifacts/doc/conf/meta-data.xml @ 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 | 68beaa827751 |
| children | 2ca035dbc838 |
comparison
equal
deleted
inserted
replaced
| 3626:d3e3a7aaeddf | 3627:096598c3bd30 |
|---|---|
| 626 <dc:call-macro name="basedata_2_fixations"/> | 626 <dc:call-macro name="basedata_2_fixations"/> |
| 627 <dc:call-macro name="basedata_3_officials"/> | 627 <dc:call-macro name="basedata_3_officials"/> |
| 628 <dc:call-macro name="basedata_4_heightmarks-points"/> | 628 <dc:call-macro name="basedata_4_heightmarks-points"/> |
| 629 <dc:call-macro name="basedata_5_flood-protections"/> | 629 <dc:call-macro name="basedata_5_flood-protections"/> |
| 630 </dc:if> | 630 </dc:if> |
| 631 <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"> | 631 <!--dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"> |
| 632 <dc:call-macro name="basedata_0_wq"/> | 632 <dc:call-macro name="basedata_0_wq"/> |
| 633 <dc:call-macro name="basedata_4_heightmarks-wq"/> | 633 <dc:call-macro name="basedata_4_heightmarks-wq"/> |
| 634 </dc:if> | 634 </dc:if--> |
| 635 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))"> | 635 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))"> |
| 636 <dc:call-macro name="basedata_0"/> | 636 <dc:call-macro name="basedata_0"/> |
| 637 <dc:call-macro name="basedata_1_additionals"/> | 637 <dc:call-macro name="basedata_1_additionals"/> |
| 638 <dc:comment comment=" FIXATIONS ---------------------------"/> | 638 <dc:comment comment=" FIXATIONS ---------------------------"/> |
| 639 <dc:call-macro name="basedata_2_fixations"/> | 639 <dc:call-macro name="basedata_2_fixations"/> |
| 752 | 752 |
| 753 <dc:call-macro name="basedata_1_additionals"/> | 753 <dc:call-macro name="basedata_1_additionals"/> |
| 754 | 754 |
| 755 <!-- former flood-water-marks --> | 755 <!-- former flood-water-marks --> |
| 756 <dc:call-macro name="basedata_4_heightmarks-points"/> | 756 <dc:call-macro name="basedata_4_heightmarks-points"/> |
| 757 </dc:if> | |
| 758 <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"><!-- or (dc:contains($artifact-outs, 'discharge_curve'))"--> | |
| 759 <!-- && parameter contains recommended/ation --> | |
| 760 <computed_discharge_curve> | 757 <computed_discharge_curve> |
| 761 <dc:call-macro name="mainvalues"/> | 758 <dc:call-macro name="mainvalues"/> |
| 762 </computed_discharge_curve> | 759 </computed_discharge_curve> |
| 763 <dc:call-macro name="basedata_2_fixations_wst"/> | |
| 764 </dc:if> | 760 </dc:if> |
| 765 | 761 |
| 766 <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> | 762 <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> |
| 767 <dc:choose> | 763 <dc:choose> |
| 768 <dc:when test="dc:contains($parameters, 'recommended')"> | 764 <dc:when test="dc:contains($parameters, 'recommended')"> |