Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 7491:deaf6e848635
issue1571: Hav eown folder in dc for vollmer curves.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Fri, 01 Nov 2013 11:13:38 +0100 |
parents | 2803a70177c2 |
children | 4ad8f335d39b |
comparison
equal
deleted
inserted
replaced
7490:5775d14b3db2 | 7491:deaf6e848635 |
---|---|
564 </waterlevels_ls> | 564 </waterlevels_ls> |
565 </dc:if> | 565 </dc:if> |
566 </dc:filter> | 566 </dc:filter> |
567 </dc:macro> | 567 </dc:macro> |
568 | 568 |
569 <dc:macro name="longitudinal-section-fix"> | 569 <dc:macro name="longitudinal-section-fix-common"> |
570 <dc:filter expr="$out_name = 'fix_longitudinal_section_curve' and | 570 </dc:macro> |
571 (starts-with($facet_name, 'fix_deviation_ls') or | 571 |
572 starts-with($facet_name, 'fix_sector_average_ls') or | 572 <dc:macro name="longitudinal-section-fix-vollmer"> |
573 starts-with($facet_name, 'fix_analysis_events_ls') or | 573 <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and |
574 starts-with($facet_name, 'fix_reference_events_ls')) or | |
575 ($a_state = 'state.fix.vollmer.compute' and | |
576 ($facet_name = 'longitudinal_section.w' or | 574 ($facet_name = 'longitudinal_section.w' or |
577 $facet_name = 'longitudinal_section.q')) | 575 $facet_name = 'longitudinal_section.q') |
578 "> | 576 "> |
579 <dc:if test="dc:has-result()"> | 577 <dc:if test="dc:has-result()"> |
580 <waterlevels_fix> | 578 <waterlevels_fix_vollmer> |
581 <dc:call-macro name="collection-group"> | 579 <dc:call-macro name="collection-group"> |
582 <waterlevels description="{dc:group-key()}"> | 580 <waterlevels description="{dc:group-key()}"> |
583 <dc:for-each> | 581 <dc:for-each> |
584 <dc:element name="${facet_name}"> | 582 <dc:element name="${facet_name}"> |
585 <dc:attribute name="description" value="${facet_description}"/> | 583 <dc:attribute name="description" value="${facet_description}"/> |
586 <dc:attribute name="ids" value="${facet_num}"/> | 584 <dc:attribute name="ids" value="${facet_num}"/> |
587 <dc:attribute name="factory" value="fixanalysis"/> | 585 <dc:attribute name="factory" value="fixanalysis"/> |
588 <dc:attribute name="target_out" value="${out}"/> | 586 <dc:attribute name="target_out" value="${out}"/> |
589 <dc:attribute name="artifact-id" value="${a_gid}"/> | 587 <dc:attribute name="artifact-id" value="${a_gid}"/> |
590 <dc:choose> | 588 <dc:attribute name="out" value="longitudinal_section"/> |
591 <dc:when test="$a_state = 'state.fix.vollmer.compute'"> | 589 </dc:element> |
592 <dc:attribute name="out" value="longitudinal_section"/> | 590 </dc:for-each> |
593 </dc:when> | 591 </waterlevels> |
594 <dc:otherwise> | 592 </dc:call-macro> |
595 <dc:attribute name="out" value="fix_longitudinal_section_curve"/> | 593 </waterlevels_fix_vollmer> |
596 </dc:otherwise> | 594 </dc:if> |
597 </dc:choose> | 595 </dc:filter> |
596 </dc:macro> | |
597 | |
598 <dc:macro name="longitudinal-section-fix"> | |
599 <dc:filter expr="$out_name = 'fix_longitudinal_section_curve' and | |
600 (starts-with($facet_name, 'fix_deviation_ls') or | |
601 starts-with($facet_name, 'fix_sector_average_ls') or | |
602 starts-with($facet_name, 'fix_analysis_events_ls') or | |
603 starts-with($facet_name, 'fix_reference_events_ls')) | |
604 "> | |
605 <dc:if test="dc:has-result()"> | |
606 <waterlevels_fix> | |
607 <dc:call-macro name="collection-group"> | |
608 <waterlevels description="{dc:group-key()}"> | |
609 <dc:for-each> | |
610 <dc:element name="${facet_name}"> | |
611 <dc:attribute name="description" value="${facet_description}"/> | |
612 <dc:attribute name="ids" value="${facet_num}"/> | |
613 <dc:attribute name="factory" value="fixanalysis"/> | |
614 <dc:attribute name="target_out" value="${out}"/> | |
615 <dc:attribute name="artifact-id" value="${a_gid}"/> | |
616 <dc:attribute name="out" value="fix_longitudinal_section_curve"/> | |
598 </dc:element> | 617 </dc:element> |
599 </dc:for-each> | 618 </dc:for-each> |
600 </waterlevels> | 619 </waterlevels> |
601 </dc:call-macro> | 620 </dc:call-macro> |
602 </waterlevels_fix> | 621 </waterlevels_fix> |
1240 <dc:comment> WINFO/DIFF/FIX </dc:comment> | 1259 <dc:comment> WINFO/DIFF/FIX </dc:comment> |
1241 <dc:call-macro name="longitudinal"/> | 1260 <dc:call-macro name="longitudinal"/> |
1242 <dc:call-macro name="differences"/> | 1261 <dc:call-macro name="differences"/> |
1243 <dc:call-macro name="waterlevels-discharge"/> | 1262 <dc:call-macro name="waterlevels-discharge"/> |
1244 <dc:call-macro name="longitudinal-section-fix"/> | 1263 <dc:call-macro name="longitudinal-section-fix"/> |
1264 <dc:call-macro name="longitudinal-section-fix-vollmer"/> | |
1245 <dc:comment> MINFO </dc:comment> | 1265 <dc:comment> MINFO </dc:comment> |
1246 <dc:call-macro name="bedheight_differences"/> | 1266 <dc:call-macro name="bedheight_differences"/> |
1247 <dc:call-macro name="bedquality"/> | 1267 <dc:call-macro name="bedquality"/> |
1248 <dc:call-macro name="flow-velocity"/> | 1268 <dc:call-macro name="flow-velocity"/> |
1249 <dc:call-macro name="sediment-load"/> | 1269 <dc:call-macro name="sediment-load"/> |