--- a/artifacts/doc/conf/meta-data.xml	Mon Jun 04 11:55:08 2018 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Mon Jun 04 12:50:39 2018 +0200
@@ -1618,6 +1618,10 @@
           <dc:call-macro name="sinfo_predefined_channel"/>
         </sinfo_predefined_channel>
 
+        <sinfo_infrastructure>
+          <dc:call-macro name="sinfo_infrastructure"/>
+        </sinfo_infrastructure>
+
         <sinfo_predefined_tkh>
           <dc:call-macro name="sinfo_predefined_tkh-berechnung"/>
           <dc:call-macro name="sinfo_predefined_tkh-messung"/>
@@ -3421,7 +3425,7 @@
         <dc:statement>
           SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
           MIN(s.filename) || '&lt;br /&gt;'
-          || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
+          || MIN(s.kmrange_info) || ']&lt;br /&gt;'
           || MIN(s.year_from) || ' - ' || MIN(s.year_to) || '&lt;br /&gt;' AS info
           FROM channel s INNER JOIN channel_values v ON s.id=v.channel_id
           WHERE (s.river_id=${river_id})
@@ -3458,7 +3462,7 @@
           SELECT sc.tkh_id AS tkh_id, sc.id AS tkh_col_id, MIN(sc.name) AS tkh_col_name,
           MIN(s.filename) AS tkh_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
           MIN(s.filename) || '&lt;br /&gt;'
-          || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
+          || MIN(s.kmrange_info) || ']&lt;br /&gt;'
           || MIN(s.sounding_info) || '&lt;br /&gt;'
           || MIN(s.evaluation_by) AS info
           FROM tkh_column sc INNER JOIN tkh s ON sc.tkh_id=s.id
@@ -3501,7 +3505,7 @@
         <dc:statement>
           SELECT s.id AS depthevol_id, MIN(s.filename) AS depthevol_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
           MIN(s.filename) || '&lt;br /&gt;'
-          || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
+          || MIN(s.kmrange_info) || ']&lt;br /&gt;'
           || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '&lt;br /&gt;'
           || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '&lt;br /&gt;'
           || MIN(s.old_glw) || ' - ' || MIN(s.curr_glw) AS info
@@ -3529,7 +3533,7 @@
           SELECT sc.flow_depth_id AS flowdepth_id, sc.id AS flowdepth_col_id, MIN(sc.name) AS flowdepth_col_name,
           MIN(s.filename) AS flowdepth_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
           MIN(s.filename) || '&lt;br /&gt;'
-          || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
+          || MIN(s.kmrange_info) || ']&lt;br /&gt;'
           || MIN(s.sounding_info) || '&lt;br /&gt;'
           || MIN(s.evaluation_by) AS info
           FROM flow_depth_column sc INNER JOIN flow_depth s ON sc.flow_depth_id=s.id
@@ -3551,5 +3555,29 @@
       </dc:context>
     </dc:macro>
 
+    <!-- infrastructure height imported from CSV-files for S-INFO -->
+    <dc:macro name="sinfo_infrastructure">
+      <dc:context>
+        <dc:statement>
+          SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
+          MIN(x.name) AS typename,
+          MIN(s.filename) || '&lt;br /&gt;'
+          || MIN(s.kmrange_info) || '&lt;br /&gt;'
+          || MIN(s.year) || '&lt;br /&gt;' AS info
+          FROM infrastructure s INNER JOIN infrastructure_values v ON s.id=v.infrastructure_id
+          INNER JOIN annotation_types x ON s.annotation_type_id=x.id
+          WHERE (s.river_id=${river_id})
+          AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
+          GROUP BY s.id
+          ORDER BY MIN(s.filename) DESC;
+        </dc:statement>
+        <dc:if test="dc:has-result()">
+          <dc:for-each>
+            <infrastructureseries name="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}"/>
+          </dc:for-each>
+        </dc:if>
+      </dc:context>
+    </dc:macro>
+
   </datacage>
 </dc:template>
\ No newline at end of file