Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 9088:7e60457f9d26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed order of SINFO results and fixed data in datacage. Some minor name changes.
author gernotbelger
date Fri, 25 May 2018 10:49:23 +0200
parents 89c1bb914f4e
children e68d4a10c308
comparison
equal deleted inserted replaced
9087:fb976ea01463 9088:7e60457f9d26
1615 <dc:call-macro name="flow_velocity_models"/> 1615 <dc:call-macro name="flow_velocity_models"/>
1616 </flow_velocities> 1616 </flow_velocities>
1617 </minfo> 1617 </minfo>
1618 1618
1619 <sinfo> 1619 <sinfo>
1620 <sinfo_predefined_flowdepths>
1621 <dc:call-macro name="sinfo_predefined_flowdepth-m"/>
1622 </sinfo_predefined_flowdepths>
1623
1624 <!-- Auf Wunsch BfG herausgenommen; erscheinen ebenfalls unter 'zusätzliche Längsschnitte'
1620 <sinfo_additional_ls> 1625 <sinfo_additional_ls>
1621 <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/> 1626 <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/>
1622 <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/> 1627 <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/>
1623 </sinfo_additional_ls> 1628 </sinfo_additional_ls>
1624 1629 -->
1630
1631 <!-- TODO: soll nach MINFO -->
1625 <bed_heights_minmax> 1632 <bed_heights_minmax>
1626 <dc:call-macro name="minfo-heights-max"/> 1633 <dc:call-macro name="minfo-heights-max"/>
1627 <dc:call-macro name="minfo-heights-min"/> 1634 <dc:call-macro name="minfo-heights-min"/>
1628 </bed_heights_minmax> 1635 </bed_heights_minmax>
1629 1636
1630 <sinfo_predefined_tkh> 1637 <sinfo_predefined_tkh>
1631 <dc:call-macro name="sinfo_predefined_tkh-berechnung"/> 1638 <dc:call-macro name="sinfo_predefined_tkh-berechnung"/>
1632 <dc:call-macro name="sinfo_predefined_tkh-messung"/> 1639 <dc:call-macro name="sinfo_predefined_tkh-messung"/>
1633 </sinfo_predefined_tkh> 1640 </sinfo_predefined_tkh>
1634 1641
1635 <sinfo_predefined_depthevol> 1642 <sinfo_predefined_depthevol>
1636 <dc:call-macro name="sinfo_predefined_depthevol-aktuell"/> 1643 <dc:call-macro name="sinfo_predefined_depthevol-aktuell"/>
1637 <dc:call-macro name="sinfo_predefined_depthevol-etappe"/> 1644 <dc:call-macro name="sinfo_predefined_depthevol-etappe"/>
1638 </sinfo_predefined_depthevol> 1645 </sinfo_predefined_depthevol>
1639 1646
1640 <sinfo_predefined_flowdepth>
1641 <dc:call-macro name="sinfo_predefined_flowdepth-m"/>
1642 </sinfo_predefined_flowdepth>
1643 </sinfo> 1647 </sinfo>
1644 </dc:macro> 1648 </dc:macro>
1645 1649
1646 <dc:macro name="longitudinal-section-user-prototype"> 1650 <dc:macro name="longitudinal-section-user-prototype">
1651 <dc:comment> SINFO </dc:comment>
1652 <dc:call-macro name="sinfo_flowdepths"/>
1653 <dc:call-macro name="sinfo_flowdepths_minmax"/>
1654 <dc:call-macro name="sinfo_flow_depth_development"/>
1655 <dc:call-macro name="sinfo_tkh"/>
1656
1647 <dc:comment> WINFO/DIFF/FIX </dc:comment> 1657 <dc:comment> WINFO/DIFF/FIX </dc:comment>
1648 <dc:call-macro name="longitudinal"/> 1658 <dc:call-macro name="longitudinal"/>
1649 <dc:call-macro name="differences"/> 1659 <dc:call-macro name="differences"/>
1650 <dc:call-macro name="waterlevels-discharge"/> 1660 <dc:call-macro name="waterlevels-discharge"/>
1651 <dc:call-macro name="longitudinal-section-fix"/> 1661 <dc:call-macro name="longitudinal-section-fix"/>
1652 <dc:call-macro name="longitudinal-section-fix-vollmer"/> 1662 <dc:call-macro name="longitudinal-section-fix-vollmer"/>
1663
1653 <dc:comment> MINFO </dc:comment> 1664 <dc:comment> MINFO </dc:comment>
1654 <dc:call-macro name="middle_bedheights"/> 1665 <dc:call-macro name="middle_bedheights"/>
1655 <dc:call-macro name="bedheight_differences"/> 1666 <dc:call-macro name="bedheight_differences"/>
1656 <dc:call-macro name="bedquality"/> 1667 <dc:call-macro name="bedquality"/>
1657 <dc:call-macro name="flow-velocity"/> 1668 <dc:call-macro name="flow-velocity"/>
1658 <dc:call-macro name="sediment-load"/> 1669 <dc:call-macro name="sediment-load"/>
1659
1660 <dc:comment> SINFO </dc:comment>
1661 <dc:call-macro name="sinfo_flowdepths"/>
1662 <dc:call-macro name="sinfo_flowdepths_minmax"/>
1663 <dc:call-macro name="sinfo_flow_depth_development"/>
1664 <dc:call-macro name="sinfo_tkh"/>
1665
1666 <dc:call-macro name="sinfo_waterlevel_difference"/>
1667 <dc:call-macro name="sinfo_bedheight_difference"/>
1668
1669 <dc:call-macro name="sinfo_tkh_velocity"/>
1670 <dc:call-macro name="sinfo_tkh_d50"/>
1671 <dc:call-macro name="sinfo_tkh_tau"/>
1672 </dc:macro> 1670 </dc:macro>
1673 1671
1674 <!-- porosities --> 1672 <!-- porosities -->
1675 <dc:macro name="porosities"> 1673 <dc:macro name="porosities">
1676 <porosities> 1674 <porosities>
3251 </dc:choose> 3249 </dc:choose>
3252 <dc:macro-body/> 3250 <dc:macro-body/>
3253 </dc:macro> 3251 </dc:macro>
3254 3252
3255 <dc:macro name="sinfo_flowdepths"> 3253 <dc:macro name="sinfo_flowdepths">
3256 <dc:filter expr="( $facet_name = 'sinfo_facet_flow_depth' or 3254 <dc:filter expr="$a_state = 'state.sinfo.flow_depth' and
3257 $facet_name = 'sinfo_facet_flow_depth.filtered' or 3255 ( $facet_name = 'sinfo_facet_flow_depth' or $facet_name = 'sinfo_facet_flow_depth.filtered' or
3258 $facet_name = 'sinfo_facet_flow_depth_with_tkh' or 3256 $facet_name = 'sinfo_facet_flow_depth_with_tkh' or $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or
3259 $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or 3257 $facet_name = 'sinfo_facet_tkh' )">
3260 $facet_name = 'sinfo_facet_flow_depth_current' or
3261 $facet_name = 'sinfo_facet_flow_depth_current.filtered' or
3262 $facet_name = 'sinfo_facet_flow_depth_historical' or
3263 $facet_name = 'sinfo_facet_flow_depth_historical.filtered' )">
3264 <dc:if test="dc:has-result()"> 3258 <dc:if test="dc:has-result()">
3265 <sinfo_flow_depths> 3259 <sinfo_flow_depths>
3266 <dc:call-macro name="collection-group"> 3260 <dc:call-macro name="collection-group">
3267 <sinfo_flow_depth description="{dc:group-key()}"> 3261 <sinfo_flow_depth description="{dc:group-key()}">
3268 <dc:for-each> 3262 <dc:for-each>
3281 </dc:if> 3275 </dc:if>
3282 </dc:filter> 3276 </dc:filter>
3283 </dc:macro> 3277 </dc:macro>
3284 3278
3285 <dc:macro name="sinfo_flowdepths_minmax"> 3279 <dc:macro name="sinfo_flowdepths_minmax">
3286 <dc:filter expr="$facet_name = 'sinfo_facet_flow_depth_min' or 3280 <dc:filter expr="$a_state = 'state.sinfo.flow_depth_minmax' and
3287 $facet_name = 'sinfo_facet_flow_depth_min.filtered' or 3281 ( $facet_name = 'sinfo_facet_flow_depth_min' or $facet_name = 'sinfo_facet_flow_depth_min.filtered' or
3288 $facet_name = 'sinfo_facet_flow_depth_max' or 3282 $facet_name = 'sinfo_facet_flow_depth_max' or $facet_name = 'sinfo_facet_flow_depth_max.filtered' )">
3289 $facet_name = 'sinfo_facet_flow_depth_max.filtered'">
3290 <dc:if test="dc:has-result()"> 3283 <dc:if test="dc:has-result()">
3291 <sinfo_flow_depths_minmax> 3284 <sinfo_flow_depths_minmax>
3292 <dc:call-macro name="collection-group"> 3285 <dc:call-macro name="collection-group">
3293 <sinfo_flow_depth_minmax description="{dc:group-key()}"> 3286 <sinfo_flow_depth_minmax description="{dc:group-key()}">
3294 <dc:for-each> 3287 <dc:for-each>
3307 </dc:if> 3300 </dc:if>
3308 </dc:filter> 3301 </dc:filter>
3309 </dc:macro> 3302 </dc:macro>
3310 3303
3311 <dc:macro name="sinfo_flow_depth_development"> 3304 <dc:macro name="sinfo_flow_depth_development">
3312 <dc:filter expr="$facet_name = 'sinfo_facet_flow_depth_development' or 3305 <dc:filter expr="$a_state = 'state.sinfo.flow_depth_development' and
3313 $facet_name = 'sinfo_facet_flow_depth_development.filtered' or 3306 ( $facet_name = 'sinfo_facet_flow_depth_development' or $facet_name = 'sinfo_facet_flow_depth_development.filtered' or
3314 $facet_name = 'sinfo_facet_flow_depth_development_per_year' or 3307 $facet_name = 'sinfo_facet_flow_depth_development_per_year' or $facet_name = 'sinfo_facet_flow_depth_development_per_year.filtered' or
3315 $facet_name = 'sinfo_facet_flow_depth_development_per_year.filtered'"> 3308 $facet_name = 'sinfo_facet_flow_depth_current' or $facet_name = 'sinfo_facet_flow_depth_current.filtered' or
3309 $facet_name = 'sinfo_facet_flow_depth_historical' or $facet_name = 'sinfo_facet_flow_depth_historical.filtered' or
3310 $facet_name = 'sinfo_facet_waterlevel_difference' or $facet_name = 'sinfo_facet_waterlevel_difference.filtered' or
3311 $facet_name = 'sinfo_facet_bedheight_difference' or $facet_name = 'sinfo_facet_bedheight_difference.filtered' )">
3316 <dc:if test="dc:has-result()"> 3312 <dc:if test="dc:has-result()">
3317 <sinfo_flow_depth_developments> 3313 <sinfo_flow_depth_developments>
3318 <dc:call-macro name="collection-group"> 3314 <dc:call-macro name="collection-group">
3319 <sinfo_flow_depth_development description="{dc:group-key()}"> 3315 <sinfo_flow_depth_development description="{dc:group-key()}">
3320 <dc:for-each> 3316 <dc:for-each>
3332 </sinfo_flow_depth_developments> 3328 </sinfo_flow_depth_developments>
3333 </dc:if> 3329 </dc:if>
3334 </dc:filter> 3330 </dc:filter>
3335 </dc:macro> 3331 </dc:macro>
3336 3332
3333 <!--
3337 <dc:macro name="sinfo_waterlevel_difference"> 3334 <dc:macro name="sinfo_waterlevel_difference">
3338 <dc:filter expr="$facet_name = 'sinfo_facet_waterlevel_difference.filtered'"> 3335 <dc:filter expr="$facet_name = 'sinfo_facet_waterlevel_difference.filtered'">
3339 <dc:if test="dc:has-result()"> 3336 <dc:if test="dc:has-result()">
3340 <sinfo_waterlevel_differences> 3337 <sinfo_waterlevel_differences>
3341 <dc:call-macro name="collection-group"> 3338 <dc:call-macro name="collection-group">
3354 </dc:call-macro> 3351 </dc:call-macro>
3355 </sinfo_waterlevel_differences> 3352 </sinfo_waterlevel_differences>
3356 </dc:if> 3353 </dc:if>
3357 </dc:filter> 3354 </dc:filter>
3358 </dc:macro> 3355 </dc:macro>
3359 3356 -->
3357
3358 <!--
3360 <dc:macro name="sinfo_bedheight_difference"> 3359 <dc:macro name="sinfo_bedheight_difference">
3361 <dc:filter expr="$facet_name = 'sinfo_facet_bedheight_difference.filtered'"> 3360 <dc:filter expr="$facet_name = 'sinfo_facet_bedheight_difference.filtered'">
3362 <dc:if test="dc:has-result()"> 3361 <dc:if test="dc:has-result()">
3363 <sinfo_bedheight_differences> 3362 <sinfo_bedheight_differences>
3364 <dc:call-macro name="collection-group"> 3363 <dc:call-macro name="collection-group">
3377 </dc:call-macro> 3376 </dc:call-macro>
3378 </sinfo_bedheight_differences> 3377 </sinfo_bedheight_differences>
3379 </dc:if> 3378 </dc:if>
3380 </dc:filter> 3379 </dc:filter>
3381 </dc:macro> 3380 </dc:macro>
3381 -->
3382 3382
3383 <dc:macro name="sinfo_tkh"> 3383 <dc:macro name="sinfo_tkh">
3384 <dc:filter expr="$facet_name = 'sinfo_facet_tkh' or $facet_name = 'sinfo_facet_tkh'"> 3384 <dc:filter expr="$a_state = 'state.sinfo.transport_bodies_heights' and
3385 ( $facet_name = 'sinfo_facet_tkh' or
3386 $facet_name = 'sinfo_facet_flow_depth' or $facet_name = 'sinfo_facet_flow_depth.filtered' or
3387 $facet_name = 'sinfo_facet_velocity' or $facet_name = 'sinfo_facet_velocity.filtered' or
3388 $facet_name = 'sinfo_facet_tau' or $facet_name = 'sinfo_facet_tau.filtered' or
3389 $facet_name = 'sinfo_facet_d50' or $facet_name = 'sinfo_facet_d50.filtered' )">
3385 <dc:if test="dc:has-result()"> 3390 <dc:if test="dc:has-result()">
3386 <sinfo_tkhs> 3391 <sinfo_tkhs>
3387 <dc:call-macro name="collection-group"> 3392 <dc:call-macro name="collection-group">
3388 <sinfo_tkh description="{dc:group-key()}"> 3393 <sinfo_tkh description="{dc:group-key()}">
3389 <dc:for-each> 3394 <dc:for-each>
3401 </sinfo_tkhs> 3406 </sinfo_tkhs>
3402 </dc:if> 3407 </dc:if>
3403 </dc:filter> 3408 </dc:filter>
3404 </dc:macro> 3409 </dc:macro>
3405 3410
3406 <dc:macro name="sinfo_tkh_velocity">
3407 <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_velocity' )">
3408 <dc:if test="dc:has-result()">
3409 <sinfo_velocities>
3410 <dc:call-macro name="collection-group">
3411 <sinfo_velocity description="{dc:group-key()}">
3412 <dc:for-each>
3413 <dc:element name="${facet_name}">
3414 <dc:attribute name="factory" value="sinfo"/>
3415 <dc:attribute name="target_out" value="${out}"/>
3416 <dc:attribute name="description" value="${facet_description}"/>
3417 <dc:attribute name="ids" value="${facet_num}"/>
3418 <dc:attribute name="artifact-id" value="${a_gid}"/>
3419 <dc:attribute name="out" value="${out_name}"/>
3420 </dc:element>
3421 </dc:for-each>
3422 </sinfo_velocity>
3423 </dc:call-macro>
3424 </sinfo_velocities>
3425 </dc:if>
3426 </dc:filter>
3427 </dc:macro>
3428
3429 <dc:macro name="sinfo_tkh_d50">
3430 <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_d50' )">
3431 <dc:if test="dc:has-result()">
3432 <sinfo_bedqualities>
3433 <sinfo_d50s>
3434 <dc:call-macro name="collection-group">
3435 <sinfo_d50 description="{dc:group-key()}">
3436 <dc:for-each>
3437 <dc:element name="${facet_name}">
3438 <dc:attribute name="factory" value="sinfo"/>
3439 <dc:attribute name="target_out" value="${out}"/>
3440 <dc:attribute name="description" value="${facet_description}"/>
3441 <dc:attribute name="ids" value="${facet_num}"/>
3442 <dc:attribute name="artifact-id" value="${a_gid}"/>
3443 <dc:attribute name="out" value="${out_name}"/>
3444 </dc:element>
3445 </dc:for-each>
3446 </sinfo_d50>
3447 </dc:call-macro>
3448 </sinfo_d50s>
3449 </sinfo_bedqualities>
3450 </dc:if>
3451 </dc:filter>
3452 </dc:macro>
3453
3454 <dc:macro name="sinfo_tkh_tau">
3455 <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_tau' )">
3456 <dc:if test="dc:has-result()">
3457 <sinfo_taus>
3458 <dc:call-macro name="collection-group">
3459 <sinfo_tau description="{dc:group-key()}">
3460 <dc:for-each>
3461 <dc:element name="${facet_name}">
3462 <dc:attribute name="factory" value="sinfo"/>
3463 <dc:attribute name="target_out" value="${out}"/>
3464 <dc:attribute name="description" value="${facet_description}"/>
3465 <dc:attribute name="ids" value="${facet_num}"/>
3466 <dc:attribute name="artifact-id" value="${a_gid}"/>
3467 <dc:attribute name="out" value="${out_name}"/>
3468 </dc:element>
3469 </dc:for-each>
3470 </sinfo_tau>
3471 </dc:call-macro>
3472 </sinfo_taus>
3473 </dc:if>
3474 </dc:filter>
3475 </dc:macro>
3476
3477 <!-- tkh imported from CSV-files for S-INFO --> 3411 <!-- tkh imported from CSV-files for S-INFO -->
3478 <dc:macro name="sinfo_predefined_tkh-berechnung"> 3412 <dc:macro name="sinfo_predefined_tkh-berechnung">
3479 <predefined_tkh_berechnung> 3413 <predefined_tkh_berechnung>
3480 <dc:variable name="tkh_groupname" expr="'berechnung'"/> 3414 <dc:variable name="tkh_groupname" expr="'berechnung'"/>
3481 <dc:call-macro name="sinfo_predefined_tkh"/> 3415 <dc:call-macro name="sinfo_predefined_tkh"/>
3482 </predefined_tkh_berechnung> 3416 </predefined_tkh_berechnung>
3483 </dc:macro> 3417 </dc:macro>
3484 3418
3485 <dc:macro name="sinfo_predefined_tkh-messung"> 3419 <dc:macro name="sinfo_predefined_tkh-messung">
3486 <predefined_tkh_messung> 3420 <predefined_tkh_messung>
3487 <dc:variable name="tkh_groupname" expr="'messung'"/> 3421 <dc:variable name="tkh_groupname" expr="'messung'"/>
3488 <dc:call-macro name="sinfo_predefined_tkh"/> 3422 <dc:call-macro name="sinfo_predefined_tkh"/>
3489 </predefined_tkh_messung> 3423 </predefined_tkh_messung>
3490 </dc:macro> 3424 </dc:macro>
3491 3425
3492 <dc:macro name="sinfo_predefined_tkh"> 3426 <dc:macro name="sinfo_predefined_tkh">
3493 <dc:context> 3427 <dc:context>
3494 <dc:statement> 3428 <dc:statement>
3495 SELECT sc.tkh_id AS tkh_id, sc.id AS tkh_col_id, MIN(sc.name) AS tkh_col_name, 3429 SELECT sc.tkh_id AS tkh_id, sc.id AS tkh_col_id, MIN(sc.name) AS tkh_col_name,
3496 MIN(s.filename) AS tkh_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, 3430 MIN(s.filename) AS tkh_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
3497 MIN(s.filename) || '&lt;br /&gt;' 3431 MIN(s.filename) || '&lt;br /&gt;'
3498 || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;' 3432 || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
3499 || MIN(s.sounding_info) || '&lt;br /&gt;' 3433 || MIN(s.sounding_info) || '&lt;br /&gt;'
3500 || MIN(s.evaluation_by) AS info 3434 || MIN(s.evaluation_by) AS info
3501 FROM tkh_column sc INNER JOIN tkh s ON sc.tkh_id=s.id 3435 FROM tkh_column sc INNER JOIN tkh s ON sc.tkh_id=s.id
3502 INNER JOIN tkh_values v ON sc.id=v.tkh_column_id 3436 INNER JOIN tkh_values v ON sc.id=v.tkh_column_id
3503 WHERE (s.river_id=${river_id}) 3437 WHERE (s.river_id=${river_id})
3504 AND (lower(s.groupname)=${tkh_groupname}) 3438 AND (lower(s.groupname)=${tkh_groupname})
3505 GROUP BY sc.tkh_id, sc.id 3439 GROUP BY sc.tkh_id, sc.id
3506 ORDER BY sc.id 3440 ORDER BY sc.id
3507 </dc:statement> 3441 </dc:statement>
3522 <predefined_depthevol_aktuell> 3456 <predefined_depthevol_aktuell>
3523 <dc:variable name="depthevol_groupname" expr="'aktuell'"/> 3457 <dc:variable name="depthevol_groupname" expr="'aktuell'"/>
3524 <dc:call-macro name="sinfo_predefined_depthevol"/> 3458 <dc:call-macro name="sinfo_predefined_depthevol"/>
3525 </predefined_depthevol_aktuell> 3459 </predefined_depthevol_aktuell>
3526 </dc:macro> 3460 </dc:macro>
3527 3461
3528 <dc:macro name="sinfo_predefined_depthevol-etappe"> 3462 <dc:macro name="sinfo_predefined_depthevol-etappe">
3529 <predefined_depthevol_etappe> 3463 <predefined_depthevol_etappe>
3530 <dc:variable name="depthevol_groupname" expr="'etappe'"/> 3464 <dc:variable name="depthevol_groupname" expr="'etappe'"/>
3531 <dc:call-macro name="sinfo_predefined_depthevol"/> 3465 <dc:call-macro name="sinfo_predefined_depthevol"/>
3532 </predefined_depthevol_etappe> 3466 </predefined_depthevol_etappe>
3533 </dc:macro> 3467 </dc:macro>
3534 3468
3535 <dc:macro name="sinfo_predefined_depthevol"> 3469 <dc:macro name="sinfo_predefined_depthevol">
3536 <dc:context> 3470 <dc:context>
3537 <dc:statement> 3471 <dc:statement>
3538 SELECT s.id AS depthevol_id, MIN(s.filename) AS depthevol_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, 3472 SELECT s.id AS depthevol_id, MIN(s.filename) AS depthevol_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
3539 MIN(s.filename) || '&lt;br /&gt;' 3473 MIN(s.filename) || '&lt;br /&gt;'
3540 || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;' 3474 || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
3541 || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '&lt;br /&gt;' 3475 || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '&lt;br /&gt;'
3542 || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '&lt;br /&gt;' 3476 || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '&lt;br /&gt;'
3543 || MIN(s.old_glw) || ' - ' || MIN(s.curr_glw) AS info 3477 || MIN(s.old_glw) || ' - ' || MIN(s.curr_glw) AS info
3544 FROM depth_evolution s INNER JOIN depth_evolution_values v ON s.id=v.depth_evolution_id 3478 FROM depth_evolution s INNER JOIN depth_evolution_values v ON s.id=v.depth_evolution_id
3545 WHERE (s.river_id=${river_id}) 3479 WHERE (s.river_id=${river_id})
3546 AND (lower(s.groupname)=${depthevol_groupname}) 3480 AND (lower(s.groupname)=${depthevol_groupname})
3547 GROUP BY s.id 3481 GROUP BY s.id
3548 ORDER BY s.id 3482 ORDER BY s.id
3549 </dc:statement> 3483 </dc:statement>
3550 <dc:for-each> 3484 <dc:for-each>
3551 <depth_evol name="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}"/> 3485 <depth_evol name="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}"/>
3552 </dc:for-each> 3486 </dc:for-each>
3553 </dc:context> 3487 </dc:context>
3554 </dc:macro> 3488 </dc:macro>
3555 3489
3556 <!-- flow depth imported from CSV-files for S-INFO --> 3490 <!-- flow depth imported from CSV-files for S-INFO -->
3557 <dc:macro name="sinfo_predefined_flowdepth-m"> 3491 <dc:macro name="sinfo_predefined_flowdepth-m">
3558 <dc:call-macro name="sinfo_predefined_flowdepth-m1"/> 3492 <dc:call-macro name="sinfo_predefined_flowdepth-m1"/>
3559 </dc:macro> 3493 </dc:macro>
3560 3494
3561 <dc:macro name="sinfo_predefined_flowdepth-m1"> 3495 <dc:macro name="sinfo_predefined_flowdepth-m1">
3562 <dc:context> 3496 <dc:context>
3563 <dc:statement> 3497 <dc:statement>
3564 SELECT sc.flow_depth_id AS flowdepth_id, sc.id AS flowdepth_col_id, MIN(sc.name) AS flowdepth_col_name, 3498 SELECT sc.flow_depth_id AS flowdepth_id, sc.id AS flowdepth_col_id, MIN(sc.name) AS flowdepth_col_name,
3565 MIN(s.filename) AS flowdepth_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, 3499 MIN(s.filename) AS flowdepth_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
3566 MIN(s.filename) || '&lt;br /&gt;' 3500 MIN(s.filename) || '&lt;br /&gt;'
3567 || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;' 3501 || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
3568 || MIN(s.sounding_info) || '&lt;br /&gt;' 3502 || MIN(s.sounding_info) || '&lt;br /&gt;'
3569 || MIN(s.evaluation_by) AS info 3503 || MIN(s.evaluation_by) AS info
3570 FROM flow_depth_column sc INNER JOIN flow_depth s ON sc.flow_depth_id=s.id 3504 FROM flow_depth_column sc INNER JOIN flow_depth s ON sc.flow_depth_id=s.id
3571 INNER JOIN flow_depth_values v ON sc.id=v.flow_depth_column_id 3505 INNER JOIN flow_depth_values v ON sc.id=v.flow_depth_column_id
3572 WHERE (s.river_id=${river_id}) 3506 WHERE (s.river_id=${river_id})
3573 GROUP BY sc.flow_depth_id, sc.id 3507 GROUP BY sc.flow_depth_id, sc.id
3574 ORDER BY sc.id 3508 ORDER BY sc.id
3575 </dc:statement> 3509 </dc:statement>
3576 <dc:if test="dc:has-result()"> 3510 <dc:if test="dc:has-result()">
3577 <dc:group expr="$flowdepth_name"> 3511 <dc:group expr="$flowdepth_name">
3578 <flowdepthx name="{dc:group-key()}"> 3512 <sinfo_predefined_flowdepth>
3579 <dc:for-each> 3513 <dc:for-each>
3580 <flowdepthcolumn name="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}"/> 3514 <flowdepthcolumn name="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}"/>
3581 </dc:for-each> 3515 </dc:for-each>
3582 </flowdepthx> 3516 </sinfo_predefined_flowdepth>
3583 </dc:group> 3517 </dc:group>
3584 </dc:if> 3518 </dc:if>
3585 </dc:context> 3519 </dc:context>
3586 </dc:macro> 3520 </dc:macro>
3587 3521
http://dive4elements.wald.intevation.org