--- a/artifacts/doc/conf/meta-data.xml	Fri Apr 20 16:04:34 2018 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Mon Apr 23 15:18:48 2018 +0200
@@ -279,14 +279,14 @@
                         <dc:call-macro name="basedata_7_waterlevels"/>
                       </fixanalysis>
                     </minfo>
-                    <dc:call-macro name="basedata_3_officials"/>
+                    <dc:call-macro name="basedata_3_officials"/>
                     <dc:call-macro name="basedata_2_fixations"/>
                     <sinfo>
                       <sinfo_additional_ls>
                         <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/>
                         <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/>
-                      </sinfo_additional_ls>
-                    </sinfo>
+                      </sinfo_additional_ls>
+                    </sinfo>
                   </dc:when>
 
                   <dc:when test="$out = 'sinfo_flow_depth'">
@@ -1307,50 +1307,50 @@
       </dc:call-macro>
     </dc:macro>
 
-    <dc:macro name="basedata_1_additionals-sinfo-with-q_macro">
-      <dc:filter expr="$kind=1 and $sinfo_selection='Q'">
-        <dc:if test="dc:has-result()">
-          <sinfo_additional_ls_withQ>
-            <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
-              <additional name="{dc:group-key()}">
-                <dc:for-each>
-                  <dc:macro-body/>
-                </dc:for-each>
-              </additional>
-            </dc:group>
-          </sinfo_additional_ls_withQ>
-        </dc:if>
-      </dc:filter>
-    </dc:macro>
-
-    <dc:macro name="basedata_1_additionals-sinfo-with-q">
-      <dc:call-macro name="basedata_1_additionals-sinfo-with-q_macro">
-        <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
-      </dc:call-macro>
-    </dc:macro>
-
-    <dc:macro name="basedata_1_additionals-sinfo-without-q_macro">
-      <dc:filter expr="$kind=1 and $sinfo_selection='W'">
-        <dc:if test="dc:has-result()">
-          <sinfo_additional_ls_withoutQ>
-            <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
-              <additional name="{dc:group-key()}">
-                <dc:for-each>
-                  <dc:macro-body/>
-                </dc:for-each>
-              </additional>
-            </dc:group>
-          </sinfo_additional_ls_withoutQ>
-        </dc:if>
-      </dc:filter>
-    </dc:macro>
-
-    <dc:macro name="basedata_1_additionals-sinfo-without-q">
-      <dc:call-macro name="basedata_1_additionals-sinfo-without-q_macro">
-        <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
-      </dc:call-macro>
-    </dc:macro>
-
+    <dc:macro name="basedata_1_additionals-sinfo-with-q_macro">
+      <dc:filter expr="$kind=1 and $sinfo_selection='Q'">
+        <dc:if test="dc:has-result()">
+          <sinfo_additional_ls_withQ>
+            <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
+              <additional name="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:macro-body/>
+                </dc:for-each>
+              </additional>
+            </dc:group>
+          </sinfo_additional_ls_withQ>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="basedata_1_additionals-sinfo-with-q">
+      <dc:call-macro name="basedata_1_additionals-sinfo-with-q_macro">
+        <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <dc:macro name="basedata_1_additionals-sinfo-without-q_macro">
+      <dc:filter expr="$kind=1 and $sinfo_selection='W'">
+        <dc:if test="dc:has-result()">
+          <sinfo_additional_ls_withoutQ>
+            <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
+              <additional name="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:macro-body/>
+                </dc:for-each>
+              </additional>
+            </dc:group>
+          </sinfo_additional_ls_withoutQ>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="basedata_1_additionals-sinfo-without-q">
+      <dc:call-macro name="basedata_1_additionals-sinfo-without-q_macro">
+        <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
     <dc:macro name="basedata_1_additionals_wq">
       <dc:call-macro name="basedata_1_additionals_macro">
         <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
@@ -1626,6 +1626,10 @@
           <dc:call-macro name="minfo-heights-max"/>
           <dc:call-macro name="minfo-heights-min"/>
         </bed_heights_minmax>
+        
+        <sinfo_predefined_tkh>
+          <dc:call-macro name="sinfo_predefined_tkh"/>
+        </sinfo_predefined_tkh>
       </sinfo>
     </dc:macro>
 
@@ -3460,5 +3464,30 @@
       </dc:filter>
     </dc:macro>
 
+        <!-- tkh imported from CSV-files for S-INFO -->
+    <dc:macro name="sinfo_predefined_tkh">
+      <dc:context>
+        <dc:statement>
+          SELECT tc.tkh_id AS tkh_id, tc.id AS tkh_col_id, tc.name AS tkh_col_name,
+            MIN(t.filename) AS tkh_name, MIN(tv.station) AS km_min, MAX(tv.station) AS km_max,
+            MIN(t.filename) || '&lt;br /&gt;' || MIN(t.sounding_info) || '&lt;br /&gt;' || MIN(t.evaluation_by) AS info
+          FROM tkh_column tc INNER JOIN tkh t ON tc.tkh_id=t.id
+            INNER JOIN tkh_values tv ON tc.id=tv.tkh_column_id
+          WHERE t.river_id=${river_id}
+          GROUP BY tc.tkh_id, tc.id
+          ORDER BY tc.id
+        </dc:statement>
+        <dc:if test="dc:has-result()">
+          <dc:group expr="$tkh_name">
+            <tkhx name="{dc:group-key()}">
+              <dc:for-each>
+                <tkhcolumn name="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$tkh_name}&lt;br /&gt;[km {$km_min} - {$km_max}]"/>
+              </dc:for-each>
+            </tkhx>
+          </dc:group>
+        </dc:if>
+      </dc:context>
+    </dc:macro>
+
   </datacage>
 </dc:template>
\ No newline at end of file