Mercurial > dive4elements > river
comparison flys-artifacts/doc/conf/meta-data.xml @ 1865:ba6659083fa0
Revert/apply accidental/corrected commit.
flys-artifacts/trunk@3214 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Thu, 10 Nov 2011 11:21:20 +0000 |
parents | 7fc87a67e6f7 |
children | 9793a67d7998 |
comparison
equal
deleted
inserted
replaced
1864:9da663b7a865 | 1865:ba6659083fa0 |
---|---|
81 <mainvalue> | 81 <mainvalue> |
82 <dc:attribute name="factory" value="mainvalue"/> | 82 <dc:attribute name="factory" value="mainvalue"/> |
83 <dc:attribute name="ids" value="${river_id}"/> | 83 <dc:attribute name="ids" value="${river_id}"/> |
84 </mainvalue> | 84 </mainvalue> |
85 </dc:macro> | 85 </dc:macro> |
86 | |
87 | |
88 <dc:macro name="annotations"> | |
89 <annotation> | |
90 <dc:attribute name="factory" value="annotations"/> | |
91 <dc:attribute name="ids" value="${river_id}"/> | |
92 </annotation> | |
93 </dc:macro> | |
94 | |
86 <river> | 95 <river> |
87 <dc:attribute name="name" value="${river_name}"/> | 96 <dc:attribute name="name" value="${river_name}"/> |
88 <dc:if test="dc:contains($artifact-outs, 'w_differences')"> | 97 <dc:if test="dc:contains($artifact-outs, 'w_differences')"> |
89 <annotation> | 98 <annotation> |
90 <dc:attribute name="factory" value="annotations"/> | 99 <dc:attribute name="factory" value="annotations"/> |
91 <dc:attribute name="ids" value="${river_id}"/> | 100 <dc:attribute name="ids" value="${river_id}"/> |
92 </annotation> | 101 </annotation> |
93 </dc:if> | 102 </dc:if> |
103 | |
104 <dc:choose> | |
105 <dc:when test="dc:contains($parameters, 'recommended')"> | |
106 <dc:comment> | |
107 Recommendations. | |
108 </dc:comment> | |
109 <dc:if test="dc:contains($artifact-outs, 'w_differences') or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))"> | |
110 <dc:call-macro name="annotations"/> | |
111 </dc:if> | |
112 </dc:when> | |
113 <dc:otherwise> | |
114 </dc:otherwise> | |
115 </dc:choose> | |
94 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))"> | 116 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))"> |
95 <dc:choose> | 117 <dc:choose> |
96 <dc:when test="dc:contains($parameters, 'recommended')"> | 118 <dc:when test="dc:contains($parameters, 'recommended')"> |
97 </dc:when> | 119 </dc:when> |
98 <dc:otherwise> | 120 <dc:otherwise> |
440 <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> | 462 <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> |
441 <dc:call-macro name="mainvalues"/> | 463 <dc:call-macro name="mainvalues"/> |
442 </dc:if> | 464 </dc:if> |
443 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')"> | 465 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')"> |
444 <longitudinal-section> | 466 <longitudinal-section> |
445 <dc:call-macro name="longitudinal_section-recommended"/> | 467 <dc:call-macro name="annotations"/> |
446 </longitudinal-section> | 468 </longitudinal-section> |
447 <dc:macro name="longitudinal_section-recommended"> | |
448 <annotation> | |
449 <dc:attribute name="factory" value="annotations"/> | |
450 <dc:attribute name="ids" value="${river_id}"/> | |
451 </annotation> | |
452 </dc:macro> | |
453 </dc:if> | 469 </dc:if> |
454 <dc:if test="dc:contains($artifact-outs, 'floodmap')"> | 470 <dc:if test="dc:contains($artifact-outs, 'floodmap')"> |
455 <floodmap> | 471 <floodmap> |
456 <dc:choose> | 472 <dc:choose> |
457 <dc:when test="dc:contains($parameters, 'recommended')"> | 473 <dc:when test="dc:contains($parameters, 'recommended')"> |