Mercurial > dive4elements > river
diff artifacts/doc/conf/meta-data.xml @ 8980:b194fa64506a
SINFO - show results themes according to spec, either raw data or floating mean values.
Some improvements to error handling and handling of empty results.
| author | gernotbelger |
|---|---|
| date | Thu, 05 Apr 2018 18:30:34 +0200 |
| parents | b98fbd91f64a |
| children | 2e27061d9a93 |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Thu Apr 05 17:12:23 2018 +0200 +++ b/artifacts/doc/conf/meta-data.xml Thu Apr 05 18:30:34 2018 +0200 @@ -2093,7 +2093,8 @@ '<BR>Strecke: ' || round(r.a, 1) || '-' || round(r.b, 1) || '<BR>Auswerter: ' || bhs.evaluation_by AS info, bhv.height_count AS bedh_height_count, - bhv.min_count AS bedh_min_count, + bhv.min_count AS + bedh_min_count, bhv.max_count AS bedh_max_count FROM bed_height bhs JOIN bed_height_type bht ON bht.id = bhs.type_id @@ -3231,7 +3232,14 @@ </dc:macro> <dc:macro name="sinfo_flowdepths"> - <dc:filter expr="( $facet_name = 'sinfo_facet_flow_depth.filtered' or $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or $facet_name = 'sinfo_facet_flow_depth_current.filtered' or $facet_name = 'sinfo_facet_flow_depth_historical.filtered' )"> + <dc:filter expr="( $facet_name = 'sinfo_facet_flow_depth' or + $facet_name = 'sinfo_facet_flow_depth.filtered' or + $facet_name = 'sinfo_facet_flow_depth_with_tkh' or + $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or + $facet_name = 'sinfo_facet_flow_depth_current' or + $facet_name = 'sinfo_facet_flow_depth_current.filtered' or + $facet_name = 'sinfo_facet_flow_depth_historical' or + $facet_name = 'sinfo_facet_flow_depth_historical.filtered' )"> <dc:if test="dc:has-result()"> <sinfo_flow_depths> <dc:call-macro name="collection-group"> @@ -3254,7 +3262,12 @@ </dc:macro> <dc:macro name="sinfo_flowdepths_minmax"> - <dc:filter expr="( $facet_name = 'sinfo_facet_flow_depth_min.filtered' or $facet_name = 'sinfo_facet_flow_depth_max.filtered' )"> + <dc:filter expr="( + $facet_name = 'sinfo_facet_flow_depth_min' or + $facet_name = 'sinfo_facet_flow_depth_min.filtered' or + $facet_name = 'sinfo_facet_flow_depth_max' or + $facet_name = 'sinfo_facet_flow_depth_max.filtered' + )"> <dc:if test="dc:has-result()"> <sinfo_flow_depths_minmax> <dc:call-macro name="collection-group"> @@ -3277,7 +3290,10 @@ </dc:macro> <dc:macro name="sinfo_flow_depth_development"> - <dc:filter expr="$facet_name = 'sinfo_facet_flow_depth_development.filtered' or $facet_name = 'sinfo_facet_flow_depth_development_per_year.filtered'"> + <dc:filter expr="$facet_name = 'sinfo_facet_flow_depth_development' or + $facet_name = 'sinfo_facet_flow_depth_development.filtered' or + $facet_name = 'sinfo_facet_flow_depth_development_per_year' + $facet_name = 'sinfo_facet_flow_depth_development_per_year.filtered'"> <dc:if test="dc:has-result()"> <sinfo_flow_depth_developments> <dc:call-macro name="collection-group"> @@ -3369,7 +3385,7 @@ </dc:macro> <dc:macro name="sinfo_tkh_velocity"> - <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_velocity.filtered' )"> + <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_velocity' )"> <dc:if test="dc:has-result()"> <sinfo_velocities> <dc:call-macro name="collection-group"> @@ -3392,7 +3408,7 @@ </dc:macro> <dc:macro name="sinfo_tkh_d50"> - <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_d50.filtered' )"> + <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_d50' )"> <dc:if test="dc:has-result()"> <sinfo_bedqualities> <sinfo_d50s> @@ -3417,7 +3433,7 @@ </dc:macro> <dc:macro name="sinfo_tkh_tau"> - <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_tau.filtered' )"> + <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_tau' )"> <dc:if test="dc:has-result()"> <sinfo_taus> <dc:call-macro name="collection-group">