# HG changeset patch
# User Andre Heinecke <aheinecke@intevation.de>
# Date 1369812131 -7200
# Node ID 06cb01e8aef3f2fa909e27e31153a7a7d94ac74b
# Parent  036b02fc0c81eda435713df91c5e6482822c186c
Add target_out attribute to elements with a factory

    This might be reverted later again but unblocks the datacage for now
    so that modifications can be done without having conflicts later.

diff -r 036b02fc0c81 -r 06cb01e8aef3 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Tue May 28 17:54:17 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Wed May 29 09:22:11 2013 +0200
@@ -397,7 +397,7 @@
             <dc:for-each>
               <w_differences
                 description="{$facet_description}"
-                factory="winfo"
+                factory="winfo" target_out="{$out}"
                 artifact-id="{$aid}"
                 ids="{$aid}"
                 out="w_differences"/>
@@ -415,6 +415,7 @@
               <dc:element name="${facet_name}">
                 <dc:attribute name="description" value="${facet_description}"/>
                 <dc:attribute name="factory" value="winfo"/>
+                <dc:attribute name="target_out" value="${out}"/>
                 <dc:attribute name="artifact-id" value="${a_id}"/>
                 <dc:attribute name="ids" value="${a_id}"/>
                 <dc:attribute name="out" value="reference_curve"/>
@@ -433,6 +434,7 @@
               <dc:element name="${facet_name}">
                 <dc:attribute name="description" value="${facet_description}"/>
                 <dc:attribute name="factory" value="winfo"/>
+                <dc:attribute name="target_out" value="${out}"/>
                 <dc:attribute name="artifact-id" value="${a_id}"/>
                 <dc:attribute name="ids" value="${a_id}"/>
                 <dc:attribute name="out" value="computed_discharge_curve"/>
@@ -451,6 +453,7 @@
               <dc:element name="${facet_name}">
                 <dc:attribute name="description" value="${facet_description}"/>
                 <dc:attribute name="factory" value="winfo"/>
+                <dc:attribute name="target_out" value="${out}"/>
                 <dc:attribute name="artifact-id" value="${a_id}"/>
                 <dc:attribute name="ids" value="${a_id}"/>
                 <dc:attribute name="out" value="floodmap"/>
@@ -473,6 +476,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}"/>
                     <dc:attribute name="factory" value="winfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="cross_section"/>
                   </dc:element>
@@ -496,6 +500,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}"/>
                     <dc:attribute name="factory" value="winfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="longitudinal_section"/>
                   </dc:element>
@@ -522,6 +527,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}"/>
                     <dc:attribute name="factory" value="fixanalysis"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="fix_longitudinal_section_curve"/>
                   </dc:element>
@@ -549,6 +555,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}"/>
                     <dc:attribute name="factory" value="fixanalysis"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="fix_deltawt_curve"/>
                   </dc:element>
@@ -573,6 +580,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}"/>
                     <dc:attribute name="factory" value="fixanalysis"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="fix_deltawt_curve"/>
                   </dc:element>
@@ -595,6 +603,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}"/>
                     <dc:attribute name="factory" value="fixanalysis"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="fix_derivate_curve"/>
                   </dc:element>
@@ -621,6 +630,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}"/>
                     <dc:attribute name="factory" value="fixanalysis"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="fix_wq_curve"/>
                   </dc:element>
@@ -640,6 +650,7 @@
               <dc:element name="${facet_name}">
                 <dc:attribute name="description" value="${facet_description}"/>
                 <dc:attribute name="factory" value="winfo"/>
+                <dc:attribute name="target_out" value="${out}"/>
                 <dc:attribute name="artifact-id" value="${a_id}"/>
                 <dc:attribute name="ids" value="${a_id}"/>
                 <dc:attribute name="out" value="duration_curve"/>
@@ -662,6 +673,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}"/>
                     <dc:attribute name="factory" value="winfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="longitudinal_section"/>
                   </dc:element>
@@ -682,6 +694,7 @@
               <dc:attribute name="description" value="${facet_description}"/>
               <dc:attribute name="ids" value="${facet_num}"/>
               <dc:attribute name="factory" value="winfo"/>
+              <dc:attribute name="target_out" value="${out}"/>
               <dc:attribute name="artifact-id" value="${a_gid}"/>
               <dc:attribute name="out" value="floodmap"/>
             </dc:element>
@@ -701,6 +714,7 @@
                 <dc:for-each>
                   <dc:element name="${facet_name}">
                     <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
@@ -724,6 +738,7 @@
                 <dc:for-each>
                   <dc:element name="${facet_name}">
                     <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
@@ -748,6 +763,7 @@
                 <dc:for-each>
                   <dc:element name="${facet_name}">
                     <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
@@ -772,6 +788,7 @@
                 <dc:for-each>
                   <dc:element name="${facet_name}">
                     <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
@@ -798,6 +815,7 @@
                 <dc:for-each>
                   <dc:element name="${facet_name}">
                     <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
@@ -820,6 +838,7 @@
                 <dc:for-each>
                   <dc:element name="${facet_name}">
                     <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
@@ -843,6 +862,7 @@
                 <dc:for-each>
                   <dc:element name="${facet_name}">
                     <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
@@ -865,6 +885,7 @@
                 <dc:for-each>
                   <dc:element name="${facet_name}">
                     <dc:attribute name="factory" value="winfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
@@ -880,12 +901,12 @@
     <!-- Macros to load system data -->
 
     <dc:macro name="annotations">
-      <annotation factory="annotations" ids="{$river_id}"/>
+      <annotation factory="annotations" ids="{$river_id}" target_out="{$out}" />
     </dc:macro>
 
     <dc:macro name="mainvalues">
-      <wmainvalue factory="mainvalue" ids="{$river_id}:w"/>
-      <qmainvalue factory="mainvalue" ids="{$river_id}:q"/>
+      <wmainvalue factory="mainvalue" ids="{$river_id}:w" target_out="{$out}" />
+      <qmainvalue factory="mainvalue" ids="{$river_id}:q" target_out="{$out}" />
     </dc:macro>
 
     <dc:macro name="cross_sections">
@@ -903,7 +924,7 @@
           <dc:for-each>
             <cross_section name="{$prot_description}"
                            ids="{$prot_id}"
-                           factory="crosssections"/>
+                           factory="crosssections" target_out="{$out}" />
           </dc:for-each>
         </dc:context>
       </cross_sections>
@@ -922,9 +943,9 @@
               AND he.km BETWEEN ${fromkm} AND ${tokm}
           </dc:statement>
           <dc:for-each>
-            <hyk name="{$hyk_description}" 
+            <hyk name="{$hyk_description}"
                  ids="{$hyk_id}"
-                 factory="hyk"/>
+                 factory="hyk" target_out="{$out}" />
           </dc:for-each>
         </dc:context>
       </hyks>
@@ -950,7 +971,7 @@
       <dc:call-macro name="fixings-macro">
         <column name="{$wst_column_name}"
                 ids="fixations-wstv-{$wst_column_position}-{$wst_id}"
-                factory="wqinterpol"
+                factory="wqinterpol" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -959,7 +980,7 @@
       <dc:call-macro name="fixings-macro">
         <column name="{$wst_column_name}"
                 ids="fixations-wstv-{$wst_column_position}-{$wst_id}"
-                factory="staticwqkms"
+                factory="staticwqkms" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -973,7 +994,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwqkms"
+                          factory="staticwqkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </official>
@@ -992,7 +1013,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </heightmark>
@@ -1011,7 +1032,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </relativepoint>
@@ -1040,7 +1061,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </flood_protection>
@@ -1053,7 +1074,7 @@
     <dc:macro name="annotations_per_type">
       <annotations>
         <dc:context>
-          <all_annotations factory="annotations" ids="{$river_id}"/>
+          <all_annotations factory="annotations" ids="{$river_id}" target_out="{$out}" />
           <dc:statement>
             SELECT id   AS anno_id,
                    name AS anno_description
@@ -1061,7 +1082,7 @@
           </dc:statement>
           <dc:for-each>
             <annotation name="{$anno_description}"
-                        factory="annotations"
+                        factory="annotations" target_out="{$out}"
                         ids="{$river_id}:{$anno_description}"/>
           </dc:for-each>
         </dc:context>
@@ -1077,7 +1098,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="fixations-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </relativepoint>
@@ -1096,7 +1117,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </relativepoint>
@@ -1115,7 +1136,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </relativepoint>
@@ -1137,7 +1158,7 @@
             <discharge_table_gauge>
               <dc:for-each>
                 <gauge name="{$gauge_name}"
-                  factory="gaugedischarge"
+                  factory="gaugedischarge" target_out="{$out}"
                   from="{$g_start}"
                   to="{$g_stop}"
                   ids="{$gauge_name}"/>
@@ -1159,15 +1180,15 @@
     </dc:macro>
 
     <dc:macro name="qsectors">
-      <qsector factory="qsectors" ids="{$river_id}"/>
+      <qsector factory="qsectors" ids="{$river_id}" target_out="{$out}" />
     </dc:macro>
 
     <dc:macro name="flood-map-recommended">
       <kilometrage>
-        <riveraxis factory="riveraxis" ids="{$river_id}"/>
+        <riveraxis factory="riveraxis" ids="{$river_id}" target_out="{$out}" />
       </kilometrage>
       <rastermap>
-        <background factory="wmsbackground" ids="{$river_id}"/>
+        <background factory="wmsbackground" ids="{$river_id}" target_out="{$out}" />
       </rastermap>
     </dc:macro>
 
@@ -1188,7 +1209,7 @@
             FROM bed_height_single WHERE river_id = ${river_id}
           </dc:statement>
           <dc:for-each>
-            <height factory="bedheight"
+            <height factory="bedheight" target_out="{$out}"
                     ids="bedheight-single-{$bedh_id}-{$bedh_year}"
                     description="{$bedh_descr}"/>
           </dc:for-each>
@@ -1206,7 +1227,7 @@
             FROM bed_height_epoch WHERE river_id = ${river_id}
           </dc:statement>
           <dc:for-each>
-            <height factory="bedheight"
+            <height factory="bedheight" target_out="{$out}"
                     ids="bedheight-epoch-{$bedh_id}-{$bedh_interval_id}"
                     description="{$bedh_descr}"/>
           </dc:for-each>
@@ -1227,7 +1248,7 @@
               <dc:comment>TODO: Why has this an id and factory?</dc:comment>
               <flow_velocity_measurement name="{$fvmd}"
                                          ids="{$fvmid}"
-                                         factory="flowvelocity">
+                                         factory="flowvelocity" target_out="{$out}" >
                 <dc:context>
                   <dc:statement>
                     SELECT id, description, station, datetime, v, w, q
@@ -1238,7 +1259,7 @@
                   <dc:for-each>
                     <measurement_value name="{$description} - {$station} - {$datetime}"
                                        ids="{$id}"
-                                       factory="flowvelocity"/>
+                                       factory="flowvelocity" target_out="{$out}" />
                   </dc:for-each>
                 </dc:context>
               </flow_velocity_measurement>
@@ -1268,7 +1289,7 @@
                 <dc:for-each>
                   <morphologic-width name="{$from_station} - {$to_station}"
                                      ids="{$width_id}"
-                                     factory="morph-width"/>
+                                     factory="morph-width" target_out="{$out}" />
                 </dc:for-each>
               </dc:context>
             </dc:for-each>
@@ -1288,7 +1309,7 @@
         <dc:if test="dc:has-result()">
           <soundings_width>
             <dc:for-each>
-              <height factory="bedheight"
+              <height factory="bedheight" target_out="{$out}"
                       ids="bedheight-singlevalues-{$bedh_id}-{$bedh_year}"
                       description="{$bedh_descr}"/>
             </dc:for-each>
@@ -1317,7 +1338,7 @@
       <dc:call-macro name="basedata_0_macro">
         <column name="{$wst_column_name}"
                 ids="base_data-wstv-{$wst_column_position}-{$wst_id}"
-                factory="staticwqkms"
+                factory="staticwqkms" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -1326,7 +1347,7 @@
       <dc:call-macro name="basedata_0_macro">
         <column name="{$wst_column_name}"
                 ids="base_data-wstv-{$wst_column_position}-{$wst_id}"
-                factory="wqinterpol"
+                factory="wqinterpol" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -1351,7 +1372,7 @@
       <dc:call-macro name="basedata_1_additionals_macro">
         <column name="{$wst_column_name}"
                 ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
-                factory="staticwqkms"
+                factory="staticwqkms" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -1360,7 +1381,7 @@
       <dc:call-macro name="basedata_1_additionals_macro">
         <column name="{$wst_column_name}"
                 ids="additionalsmarks-wstv-{$wst_column_position}-{$wst_id}"
-                factory="staticwkms"
+                factory="staticwkms" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -1404,10 +1425,10 @@
          FIXME: Following two macros look identical to me.
       </dc:comment>
       <kilometrage>
-        <riveraxis factory="riveraxis" ids="{$river_id}"/>
+        <riveraxis factory="riveraxis" ids="{$river_id}" target_out="{$out}" />
       </kilometrage>
       <rastermap>
-        <background factory="wmsbackground" ids="{$river_id}"/>
+        <background factory="wmsbackground" ids="{$river_id}" target_out="{$out}" />
       </rastermap>
     </dc:macro>
 
@@ -1432,7 +1453,7 @@
             WHERE d.river_id = ${river_id}
           </dc:statement>
           <dc:for-each>
-            <dem factory="demfactory" 
+            <dem factory="demfactory" target_out="{$out}"
               ids="{$dem_id}"
               name="{$name}"
               info="{dc:replace($info, '$', '&lt;BR&gt;')}{dc:date-format('yyyy', $start_time)} - {dc:date-format('yyyy', $stop_time)}"/>
@@ -1445,7 +1466,7 @@
       <dc:macro name="durchlass_damm_graben">
         <dc:macro name="ddg_factory">
           <dc:for-each>
-            <hws factory="hwsfactory" name="{$hws_name}"/>
+            <hws factory="hwsfactory" name="{$hws_name}" target_out="{$out}" />
           </dc:for-each>
         </dc:macro>
 
@@ -1532,7 +1553,7 @@
               AND kind = 2
           </dc:statement>
           <dc:for-each>
-            <line factory="wmshydrboundariesfactory" 
+            <line factory="wmshydrboundariesfactory" target_out="{$out}"
                   ids="{$river_id};{$name};2"
                   name="{$name}"/>
           </dc:for-each>
@@ -1546,7 +1567,7 @@
               AND kind = 2
           </dc:statement>
           <dc:for-each>
-            <line factory="wmshydrboundariespolyfactory"
+            <line factory="wmshydrboundariespolyfactory" target_out="{$out}"
                   ids="{$river_id};{$name};2"
                   name="{$name}"/>
           </dc:for-each>
@@ -1567,7 +1588,7 @@
         <dc:if test="dc:has-result()">
           <lines>
             <dc:for-each>
-              <line factory="wmshydrboundariesfactory"
+              <line factory="wmshydrboundariesfactory" target_out="{$out}"
                     ids="{$river_id};{$name};1"
                     name="{$name}"/>
             </dc:for-each>
@@ -1592,7 +1613,7 @@
             <sobek_areas>
               <dc:for-each>
                 <boundary name="{$sectie}"
-                          factory="wmshydrboundariespolyfactory"
+                          factory="wmshydrboundariespolyfactory" target_out="{$out}"
                           ids="{$river_id};{$sectie};1;{$sectie_id};-1"/>
               </dc:for-each>
             </sobek_areas>
@@ -1612,7 +1633,7 @@
             <sobek_flooded>
               <dc:for-each>
                 <boundary name="{$sobek}"
-                          factory="wmshydrboundariespolyfactory"
+                          factory="wmshydrboundariespolyfactory" target_out="{$out}"
                           ids="{$river_id};{$sobek};1;-1;{$sobek_id}"/>
               </dc:for-each>
             </sobek_flooded>
@@ -1630,7 +1651,7 @@
           </dc:statement>
           <dc:for-each>
             <boundary name="{$name}"
-                      factory="wmshydrboundariespolyfactory"
+                      factory="wmshydrboundariespolyfactory" target_out="{$out}"
                       ids="{$river_id};{$name}"/>
           </dc:for-each>
         </dc:context>
@@ -1661,7 +1682,7 @@
                     <dc:if test="dc:has-result()">
                       <bfg>
                         <dc:for-each>
-                          <floodmaps factory="wmsfloodmapsfactory"
+                          <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}"
                             ids="{$river_id};{$name}"
                             name="{$name}"/>
                         </dc:for-each>
@@ -1677,7 +1698,7 @@
                     <dc:if test="dc:has-result()">
                       <federal>
                         <dc:for-each>
-                          <floodmaps factory="wmsfloodmapsfactory"
+                          <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}"
                             ids="{$river_id};{$name}"
                             name="{$name}"/>
                         </dc:for-each>
@@ -1703,7 +1724,7 @@
                     <dc:if test="dc:has-result()">
                       <bfg>
                         <dc:for-each>
-                          <floodmaps factory="wmsfloodmapsfactory"
+                          <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}"
                             ids="{$river_id};{$name}"
                             name="{$name}"/>
                         </dc:for-each>
@@ -1720,7 +1741,7 @@
                     <dc:if test="dc:has-result()">
                       <federal>
                         <dc:for-each>
-                          <floodmaps factory="wmsfloodmapsfactory"
+                          <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}"
                             ids="{$river_id};{$name}"
                             name="{$name}"/>
                         </dc:for-each>
@@ -1751,7 +1772,7 @@
                         ${source}
                       </dc:statement>
                       <dc:for-each>
-                        <floodmaps factory="wmsfloodmapsfactory"
+                        <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}"
                           ids="{$river_id};{$name}"
                           name="{$name}"/>
                       </dc:for-each>
@@ -1781,7 +1802,7 @@
           <floodplain>
             <dc:filter expr="$kind_id=1">
               <dc:for-each>
-                <floody factory="wmsfloodplainfactory"
+                <floody factory="wmsfloodplainfactory" target_out="{$out}"
                         description="{$kind_name}"
                         ids="{$river_id};{$kind_name};{$kind_id}"/>
               </dc:for-each>
@@ -1790,7 +1811,7 @@
               <dc:if test="dc:has-result()">
                 <other>
                   <dc:for-each>
-                    <floody factory="wmsfloodplainfactory"
+                    <floody factory="wmsfloodplainfactory" target_out="{$out}"
                             description="{$layer_name}"
                             ids="{$river_id};{$layer_name};{$kind_id}"/>
                   </dc:for-each>
@@ -1810,7 +1831,7 @@
 
       <dc:macro name="hwspoints_by_kind_factory">
         <dc:for-each>
-          <hws factory="wmshwspointsfactory"
+          <hws factory="wmshwspointsfactory" target_out="{$out}"
                ids="{$river_id};{$hws_name}"
                name="{$hws_name}"/>
         </dc:for-each>
@@ -1941,7 +1962,7 @@
 
       <dc:macro name="hwslines_by_kind_factory">
         <dc:for-each>
-          <hws factory="wmshwslinesfactory"
+          <hws factory="wmshwslinesfactory" target_out="{$out}"
                ids="{$river_id};{$hws_name}"
                name="{$hws_name}"/>
         </dc:for-each>
@@ -2076,7 +2097,7 @@
           <floodmarks>
             <dc:for-each>
               <floodmark name="{$year}"
-                factory="wmsfloodmarkfactory"
+                factory="wmsfloodmarkfactory" target_out="{$out}"
                 ids="{$river_id};{$year};{$year}"/>
             </dc:for-each>
           </floodmarks>
@@ -2086,7 +2107,7 @@
 
     <dc:macro name="catchments">
       <catchments>
-        <catchment_wms factory="externalwmsfactory"
+        <catchment_wms factory="externalwmsfactory" target_out="{$out}"
                        ids="http://geoportal.bafg.de/wmsproxy/INSPIRE/DrainageBasin;HY.PHYSICALWATERS.CATCHMENTS;Einzugsgebiete (WMS)" />
         <dc:call-macro name="flood-map-gaugelocations"/>
       </catchments>
@@ -2094,10 +2115,10 @@
 
     <dc:macro name="flood-map-gaugelocations">
       <gaugelocations>
-        <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)"/>
-        <gauge_names factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV)"/>
-        <gauge_level factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV)"/>
-        <gauge_tendency factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV)"/>
+        <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)" target_out="{$out}" />
+        <gauge_names factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV)" target_out="{$out}" />
+        <gauge_level factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV)" target_out="{$out}" />
+        <gauge_tendency factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV)" target_out="{$out}" />
       </gaugelocations>
     </dc:macro>
 
@@ -2118,7 +2139,7 @@
               <dc:for-each>
                 <actual description="{$kind_name}"
                         ids="{$river_id};{$kind_name};{$kind_id}"
-                        factory="riveraxis"/>
+                        factory="riveraxis" target_out="{$out}" />
               </dc:for-each>
             </dc:filter>
             <dc:filter expr="$kind_id!=1">
@@ -2126,7 +2147,7 @@
                 <dc:for-each>
                   <misc-axis description="{$layer_name}"
                              ids="{$river_id};{$layer_name};{$kind_id}"
-                             factory="riveraxis"/>
+                             factory="riveraxis" target_out="{$out}" />
                 </dc:for-each>
               </other>
             </dc:filter>
@@ -2141,7 +2162,7 @@
           SELECT DISTINCT 1 FROM river_axes_km WHERE river_id = ${river_id}
         </dc:statement>
          <dc:for-each>
-            <kilometrage factory="wmskmfactory" ids="{$river_id}"/>
+            <kilometrage factory="wmskmfactory" ids="{$river_id}" target_out="{$out}" />
         </dc:for-each>
       </dc:context>
     </dc:macro>
@@ -2155,7 +2176,7 @@
             GROUP BY name
         </dc:statement>
         <dc:for-each>
-          <fixpoints factory="wmsfixpointsfactory"
+          <fixpoints factory="wmsfixpointsfactory" target_out="{$out}"
             ids="{$river_id};{$name}"/>
         </dc:for-each>
       </dc:context>
@@ -2177,7 +2198,7 @@
             <dc:filter expr="$kind_id=1">
               <dc:for-each>
                 <actual description="{$kind_name}"
-                        factory="wmsqpsfactory"
+                        factory="wmsqpsfactory" target_out="{$out}"
                         ids="{$river_id};{$kind_name};{$kind_id}"/>
               </dc:for-each>
             </dc:filter>
@@ -2186,7 +2207,7 @@
                 <other>
                   <dc:for-each>
                     <misc-qps description="{$layer_name}"
-                              factory="wmsqpsfactory"
+                              factory="wmsqpsfactory" target_out="{$out}"
                               ids="{$river_id};{$layer_name};{$kind_id}"/>
                   </dc:for-each>
                 </other>
@@ -2213,7 +2234,7 @@
             <dc:filter expr="$building_kind_id!=0">
               <dc:for-each>
                 <buildings description="{$building_kind}"
-                           factory="wmsbuildingsfactory"
+                           factory="wmsbuildingsfactory" target_out="{$out}"
                            ids="{$river_id};{$building_kind};{$building_kind_id}"/>
               </dc:for-each>
             </dc:filter>
@@ -2221,7 +2242,7 @@
               <other>
                 <dc:for-each>
                   <buildings description="{$building_name}"
-                             factory="wmsbuildingsfactory"
+                             factory="wmsbuildingsfactory" target_out="{$out}"
                              ids="{$river_id};{$building_name}"/>
                 </dc:for-each>
               </other>
@@ -2241,7 +2262,7 @@
             <jetties>
               <dc:for-each>
                 <jetty description="{$jetty_kind}"
-                       factory="wmsjettiesfactory"
+                       factory="wmsjettiesfactory" target_out="{$out}"
                        ids="{$river_id};{$jetty_kind};{$jetty_kind_id}"/>
               </dc:for-each>
             </jetties>
@@ -2294,6 +2315,7 @@
                     <dc:attribute name="name" value="${olname}"/>
                     <dc:attribute name="ids" value="additionals-wstv-${wstcolpos}-${wstid}"/>
                     <dc:attribute name="factory" value="staticwkms"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="out" value="${out}"/>
                   </dc:element>
                 </dc:for-each>