Mercurial > dive4elements > river

changeset 6021:5f34e4cb8095 3.0.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the out attribute everywhere where there is a factory This removes the ID's hack with outs and resolves problems created by that. Where the out was already set previously the dynamic out has been commented out.
author Andre Heinecke <aheinecke@intevation.de>
date Tue, 14 May 2013 18:55:55 +0200
parents bf5dba3f66ac
children 2e0bc74f0081
files artifacts/doc/conf/meta-data.xml
diffstat 1 files changed, 164 insertions(+), 140 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml	Tue May 14 18:43:08 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Tue May 14 18:55:55 2013 +0200
@@ -80,8 +80,8 @@
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="base_data-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="staticwqkms"
+                                ids="base_data-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="staticwqkms" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
@@ -108,8 +108,8 @@
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="base_data-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="wqinterpol"
+                                ids="base_data-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="wqinterpol" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
@@ -136,8 +136,8 @@
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="additionalsmarks-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="staticwkms"
+                                ids="additionalsmarks-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="staticwkms" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context></additional>
@@ -163,8 +163,8 @@
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="additionals-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="staticwqkms"
+                                ids="additionals-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="staticwqkms" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
@@ -191,8 +191,8 @@
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="additionals-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="staticwkms"
+                                ids="additionals-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="staticwkms" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
@@ -219,8 +219,8 @@
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="fixations-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="wqinterpol"
+                                ids="fixations-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="wqinterpol" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
@@ -247,8 +247,8 @@
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="fixations-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="staticwqkms"
+                                ids="fixations-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="staticwqkms" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
@@ -275,8 +275,8 @@
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="fixations-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="staticwkms"
+                                ids="fixations-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="staticwkms" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
@@ -303,8 +303,8 @@
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="additionals-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="staticwqkms"
+                                ids="additionals-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="staticwqkms" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
@@ -330,8 +330,8 @@
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="heightmarks_points-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="staticwkms"
+                                ids="heightmarks_points-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="staticwkms" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
@@ -357,8 +357,8 @@
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="heightmarks_points-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="staticwkms"
+                                ids="heightmarks_points-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="staticwkms" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
@@ -381,14 +381,14 @@
                 <dc:for-each>
                   <relativepoint name="{$prot_description}"
                                  db-id="{$prot_id}"
-                                 factory="staticwkms">
+                                 factory="staticwkms" out="{$OUT}">
                   <columns>
                       <dc:context>
                         <dc:call-macro name="SQL-wst_columns_statement"/>
                         <dc:for-each>
                           <column name="{$prot_column_name}"
-                                  ids="flood_protection-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                  factory="staticwkms"
+                                  ids="flood_protection-wstv-{$prot_rel_pos}-{$prot_id}"
+                                  factory="staticwkms" out="{$OUT}"
                                   info="{$info} [km {$deffrom} - {$defto}]"/>
                         </dc:for-each>
                       </dc:context>
@@ -411,13 +411,13 @@
                 <dc:for-each>
                   <flood_protection name="{dc:replace($prot_description, 'HW-Schutzanlagen/', '')}"
                                     db-id="{$prot_id}"
-                                    factory="staticwkms">
+                                    factory="staticwkms" out="{$OUT}">
                     <dc:context>
                       <dc:call-macro name="SQL-wst_columns_statement"/>
                       <dc:for-each>
                         <column name="{$prot_column_name}"
-                                ids="flood_protection-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="staticwkms"
+                                ids="flood_protection-wstv-{$prot_rel_pos}-{$prot_id}"
+                                factory="staticwkms" out="{$OUT}"
                                 info="{$info} [km {$deffrom} - {$defto}]"/>
                       </dc:for-each>
                     </dc:context>
@@ -429,22 +429,22 @@
         </dc:macro>
 
         <dc:macro name="mainvalues">
-          <wmainvalue factory="mainvalue" ids="{$river_id}:w:OUT={$OUT}"/>
-          <qmainvalue factory="mainvalue" ids="{$river_id}:q:OUT={$OUT}"/>
+          <wmainvalue factory="mainvalue" out="{$OUT}" ids="{$river_id}:w"/>
+          <qmainvalue factory="mainvalue" out="{$OUT}" ids="{$river_id}:q"/>
         </dc:macro>
 
         <dc:macro name="qsectors">
-          <qsector factory="qsectors" ids="{$river_id}:OUT={$OUT}"/>
+          <qsector factory="qsectors" out="{$OUT}" ids="{$river_id}"/>
         </dc:macro>
 
         <dc:macro name="annotations">
-          <annotation factory="annotations" ids="{$river_id}:OUT={$OUT}"/>
+          <annotation factory="annotations" out="{$OUT}" ids="{$river_id}"/>
         </dc:macro>
 
         <dc:macro name="annotations_per_type">
           <annotations>
             <dc:context>
-              <all_annotations factory="annotations" ids="{$river_id}:OUT={$OUT}"/>
+              <all_annotations factory="annotations" out="{$OUT}" ids="{$river_id}"/>
               <dc:statement>
                 SELECT id          AS anno_id,
                        name AS anno_description
@@ -452,8 +452,8 @@
               </dc:statement>
               <dc:for-each>
                 <annotation name="{$anno_description}"
-                            factory="annotations"
-                            ids="{$river_id}:{$anno_description}:OUT={$OUT}"/>
+                            factory="annotations" out="{$OUT}"
+                            ids="{$river_id}:{$anno_description}"/>
              </dc:for-each>
             </dc:context>
           </annotations>
@@ -474,8 +474,8 @@
                 </dc:statement>
                 <dc:for-each>
                   <cross_section name="{$prot_description}"
-                                 ids="{$prot_id}:OUT={$OUT}"
-                                 factory="crosssections"/>
+                                 ids="{$prot_id}"
+                                 factory="crosssections" out="{$OUT}"/>
                 </dc:for-each>
               </dc:context>
             </cross_sections>
@@ -497,8 +497,8 @@
                 </dc:statement>
                 <dc:for-each>
                   <hyk name="{$hyk_description}" 
-                    ids="{$hyk_id}:OUT={$OUT}"
-                    factory="hyk"/>
+                    ids="{$hyk_id}"
+                    factory="hyk" out="{$OUT}"/>
                 </dc:for-each>
               </dc:context></hyks>
           </dc:call-macro>
@@ -515,8 +515,8 @@
                 </dc:statement>
                 <dc:for-each>
                   <flow_velocity_measurement name="{$fvmd}"
-                                             ids="{$fvmid}:OUT={$OUT}"
-                                             factory="flowvelocity">
+                                             ids="{$fvmid}"
+                                             factory="flowvelocity" out="{$OUT}">
                     <dc:context>
                       <dc:statement>
                         SELECT id, description, station, datetime, v, w, q
@@ -526,8 +526,8 @@
                       </dc:statement>
                       <dc:for-each>
                         <measurement_value name="{$description} - {$station} - {$datetime}"
-                                           ids="{$id}:OUT={$OUT}"
-                                           factory="flowvelocity"/>
+                                           ids="{$id}"
+                                           factory="flowvelocity" out="{$OUT}"/>
                       </dc:for-each>
                     </dc:context>
                   </flow_velocity_measurement>
@@ -547,8 +547,8 @@
                   FROM bed_height_single WHERE river_id = ${river_id}
               </dc:statement>
               <dc:for-each>
-                <height factory="bedheight"
-                        ids="bedheight-singlevalues-{$bedh_id}-{$bedh_year}:OUT={$OUT}"
+                <height factory="bedheight" out="{$OUT}"
+                        ids="bedheight-singlevalues-{$bedh_id}-{$bedh_year}"
                         description="{$bedh_descr}"/>
               </dc:for-each>
             </dc:context>
@@ -573,7 +573,7 @@
                   </dc:statement>
                   <dc:for-each>
                     <morphologic-width name="{$from} - {$to}"
-                                       ids="{$width_id}:OUT={$OUT}"
+                                       ids="{$width_id}"
                                        factory="morph-width"/>
                   </dc:for-each>
                 </dc:context>
@@ -607,10 +607,10 @@
                 <dc:for-each>
                   <gauge name="{$gauge_name}"
                     db-id="{$gauge_id}"
-                    factory="gaugedischarge"
+                    factory="gaugedischarge" out="{$OUT}"
                     from="{$g_start}"
                     to="{$g_stop}"
-                    ids="{$gauge_name}:OUT={$OUT}"/>
+                    ids="{$gauge_name}"/>
                 </dc:for-each>
               </dc:context>
             </discharge_table_gauge>
@@ -629,10 +629,10 @@
                 <dc:for-each>
                   <gauge name="{$gauge_name}"
                     db-id="{$gauge_id}"
-                    factory="gaugedischarge"
+                    factory="gaugedischarge" out="{$OUT}"
                     from="{$g_start}"
                     to="{$g_stop}"
-                    ids="{$gauge_name}:OUT={$OUT}"/>
+                    ids="{$gauge_name}"/>
                   <dc:comment>
                     <!--
                     <gauge>
@@ -652,9 +652,10 @@
                           <historical>
                             <dc:attribute name="name" value="${gauge_desc}"/>
                             <dc:attribute name="factory" value="gaugedischarge"/>
+                            <dc:attribute name="out" value="${out}"/>
                             <dc:attribute name="from" value="${g_start}"/>
                             <dc:attribute name="to" value="${g_stop}"/>
-                            <dc:attribute name="ids" value="${discharge_id}-${g_start}-${g_stop}:OUT=${out}"/>
+                            <dc:attribute name="ids" value="${discharge_id}-${g_start}-${g_stop}"/>
                           </historical>
                         </dc:for-each>
                       </dc:context>
@@ -679,10 +680,10 @@
                 <dc:for-each>
                   <gauge name="{$gauge_name}"
                          db-id="{$gauge_id}"
-                         factory="gaugedischarge"
+                         factory="gaugedischarge" out="{$OUT}"
                          from="{$g_start}"
                          to="{$g_stop}"
-                         ids="{$gauge_name}:OUT={$OUT}"/>
+                         ids="{$gauge_name}"/>
                 </dc:for-each>
               </dc:context>
             </discharge_table_gauge>
@@ -931,10 +932,10 @@
                FIXME: Following two macros look identical to me.
             </dc:comment>
             <kilometrage>
-              <riveraxis factory="riveraxis" ids="{$river_id}:OUT={$OUT}"/>
+              <riveraxis factory="riveraxis" out="{$OUT}" ids="{$river_id}"/>
             </kilometrage>
             <rastermap>
-              <background factory="wmsbackground" ids="{$river_id}:OUT={$OUT}"/>
+              <background factory="wmsbackground" out="{$OUT}" ids="{$river_id}"/>
             </rastermap>
           </dc:macro>
 
@@ -959,8 +960,8 @@
                          WHERE d.river_id = ${river_id}
                 </dc:statement>
                 <dc:for-each>
-                  <dem factory="demfactory" 
-                    ids="{$dem_id}:OUT={$OUT}"
+                  <dem factory="demfactory" 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)}"/>
                 </dc:for-each>
@@ -972,7 +973,7 @@
             <dc:macro name="durchlass_damm_graben">
               <dc:macro name="ddg_factory">
                 <dc:for-each>
-                  <hws factory="hwsfactory" name="{$hws_name}"/>
+                  <hws factory="hwsfactory" out="{$OUT}" name="{$hws_name}"/>
                 </dc:for-each>
               </dc:macro>
 
@@ -1054,7 +1055,7 @@
                 SELECT DISTINCT 1 FROM river_axes_km WHERE river_id = ${river_id}
               </dc:statement>
                <dc:for-each>
-                  <kilometrage factory="wmskmfactory" ids="{$river_id}:OUT={$OUT}"/>
+                  <kilometrage factory="wmskmfactory" out="{$OUT}" ids="{$river_id}"/>
               </dc:for-each>
             </dc:context>
           </dc:macro>
@@ -1074,8 +1075,8 @@
               <dc:if test="dc:has-result()">
                 <dc:for-each>
                   <actual description="{$kind_name}"
-                          factory="wmsqpsfactory"
-                          ids="{$river_id};{$kind_name};{$kind_id}:OUT={$OUT}"/>
+                          factory="wmsqpsfactory" out="{$OUT}"
+                          ids="{$river_id};{$kind_name};{$kind_id}"/>
                 </dc:for-each>
               </dc:if>
             </dc:context>
@@ -1095,8 +1096,8 @@
                 <other>
                   <dc:for-each>
                     <misc-qps description="{$layer_name}"
-                              factory="wmsqpsfactory"
-                              ids="{$river_id};{$layer_name};{$kind_id}:OUT={$OUT}"/>
+                              factory="wmsqpsfactory" out="{$OUT}"
+                              ids="{$river_id};{$layer_name};{$kind_id}"/>
                   </dc:for-each>
                 </other>
               </dc:if>
@@ -1117,8 +1118,8 @@
               <dc:if test="dc:has-result()">
                 <dc:for-each>
                   <actual description="{$kind_name}"
-                    ids="{$river_id};{$kind_name};{$kind_id}:OUT={$OUT}"
-                          factory="riveraxis"/>
+                    ids="{$river_id};{$kind_name};{$kind_id}"
+                          factory="riveraxis" out="{$OUT}"/>
                 </dc:for-each>
               </dc:if>
             </dc:context>
@@ -1137,8 +1138,8 @@
                 <other>
                   <dc:for-each>
                     <misc-axis description="{$layer_name}"
-                               ids="{$river_id};{$layer_name};{$kind_id}:OUT={$OUT}"
-                               factory="riveraxis"/>
+                               ids="{$river_id};{$layer_name};{$kind_id}"
+                               factory="riveraxis" out="{$OUT}"/>
                   </dc:for-each>
                 </other>
               </dc:if>
@@ -1155,8 +1156,8 @@
                 AND kind = 2
               </dc:statement>
               <dc:for-each>
-                <line factory="wmshydrboundariesfactory" 
-                      ids="{$river_id};{$name};2:OUT={$OUT}"
+                <line factory="wmshydrboundariesfactory" out="{$OUT}" 
+                      ids="{$river_id};{$name};2"
                       name="{$name}"/>
               </dc:for-each>
             </dc:context>
@@ -1169,8 +1170,8 @@
                 AND kind = 2
               </dc:statement>
               <dc:for-each>
-                <line factory="wmshydrboundariespolyfactory"
-                      ids="{$river_id};{$name};2:OUT={$OUT}"
+                <line factory="wmshydrboundariespolyfactory" out="{$OUT}"
+                      ids="{$river_id};{$name};2"
                       name="{$name}"/>
               </dc:for-each>
             </dc:context>
@@ -1189,8 +1190,8 @@
               <dc:if test="dc:has-result()">
                 <lines>
                   <dc:for-each>
-                    <line factory="wmshydrboundariesfactory"
-                          ids="{$river_id};{$name};1:OUT={$OUT}"
+                    <line factory="wmshydrboundariesfactory" out="{$OUT}"
+                          ids="{$river_id};{$name};1"
                           name="{$name}"/>
                   </dc:for-each>
                 </lines>
@@ -1213,8 +1214,8 @@
                 <sobek_areas>
                   <dc:for-each>
                     <boundary name="{$sectie}"
-                              factory="wmshydrboundariespolyfactory"
-                              ids="{$river_id};{$sectie};1;{$sectie_id};-1:OUT={$OUT}"/>
+                              factory="wmshydrboundariespolyfactory" out="{$OUT}"
+                              ids="{$river_id};{$sectie};1;{$sectie_id};-1"/>
                   </dc:for-each>
                 </sobek_areas>
               </dc:if>
@@ -1233,8 +1234,8 @@
                 <sobek_flooded>
                   <dc:for-each>
                     <boundary name="{$sobek}"
-                              factory="wmshydrboundariespolyfactory"
-                              ids="{$river_id};{$sobek};1;-1;{$sobek_id}:OUT={$OUT}"/>
+                              factory="wmshydrboundariespolyfactory" out="{$OUT}"
+                              ids="{$river_id};{$sobek};1;-1;{$sobek_id}"/>
                   </dc:for-each>
                 </sobek_flooded>
               </dc:if>
@@ -1251,8 +1252,8 @@
               </dc:statement>
               <dc:for-each>
                 <boundary name="{$name}"
-                          factory="wmshydrboundariespolyfactory"
-                          ids="{$river_id};{$name}:OUT={$OUT}"/>
+                          factory="wmshydrboundariespolyfactory" out="{$OUT}"
+                          ids="{$river_id};{$name}"/>
               </dc:for-each>
             </dc:context>
           </dc:macro>
@@ -1283,9 +1284,9 @@
                 </dc:statement>
                 <dc:if test="dc:has-result()">
                   <dc:for-each>
-                    <floody factory="wmsfloodplainfactory"
+                    <floody factory="wmsfloodplainfactory" out="{$OUT}"
                       description="{$kind_name}"
-                      ids="{$river_id};{$kind_name};{$kind_id}:OUT={$OUT}"/>
+                      ids="{$river_id};{$kind_name};{$kind_id}"/>
                   </dc:for-each>
                 </dc:if>
               </dc:context>
@@ -1303,9 +1304,9 @@
                 <dc:if test="dc:has-result()">
                   <other>
                     <dc:for-each>
-                      <floody factory="wmsfloodplainfactory"
+                      <floody factory="wmsfloodplainfactory" out="{$OUT}"
                         description="{$layer_name}"
-                        ids="{$river_id};{$layer_name};{$kind_id}:OUT={$OUT}"/>
+                        ids="{$river_id};{$layer_name};{$kind_id}"/>
                     </dc:for-each>
                   </other>
                 </dc:if>
@@ -1321,8 +1322,8 @@
 
             <dc:macro name="hwslines_by_kind_factory">
               <dc:for-each>
-                <hws factory="wmshwslinesfactory"
-                     ids="{$river_id};{$hws_name}:OUT={$OUT}"
+                <hws factory="wmshwslinesfactory" out="{$OUT}"
+                     ids="{$river_id};{$hws_name}"
                      name="{$hws_name}"/>
               </dc:for-each>
             </dc:macro>
@@ -1452,8 +1453,8 @@
 
             <dc:macro name="hwspoints_by_kind_factory">
               <dc:for-each>
-                <hws factory="wmshwspointsfactory"
-                     ids="{$river_id};{$hws_name}:OUT={$OUT}"
+                <hws factory="wmshwspointsfactory" out="{$OUT}"
+                     ids="{$river_id};{$hws_name}"
                      name="{$hws_name}"/>
               </dc:for-each>
             </dc:macro>
@@ -1588,8 +1589,8 @@
               </dc:statement>
               <dc:for-each>
                 <buildings description="{$building_kind}"
-                           factory="wmsbuildingsfactory"
-                           ids="{$river_id};{$building_kind};{$building_kind_id}:OUT={$OUT}"/>
+                           factory="wmsbuildingsfactory" out="{$OUT}"
+                           ids="{$river_id};{$building_kind};{$building_kind_id}"/>
               </dc:for-each>
             </dc:context>
             <dc:context>
@@ -1607,8 +1608,8 @@
                 <other>
                   <dc:for-each>
                     <buildings description="{$building_name}"
-                      factory="wmsbuildingsfactory"
-                      ids="{$river_id};{$building_name}:OUT={$OUT}"/>
+                      factory="wmsbuildingsfactory" out="{$OUT}"
+                      ids="{$river_id};{$building_name}"/>
                   </dc:for-each>
                 </other>
               </dc:if>
@@ -1626,8 +1627,8 @@
                 <jetties>
                   <dc:for-each>
                     <jetty description="{$jetty_kind}"
-                           factory="wmsjettiesfactory"
-                           ids="{$river_id};{$jetty_kind};{$jetty_kind_id}:OUT={$OUT}"/>
+                           factory="wmsjettiesfactory" out="{$OUT}"
+                           ids="{$river_id};{$jetty_kind};{$jetty_kind_id}"/>
                   </dc:for-each>
                 </jetties>
               </dc:if>
@@ -1641,17 +1642,17 @@
                 FROM fixpoints WHERE river_id = ${river_id} GROUP BY name
               </dc:statement>
               <dc:for-each>
-                <fixpoints factory="wmsfixpointsfactory"
-                  ids="{$river_id};{$name}:OUT={$OUT}"/>
+                <fixpoints factory="wmsfixpointsfactory" out="{$OUT}"
+                  ids="{$river_id};{$name}"/>
               </dc:for-each>
             </dc:context>
           </dc:macro>
 
           <dc:macro name="flood-map-gaugelocations">
-            <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV):OUT={$OUT}"/>
-            <gauge_names factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV):OUT={$OUT}"/>
-            <gauge_level factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV):OUT={$OUT}"/>
-            <gauge_tendency factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV):OUT={$OUT}"/>
+            <gauge_points factory="externalwmsfactory" out="{$OUT}" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)"/>
+            <gauge_names factory="externalwmsfactory" out="{$OUT}" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV)"/>
+            <gauge_level factory="externalwmsfactory" out="{$OUT}" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV)"/>
+            <gauge_tendency factory="externalwmsfactory" out="{$OUT}" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV)"/>
           </dc:macro>
 
           <dc:macro name="flood-map-uesk">
@@ -1678,8 +1679,8 @@
                           <dc:if test="dc:has-result()">
                             <bfg>
                               <dc:for-each>
-                                <floodmaps factory="wmsfloodmapsfactory"
-                                  ids="{$river_id};{$name}:OUT={$OUT}"
+                                <floodmaps factory="wmsfloodmapsfactory" out="{$OUT}"
+                                  ids="{$river_id};{$name}"
                                   name="{$name}"/>
                               </dc:for-each>
                             </bfg>
@@ -1694,8 +1695,8 @@
                           <dc:if test="dc:has-result()">
                             <federal>
                               <dc:for-each>
-                                <floodmaps factory="wmsfloodmapsfactory"
-                                  ids="{$river_id};{$name}:OUT={$OUT}"
+                                <floodmaps factory="wmsfloodmapsfactory" out="{$OUT}"
+                                  ids="{$river_id};{$name}"
                                   name="{$name}"/>
                               </dc:for-each>
                             </federal>
@@ -1720,8 +1721,8 @@
                           <dc:if test="dc:has-result()">
                             <bfg>
                               <dc:for-each>
-                                <floodmaps factory="wmsfloodmapsfactory"
-                                  ids="{$river_id};{$name}:OUT={$OUT}"
+                                <floodmaps factory="wmsfloodmapsfactory" out="{$OUT}"
+                                  ids="{$river_id};{$name}"
                                   name="{$name}"/>
                               </dc:for-each>
                             </bfg>
@@ -1737,8 +1738,8 @@
                           <dc:if test="dc:has-result()">
                             <federal>
                               <dc:for-each>
-                                <floodmaps factory="wmsfloodmapsfactory"
-                                  ids="{$river_id};{$name}:OUT={$OUT}"
+                                <floodmaps factory="wmsfloodmapsfactory" out="{$OUT}"
+                                  ids="{$river_id};{$name}"
                                   name="{$name}"/>
                               </dc:for-each>
                             </federal>
@@ -1768,8 +1769,8 @@
                               ${source}
                             </dc:statement>
                             <dc:for-each>
-                              <floodmaps factory="wmsfloodmapsfactory"
-                                ids="{$river_id};{$name}:OUT={$OUT}"
+                              <floodmaps factory="wmsfloodmapsfactory" out="{$OUT}"
+                                ids="{$river_id};{$name}"
                                 name="{$name}"/>
                             </dc:for-each>
                           </dc:context>
@@ -1806,8 +1807,8 @@
                 <floodmarks>
                   <dc:for-each>
                     <floodmark name="{$year}"
-                      factory="wmsfloodmarkfactory"
-                      ids="{$river_id};{$year};{$year}:OUT={$OUT}"/>
+                      factory="wmsfloodmarkfactory" out="{$OUT}"
+                      ids="{$river_id};{$year};{$year}"/>
                   </dc:for-each>
                 </floodmarks>
               </dc:if>
@@ -1819,8 +1820,8 @@
               <dc:call-macro name="flood-map-buildings"/>
           </buildings>
           <catchments>
-              <catchment_wms factory="externalwmsfactory"
-                  ids="http://geoportal.bafg.de/wmsproxy/INSPIRE/DrainageBasin;HY.PHYSICALWATERS.CATCHMENTS;Einzugsgebiete (WMS):OUT={$OUT}" />
+              <catchment_wms factory="externalwmsfactory" out="{$OUT}"
+                  ids="http://geoportal.bafg.de/wmsproxy/INSPIRE/DrainageBasin;HY.PHYSICALWATERS.CATCHMENTS;Einzugsgebiete (WMS)" />
               <gaugelocations>
                   <dc:call-macro name="flood-map-gaugelocations"/>
               </gaugelocations>
@@ -1852,8 +1853,8 @@
                 FROM bed_height_single WHERE river_id = ${river_id}
               </dc:statement>
               <dc:for-each>
-                <height factory="bedheight"
-                        ids="bedheight-single-{$bedh_id}-{$bedh_year}:OUT={$OUT}"
+                <height factory="bedheight" out="{$OUT}"
+                        ids="bedheight-single-{$bedh_id}-{$bedh_year}"
                         description="{$bedh_descr}"/>
               </dc:for-each>
             </dc:context>
@@ -1870,8 +1871,8 @@
                 FROM bed_height_epoch WHERE river_id = ${river_id}
               </dc:statement>
               <dc:for-each>
-                <height factory="bedheight"
-                        ids="bedheight-epoch-{$bedh_id}-{$bedh_interval_id}:OUT={$OUT}"
+                <height factory="bedheight" out="{$OUT}"
+                        ids="bedheight-epoch-{$bedh_id}-{$bedh_interval_id}"
                         description="{$bedh_descr}"/>
               </dc:for-each>
             </dc:context>
@@ -1966,8 +1967,9 @@
                         <dc:for-each>
                           <dc:element name="${olname}">
                             <dc:attribute name="name" value="${olname}"/>
-                            <dc:attribute name="ids" value="additionals-wstv-${wstcolpos}-${wstid}:OUT=${out}"/>
+                            <dc:attribute name="ids" value="additionals-wstv-${wstcolpos}-${wstid}"/>
                             <dc:attribute name="factory" value="staticwkms"/>
+                            <dc:attribute name="out" value="${out}"/>
                           </dc:element>
                         </dc:for-each>
                       </dc:context>
@@ -1997,8 +1999,9 @@
                           <dc:element name="${facet_name}">
                             <dc:attribute name="description" value="${facet_description}"/>
                             <dc:attribute name="factory" value="winfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                             <dc:attribute name="artifact-id" value="${aid}"/>
-                            <dc:attribute name="ids" value="${aid}:OUT=${out}"/>
+                            <dc:attribute name="ids" value="${aid}"/>
                             <dc:attribute name="out" value="w_differences"/>
                           </dc:element>
                         </dc:for-each>
@@ -2028,8 +2031,9 @@
                           <dc:element name="${facet_name}">
                             <dc:attribute name="description" value="${facet_description}"/>
                             <dc:attribute name="factory" value="winfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                             <dc:attribute name="artifact-id" value="${aid}"/>
-                            <dc:attribute name="ids" value="${aid}:OUT=${out}"/>
+                            <dc:attribute name="ids" value="${aid}"/>
                             <dc:attribute name="out" value="reference_curve"/>
                           </dc:element>
                         </dc:for-each>
@@ -2059,8 +2063,9 @@
                           <dc:element name="${facet_name}">
                             <dc:attribute name="description" value="${facet_description}"/>
                             <dc:attribute name="factory" value="winfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                             <dc:attribute name="artifact-id" value="${aid}"/>
-                            <dc:attribute name="ids" value="${aid}:OUT=${out}"/>
+                            <dc:attribute name="ids" value="${aid}"/>
                             <dc:attribute name="out" value="computed_discharge_curve"/>
                           </dc:element>
                         </dc:for-each>
@@ -2098,8 +2103,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}"/>
                                   <dc:attribute name="factory" value="winfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="artifact-id" value="${a_gid}"/>
                                   <dc:attribute name="out" value="cross_section"/>
                                 </dc:element>
@@ -2137,8 +2143,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}"/>
                                   <dc:attribute name="factory" value="winfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="artifact-id" value="${a_gid}"/>
                                   <dc:attribute name="out" value="longitudinal_section"/>
                                 </dc:element>
@@ -2181,8 +2188,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}"/>
                                   <dc:attribute name="factory" value="fixanalysis"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="artifact-id" value="${a_gid}"/>
                                   <dc:attribute name="out" value="fix_longitudinal_section_curve"/>
                                 </dc:element>
@@ -2225,8 +2233,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}"/>
                                   <dc:attribute name="factory" value="fixanalysis"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="artifact-id" value="${a_gid}"/>
                                   <dc:attribute name="out" value="fix_deltawt_curve"/>
                                 </dc:element>
@@ -2266,8 +2275,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}"/>
                                   <dc:attribute name="factory" value="fixanalysis"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="artifact-id" value="${a_gid}"/>
                                   <dc:attribute name="out" value="fix_deltawt_curve"/>
                                 </dc:element>
@@ -2305,8 +2315,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}"/>
                                   <dc:attribute name="factory" value="fixanalysis"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="artifact-id" value="${a_gid}"/>
                                   <dc:attribute name="out" value="fix_derivate_curve"/>
                                 </dc:element>
@@ -2348,8 +2359,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}"/>
                                   <dc:attribute name="factory" value="fixanalysis"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="artifact-id" value="${a_gid}"/>
                                   <dc:attribute name="out" value="fix_wq_curve"/>
                                 </dc:element>
@@ -2387,8 +2399,9 @@
                           <dc:element name="${facet_name}">
                             <dc:attribute name="description" value="${facet_description}"/>
                             <dc:attribute name="factory" value="winfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                             <dc:attribute name="artifact-id" value="${aid}"/>
-                            <dc:attribute name="ids" value="${aid}:OUT=${out}"/>
+                            <dc:attribute name="ids" value="${aid}"/>
                             <dc:attribute name="out" value="duration_curve"/>
                           </dc:element>
                         </dc:for-each>
@@ -2428,8 +2441,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}"/>
                                   <dc:attribute name="factory" value="winfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="artifact-id" value="${a_gid}"/>
                                   <dc:attribute name="out" value="longitudinal_section"/>
                                 </dc:element>
@@ -2470,8 +2484,9 @@
                           <dc:element name="${facet_name}">
                             <dc:attribute name="description" value="${facet_description}"/>
                             <dc:attribute name="factory" value="winfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                             <dc:attribute name="artifact-id" value="${aid}"/>
-                            <dc:attribute name="ids" value="${aid}:OUT=${out}"/>
+                            <dc:attribute name="ids" value="${aid}"/>
                             <dc:attribute name="out" value="floodmap"/>
                           </dc:element>
                         </dc:for-each>
@@ -2507,8 +2522,9 @@
                       <dc:for-each>
                         <dc:element name="${facet_name}">
                           <dc:attribute name="description" value="${facet_description}"/>
-                          <dc:attribute name="ids" value="${facet_num}:OUT=${out}"/>
+                          <dc:attribute name="ids" value="${facet_num}"/>
                           <dc:attribute name="factory" value="winfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                           <dc:attribute name="artifact-id" value="${a_gid}"/>
                           <dc:attribute name="out" value="floodmap"/>
                         </dc:element>
@@ -2552,8 +2568,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="factory" value="minfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                                   <dc:attribute name="artifact-id" value="${aid}"/>
                                   <dc:attribute name="out" value="bed_longitudinal_section"/>
                                 </dc:element>
@@ -2600,8 +2617,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="factory" value="minfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                                   <dc:attribute name="artifact-id" value="${aid}"/>
                                   <dc:attribute name="out" value="bed_longitudinal_section"/>
                                 </dc:element>
@@ -2649,8 +2667,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="factory" value="minfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                                   <dc:attribute name="artifact-id" value="${aid}"/>
                                   <dc:attribute name="out" value="bed_longitudinal_section"/>
                                 </dc:element>
@@ -2698,8 +2717,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="factory" value="minfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                                   <dc:attribute name="artifact-id" value="${aid}"/>
                                   <dc:attribute name="out" value="bed_longitudinal_section"/>
                                 </dc:element>
@@ -2748,8 +2768,9 @@
                             <dc:for-each>
                               <dc:element name="${facet_name}">
                                 <dc:attribute name="factory" value="minfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                 <dc:attribute name="description" value="${facet_description}"/>
-                                <dc:attribute name="ids" value="${facet_num}-${facet_name}:OUT=${out}"/>
+                                <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                                 <dc:attribute name="artifact-id" value="${aid}"/>
                                 <dc:attribute name="out" value="flow_velocity"/>
                               </dc:element>
@@ -2794,8 +2815,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="factory" value="minfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                                   <dc:attribute name="artifact-id" value="${aid}"/>
                                   <dc:attribute name="out" value="sedimentload_ls"/>
                                 </dc:element>
@@ -2844,8 +2866,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="factory" value="minfo"/>
+<!--                            <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                                   <dc:attribute name="artifact-id" value="${aid}"/>
                                   <dc:choose>
                                     <dc:when test="dc:contains($o_name, 'bed_difference_year')">
@@ -2898,8 +2921,9 @@
                               <dc:for-each>
                                 <dc:element name="${facet_name}">
                                   <dc:attribute name="factory" value="winfo"/>
+<!--                                  <dc:attribute name="out" value="${out}"/>-->
                                   <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}:OUT=${out}"/>
+                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                                   <dc:attribute name="artifact-id" value="${aid}"/>
                                   <dc:attribute name="out" value="longitudinal_section"/>
                                 </dc:element>
http://dive4elements.wald.intevation.org