Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 7365:4e055f92a8b3
issue1473: Let vollmer curves appear under 'former calc/waterlevels from fix.'.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 17 Oct 2013 07:42:31 +0200 |
| parents | eb226d788ccf |
| children | cfac25ad6b3e |
comparison
equal
deleted
inserted
replaced
| 7364:78862ae87121 | 7365:4e055f92a8b3 |
|---|---|
| 566 <dc:macro name="longitudinal-section-fix"> | 566 <dc:macro name="longitudinal-section-fix"> |
| 567 <dc:filter expr="$out_name = 'fix_longitudinal_section_curve' and | 567 <dc:filter expr="$out_name = 'fix_longitudinal_section_curve' and |
| 568 (starts-with($facet_name, 'fix_deviation_ls') or | 568 (starts-with($facet_name, 'fix_deviation_ls') or |
| 569 starts-with($facet_name, 'fix_sector_average_ls') or | 569 starts-with($facet_name, 'fix_sector_average_ls') or |
| 570 starts-with($facet_name, 'fix_analysis_events_ls') or | 570 starts-with($facet_name, 'fix_analysis_events_ls') or |
| 571 starts-with($facet_name, 'fix_reference_events_ls'))"> | 571 starts-with($facet_name, 'fix_reference_events_ls')) or |
| 572 ($a_state = 'state.fix.vollmer.compute' and | |
| 573 ($facet_name = 'longitudinal_section.w' or | |
| 574 $facet_name = 'longitudinal_section.q')) | |
| 575 "> | |
| 572 <dc:if test="dc:has-result()"> | 576 <dc:if test="dc:has-result()"> |
| 573 <waterlevels_fix> | 577 <waterlevels_fix> |
| 574 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)"> | 578 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)"> |
| 575 <waterlevels description="{dc:group-key()}"> | 579 <waterlevels description="{dc:group-key()}"> |
| 576 <dc:for-each> | 580 <dc:for-each> |
| 578 <dc:attribute name="description" value="${facet_description}"/> | 582 <dc:attribute name="description" value="${facet_description}"/> |
| 579 <dc:attribute name="ids" value="${facet_num}"/> | 583 <dc:attribute name="ids" value="${facet_num}"/> |
| 580 <dc:attribute name="factory" value="fixanalysis"/> | 584 <dc:attribute name="factory" value="fixanalysis"/> |
| 581 <dc:attribute name="target_out" value="${out}"/> | 585 <dc:attribute name="target_out" value="${out}"/> |
| 582 <dc:attribute name="artifact-id" value="${a_gid}"/> | 586 <dc:attribute name="artifact-id" value="${a_gid}"/> |
| 583 <dc:attribute name="out" value="fix_longitudinal_section_curve"/> | 587 <dc:choose> |
| 588 <dc:when test="$a_state = 'state.fix.vollmer.compute'"> | |
| 589 <dc:attribute name="out" value="longitudinal_section"/> | |
| 590 </dc:when> | |
| 591 <dc:otherwise> | |
| 592 <dc:attribute name="out" value="fix_longitudinal_section_curve"/> | |
| 593 </dc:otherwise> | |
| 594 </dc:choose> | |
| 584 </dc:element> | 595 </dc:element> |
| 585 </dc:for-each> | 596 </dc:for-each> |
| 586 </waterlevels> | 597 </waterlevels> |
| 587 </dc:group> | 598 </dc:group> |
| 588 </waterlevels_fix> | 599 </waterlevels_fix> |