[PATCH 7 of 9] Change sedimentload factory from yields to loads

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1408119895 -7200
# Node ID 1d2a9c5ee97b2edad21a12882da174b35d90df5b
# Parent  7b062d9b8e1b8e681a54b6fcf93fe8a8bc67ed80
Change sedimentload factory from yields to loads.

diff -r 7b062d9b8e1b -r 1d2a9c5ee97b artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Fri Aug 15 18:21:10 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri Aug 15 18:24:55 2014 +0200
@@ -1316,7 +1316,7 @@
             <dc:call-macro name="basedata_6_delta_w"/>
             <dc:call-macro name="basedata_7_waterlevels"/>
           </fixanalysis>
-          <dc:call-macro name="yields"/>
+          <dc:call-macro name="sedimentloads"/>
           <dc:call-macro name="densities"/>
           <dc:call-macro name="minfo-heights"/>
           <dc:call-macro name="sounding-width"/>
@@ -1407,23 +1407,47 @@
       </densities>
     </dc:macro>
 
+    <dc:comment> TODO aheinecke: This is a load of data. Needs grouping desperately. And te kidn in the ids;2 field </dc:comment>
+    <dc:comment> TODO aheinecke: Does seperation by Id even make sense here? Is not a year filter required?</dc:comment>
+    <dc:macro name="one-load">
+      <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $year)"/>
+      <year description="{$station_name} - {$syear}"
+            factory="sedimentload"
+            target_out="{$out}"
+            info="{$description}"
+            ids="{$syid};{$station_name} - {$syear}" />
+    </dc:macro>
+
+    <dc:comment> TODO aheinecke: This is a load of data. Needs grouping desperately. And the kind in the name</dc:comment>
+    <dc:macro name="epoch-load">
+      <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $startyear)"/>
+      <dc:variable name="eyear" type="string" expr="dc:date-format('yyyy', $endyear)"/>
+      <year description="{$station_name} - {$syear}-{$eyear}"
+            factory="sedimentload"
+            target_out="{$out}"
+            info="{$description}"
+            ids="{$syid};{$station_name} - {$syear}-{$eyear}" />
+    </dc:macro>
+
     <dc:macro name="one-load_ls">
       <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $year)"/>
+      <dc:comment> TODO aheinecke: Create a sedimentload_ls static facet</dc:comment>
       <year description="{$syear}"
-            factory="sedimentyield"
+            factory="sedimentload"
             target_out="{$out}"
             info="{$description}"
-            ids="{$syid}" />
+            ids="{$syid}:{$syear}" />
     </dc:macro>
 
     <dc:macro name="epoch-load_ls">
       <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $startyear)"/>
       <dc:variable name="eyear" type="string" expr="dc:date-format('yyyy', $endyear)"/>
+      <dc:comment> TODO aheinecke: Create a sedimentload_ls static facet</dc:comment>
       <year description="{$syear}-{$eyear}"
-            factory="sedimentyield"
+            factory="sedimentload"
             target_out="{$out}"
             info="{$description}"
-            ids="{$syid}" />
+            ids="{$syid};{$syear}-{$eyear}" />
     </dc:macro>
 
     <dc:macro name="loads">
@@ -1439,8 +1463,12 @@
      </dc:if>
     </dc:macro>
 
-    <dc:macro name="yields">
-      <yields>
+    <dc:macro name="sedimentloads">
+      <dc:comment>
+        This is the macro for static datacage "Sedimentloads".
+        Or "Frachten".
+      </dc:comment>
+      <sedimentloads>
         <dc:call-macro name="annotations_sediment_load_ls"/>
         <measurement_stations>
           <years>
@@ -1450,7 +1478,8 @@
                     sy.id          AS syid,
                     sy.description AS description,
                     ti.start_time  AS year,
-                    gf.name        AS fraction
+                    gf.name        AS fraction,
+                    ms.name        AS station_name
                 FROM     sediment_load sy
                     JOIN sediment_load_values syv
                         ON sy.id = syv.sediment_load_id
@@ -1477,6 +1506,7 @@
                     sy.description AS description,
                     ti.start_time  AS startyear,
                     ti.stop_time   AS endyear,
+                    ms.name        AS station_name,
                     gf.name        AS fraction
                 FROM     sediment_load sy
                     JOIN sediment_load_values syv
@@ -1546,7 +1576,7 @@
             </dc:context>
           </epochs>
         </sediment_load_ls>
-      </yields>
+      </sedimentloads>
     </dc:macro>