diff artifacts/doc/conf/meta-data.xml @ 8101:54dfdba4c4c5

Distinction by measurement station gives lots of duplicates, as we always get a whole longitudinal section.
author "Tom Gottfried <tom@intevation.de>"
date Tue, 19 Aug 2014 18:46:13 +0200
parents 1d2a9c5ee97b
children 9ff5fd9bccfa
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml	Fri Aug 15 18:56:02 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Tue Aug 19 18:46:13 2014 +0200
@@ -1407,22 +1407,22 @@
       </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: Needs the kind 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}"
+      <year description="{$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:comment> TODO aheinecke: Needs 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}"
+      <year description="{$syear}-{$eyear}"
             factory="sedimentload"
             target_out="{$out}"
             info="{$description}"
@@ -1478,8 +1478,7 @@
                     sy.id          AS syid,
                     sy.description AS description,
                     ti.start_time  AS year,
-                    gf.name        AS fraction,
-                    ms.name        AS station_name
+                    gf.name        AS fraction
                 FROM     sediment_load sy
                     JOIN sediment_load_values syv
                         ON sy.id = syv.sediment_load_id
@@ -1506,7 +1505,6 @@
                     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

http://dive4elements.wald.intevation.org