--- a/flys-artifacts/doc/conf/meta-data.xml	Thu Nov 10 11:37:51 2011 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Thu Nov 10 11:48:54 2011 +0000
@@ -77,6 +77,40 @@
               </dc:context>
             </addtionals>
         </dc:macro>
+
+        <dc:macro name="basedata_4_heightmarks-points">
+          <heightmarks>
+            <dc:context>
+              <dc:statement>
+                SELECT id          AS prot_id,
+                       description AS prot_description
+                FROM wsts WHERE kind = 4 AND river_id = ${river_id}
+              </dc:statement>
+              <dc:elements>
+                <heightmark>
+                  <dc:attribute name="name" value="${prot_description}"/>
+                  <dc:context>
+                    <dc:statement>
+                      SELECT id       AS prot_column_id,
+                             name     AS prot_column_name,
+                             position AS prot_rel_pos
+                      FROM wst_columns WHERE wst_id = ${prot_id}
+                      ORDER by position
+                    </dc:statement>
+                    <dc:elements>
+                      <column>
+                        <dc:attribute name="name" value="${prot_column_name}"/>
+                        <dc:attribute name="ids" value="heightmarks_points-wstv-${prot_rel_pos}-${prot_id}"/>
+                        <dc:attribute name="factory" value="staticwkms"/>
+                      </column>
+                    </dc:elements>
+                  </dc:context>
+                </heightmark>
+              </dc:elements>
+            </dc:context>
+          </heightmarks>
+        </dc:macro>
+
         <dc:macro name="mainvalues">
           <mainvalue>
             <dc:attribute name="factory" value="mainvalue"/>
@@ -84,7 +118,6 @@
           </mainvalue>
         </dc:macro>
 
-
         <dc:macro name="annotations">
           <annotation>
             <dc:attribute name="factory" value="annotations"/>
@@ -92,14 +125,15 @@
           </annotation>
         </dc:macro>
 
+
+        <dc:comment>
+
+        + River-Node
+
+        </dc:comment>
+
         <river>
           <dc:attribute name="name" value="${river_name}"/>
-          <dc:if test="dc:contains($artifact-outs, 'w_differences')">
-            <annotation>
-              <dc:attribute name="factory" value="annotations"/>
-              <dc:attribute name="ids"     value="${river_id}"/>
-            </annotation>
-          </dc:if>
 
           <dc:choose>
             <dc:when test="dc:contains($parameters, 'recommended')">
@@ -111,6 +145,26 @@
                </dc:if>
             </dc:when>
             <dc:otherwise>
+              <dc:comment>
+                 Non - Recommendations.
+              </dc:comment>
+              <dc:if test="dc:contains($artifact-outs, 'cross_section')">
+                  <dc:call-macro name="basedata_0"/>
+                  <dc:call-macro name="basedata_1_additionals"/>
+              </dc:if>
+              <dc:if test="dc:contains($artifact-outs, 'discharge_longitudinal_section')">
+                 <dc:call-macro name="basedata_0"/>
+                 <dc:call-macro name="basedata_4_heightmarks-points"/>
+              </dc:if>
+              <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))">
+                 <dc:call-macro name="basedata_0"/>
+                 <dc:call-macro name="basedata_1_additionals"/>
+                 <dc:comment comment=" FIXATIONS ---------------------------"/>
+                 <dc:call-macro name="basedata_2_fixations"/>
+                 <dc:comment comment=" HOEHENMARKEN ---------------------------"/>
+                 <dc:call-macro name="basedata_4_heightmarks-points"/>
+              </dc:if>
+             <dc:comment comment="--- non-recommendations---"/>
             </dc:otherwise>
           </dc:choose>
           <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))">