comparison artifacts/doc/conf/meta-data.xml @ 9282:7efb27005d0d

Fixed: using description attribute (same as name) everywhere to avoid gwt error message.
author gernotbelger
date Fri, 20 Jul 2018 14:58:34 +0200
parents c2a0028bfa9f
children 77f24792d75f
comparison
equal deleted inserted replaced
9281:72b6388c252a 9282:7efb27005d0d
1452 <dc:macro name="basedata_4_macro"> 1452 <dc:macro name="basedata_4_macro">
1453 <dc:filter expr="$kind=4"> 1453 <dc:filter expr="$kind=4">
1454 <dc:if test="dc:has-result()"> 1454 <dc:if test="dc:has-result()">
1455 <heightmarks> 1455 <heightmarks>
1456 <dc:group expr="dc:replace($wst_description, 'HW-Marken/', '')"> 1456 <dc:group expr="dc:replace($wst_description, 'HW-Marken/', '')">
1457 <heightmark name="{dc:group-key()}"> 1457 <heightmark name="{dc:group-key()}" description="{dc:group-key()}">
1458 <dc:for-each> 1458 <dc:for-each>
1459 <dc:macro-body /> 1459 <dc:macro-body />
1460 </dc:for-each> 1460 </dc:for-each>
1461 </heightmark> 1461 </heightmark>
1462 </dc:group> 1462 </dc:group>
1487 <dc:macro name="basedata_5_macro"> 1487 <dc:macro name="basedata_5_macro">
1488 <dc:filter expr="$kind=5"> 1488 <dc:filter expr="$kind=5">
1489 <dc:if test="dc:has-result()"> 1489 <dc:if test="dc:has-result()">
1490 <flood_protections> 1490 <flood_protections>
1491 <dc:group expr="dc:replace($wst_description, 'HW-Schutzanlagen/', '')"> 1491 <dc:group expr="dc:replace($wst_description, 'HW-Schutzanlagen/', '')">
1492 <flood_protection name="{dc:group-key()}"> 1492 <flood_protection name="{dc:group-key()}" description="{dc:group-key()}">
1493 <dc:for-each> 1493 <dc:for-each>
1494 <dc:macro-body /> 1494 <dc:macro-body />
1495 </dc:for-each> 1495 </dc:for-each>
1496 </flood_protection> 1496 </flood_protection>
1497 </dc:group> 1497 </dc:group>
2201 ORDER BY dz.value 2201 ORDER BY dz.value
2202 </dc:statement> 2202 </dc:statement>
2203 <dc:if test="dc:has-result()"> 2203 <dc:if test="dc:has-result()">
2204 <flowvelocitymodel> 2204 <flowvelocitymodel>
2205 <dc:for-each> 2205 <dc:for-each>
2206 <measurement_value name="{$fvmd}" ids="{$fvmid}" factory="flowvelocitymodel" info="{$lowerQ} - {$upperQ}&lt;BR&gt; 2206 <measurement_value name="{$fvmd}" description="{$fvmd}" ids="{$fvmid}" factory="flowvelocitymodel" info="{$lowerQ} - {$upperQ}&lt;BR&gt;
2207 Pegel {$gauge}&lt;BR&gt; 2207 Pegel {$gauge}&lt;BR&gt;
2208 Q = {$q} m3/s" target_out="{$out}" /> 2208 Q = {$q} m3/s" target_out="{$out}" />
2209 </dc:for-each> 2209 </dc:for-each>
2210 </flowvelocitymodel> 2210 </flowvelocitymodel>
2211 </dc:if> 2211 </dc:if>
2221 FROM flow_velocity_measurements WHERE river_id = ${river_id} 2221 FROM flow_velocity_measurements WHERE river_id = ${river_id}
2222 </dc:statement> 2222 </dc:statement>
2223 <dc:if test="dc:has-result()"> 2223 <dc:if test="dc:has-result()">
2224 <flowvelocitymeasurement> 2224 <flowvelocitymeasurement>
2225 <dc:for-each> 2225 <dc:for-each>
2226 <flow_velocity_measurement name="{$fvmd}"> 2226 <flow_velocity_measurement name="{$fvmd}" description="{$fvmd}">
2227 <dc:context> 2227 <dc:context>
2228 <dc:statement> 2228 <dc:statement>
2229 SELECT id, description, station, datetime, v, w, q 2229 SELECT id, description, station, datetime, v, w, q
2230 FROM flow_velocity_measure_values 2230 FROM flow_velocity_measure_values
2231 WHERE measurements_id = ${fvmid} 2231 WHERE measurements_id = ${fvmid}
2232 AND station BETWEEN ${fromkm} AND ${tokm} 2232 AND station BETWEEN ${fromkm} AND ${tokm}
2233 </dc:statement> 2233 </dc:statement>
2234 <dc:for-each> 2234 <dc:for-each>
2235 <measurement_value name="{$description} - {$station} - {$datetime}" ids="{$id}" factory="flowvelocity" target_out="{$out}" /> 2235 <measurement_value name="{$description} - {$station} - {$datetime}" description="{$description} - {$station} - {$datetime}" ids="{$id}" factory="flowvelocity" target_out="{$out}" />
2236 </dc:for-each> 2236 </dc:for-each>
2237 </dc:context> 2237 </dc:context>
2238 </flow_velocity_measurement> 2238 </flow_velocity_measurement>
2239 </dc:for-each> 2239 </dc:for-each>
2240 </flowvelocitymeasurement> 2240 </flowvelocitymeasurement>
2258 max(station) AS to_station 2258 max(station) AS to_station
2259 FROM morphologic_width_values 2259 FROM morphologic_width_values
2260 WHERE morphologic_width_id = ${width_id} 2260 WHERE morphologic_width_id = ${width_id}
2261 </dc:statement> 2261 </dc:statement>
2262 <dc:for-each> 2262 <dc:for-each>
2263 <morphologic-width name="{$from_station} - {$to_station}" ids="{$width_id}" factory="morph-width" target_out="{$out}" /> 2263 <morphologic-width name="{$from_station} - {$to_station}" description="{$from_station} - {$to_station}" ids="{$width_id}" factory="morph-width" target_out="{$out}" />
2264 </dc:for-each> 2264 </dc:for-each>
2265 </dc:context> 2265 </dc:context>
2266 </dc:for-each> 2266 </dc:for-each>
2267 </morph_width> 2267 </morph_width>
2268 </dc:if> 2268 </dc:if>
3473 GROUP BY s.id 3473 GROUP BY s.id
3474 ORDER BY MIN(s.year_to) DESC 3474 ORDER BY MIN(s.year_to) DESC
3475 </dc:statement> 3475 </dc:statement>
3476 <dc:if test="dc:has-result()"> 3476 <dc:if test="dc:has-result()">
3477 <dc:for-each> 3477 <dc:for-each>
3478 <channelseries name="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}" /> 3478 <channelseries name="{$seriesname}" description="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}" />
3479 </dc:for-each> 3479 </dc:for-each>
3480 </dc:if> 3480 </dc:if>
3481 </dc:context> 3481 </dc:context>
3482 </dc:macro> 3482 </dc:macro>
3483 3483
3514 GROUP BY sc.tkh_id, sc.id 3514 GROUP BY sc.tkh_id, sc.id
3515 ORDER BY sc.id 3515 ORDER BY sc.id
3516 </dc:statement> 3516 </dc:statement>
3517 <dc:if test="dc:has-result()"> 3517 <dc:if test="dc:has-result()">
3518 <dc:group expr="$tkh_name"> 3518 <dc:group expr="$tkh_name">
3519 <tkhx name="{dc:group-key()}"> 3519 <tkhx name="{dc:group-key()}" description="{dc:group-key()}">
3520 <dc:for-each> 3520 <dc:for-each>
3521 <tkhcolumn name="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$info}" /> 3521 <tkhcolumn name="{$tkh_col_name}" description="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$info}" />
3522 </dc:for-each> 3522 </dc:for-each>
3523 </tkhx> 3523 </tkhx>
3524 </dc:group> 3524 </dc:group>
3525 </dc:if> 3525 </dc:if>
3526 </dc:context> 3526 </dc:context>
3558 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) 3558 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
3559 GROUP BY s.id 3559 GROUP BY s.id
3560 ORDER BY s.id 3560 ORDER BY s.id
3561 </dc:statement> 3561 </dc:statement>
3562 <dc:for-each> 3562 <dc:for-each>
3563 <depth_evol name="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}" /> 3563 <depth_evol name="{$depthevol_name}" description="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}" />
3564 </dc:for-each> 3564 </dc:for-each>
3565 </dc:context> 3565 </dc:context>
3566 </dc:macro> 3566 </dc:macro>
3567 3567
3568 <!-- flow depth imported from CSV-files for S-INFO --> 3568 <!-- flow depth imported from CSV-files for S-INFO -->
3589 </dc:statement> 3589 </dc:statement>
3590 <dc:if test="dc:has-result()"> 3590 <dc:if test="dc:has-result()">
3591 <dc:group expr="$flowdepth_name"> 3591 <dc:group expr="$flowdepth_name">
3592 <sinfo_predefined_flowdepth> 3592 <sinfo_predefined_flowdepth>
3593 <dc:for-each> 3593 <dc:for-each>
3594 <flowdepthcolumn name="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}" /> 3594 <flowdepthcolumn name="{$flowdepth_col_name}" description="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}" />
3595 </dc:for-each> 3595 </dc:for-each>
3596 </sinfo_predefined_flowdepth> 3596 </sinfo_predefined_flowdepth>
3597 </dc:group> 3597 </dc:group>
3598 </dc:if> 3598 </dc:if>
3599 </dc:context> 3599 </dc:context>
3617 GROUP BY s.id 3617 GROUP BY s.id
3618 ORDER BY MIN(s.filename) DESC 3618 ORDER BY MIN(s.filename) DESC
3619 </dc:statement> 3619 </dc:statement>
3620 <dc:if test="dc:has-result()"> 3620 <dc:if test="dc:has-result()">
3621 <dc:for-each> 3621 <dc:for-each>
3622 <infrastructureseries name="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}" /> 3622 <infrastructureseries name="{$seriesname}" description="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}" />
3623 </dc:for-each> 3623 </dc:for-each>
3624 </dc:if> 3624 </dc:if>
3625 </dc:context> 3625 </dc:context>
3626 </dc:macro> 3626 </dc:macro>
3627 3627
3640 GROUP BY s.id 3640 GROUP BY s.id
3641 ORDER BY MIN(s.year) 3641 ORDER BY MIN(s.year)
3642 </dc:statement> 3642 </dc:statement>
3643 <dc:if test="dc:has-result()"> 3643 <dc:if test="dc:has-result()">
3644 <dc:for-each> 3644 <dc:for-each>
3645 <collisionseries name="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}" /> 3645 <collisionseries name="{$seriesname}" description="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}" />
3646 </dc:for-each> 3646 </dc:for-each>
3647 </dc:if> 3647 </dc:if>
3648 </dc:context> 3648 </dc:context>
3649 </dc:macro> 3649 </dc:macro>
3650 3650

http://dive4elements.wald.intevation.org