Mercurial > dive4elements > river
comparison flys-artifacts/doc/conf/meta-data.xml @ 5772:c0d0b9fd1aa8
issue1276: Re-enable fixation autorecommend at discharge_curves.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 19 Apr 2013 09:22:44 +0200 |
| parents | d7d023b2c684 |
| children | 53cff50918b1 |
comparison
equal
deleted
inserted
replaced
| 5771:0677aff0ff15 | 5772:c0d0b9fd1aa8 |
|---|---|
| 672 <dc:call-macro name="cross_sections"/> | 672 <dc:call-macro name="cross_sections"/> |
| 673 <dc:call-macro name="hyks"/> | 673 <dc:call-macro name="hyks"/> |
| 674 </dc:if> | 674 </dc:if> |
| 675 <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"> | 675 <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"> |
| 676 <dc:call-macro name="mainvalues"/> | 676 <dc:call-macro name="mainvalues"/> |
| 677 <dc:call-macro name="basedata_2_fixations_wst"/> | |
| 677 </dc:if> | 678 </dc:if> |
| 678 <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> | 679 <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> |
| 679 <dc:call-macro name="mainvalues"/> | 680 <dc:call-macro name="mainvalues"/> |
| 680 </dc:if> | 681 </dc:if> |
| 681 <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> | 682 <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> |
| 804 | 805 |
| 805 <!-- flood protection --> | 806 <!-- flood protection --> |
| 806 <dc:call-macro name="basedata_5_flood-protections"/> | 807 <dc:call-macro name="basedata_5_flood-protections"/> |
| 807 | 808 |
| 808 </dc:if> | 809 </dc:if> |
| 809 | |
| 810 <dc:comment><!-- XXX: Why is this taken out? | |
| 811 <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve') and (dc:contains($parameters, 'recommended'))"> | |
| 812 <dc:call-macro name="basedata_2_fixations_wst"/> | |
| 813 </dc:if> | |
| 814 --> | |
| 815 </dc:comment> | |
| 816 | 810 |
| 817 <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve') and not (dc:contains($parameters, 'recommended'))"> | 811 <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve') and not (dc:contains($parameters, 'recommended'))"> |
| 818 <discharge_table_nn> | 812 <discharge_table_nn> |
| 819 <discharge_table_gauge> | 813 <discharge_table_gauge> |
| 820 <dc:context> | 814 <dc:context> |