changeset 6616:03cc3bc74964

Merged.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 19 Jul 2013 06:56:30 +0200
parents 61dc90b2fbe2 (diff) 764371d4db6a (current diff)
children 67b4728723df
files
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml	Thu Jul 18 17:56:38 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri Jul 19 06:56:30 2013 +0200
@@ -731,9 +731,12 @@
 
     <dc:comment comment="For building differences." />
     <dc:macro name="differenceable-fix">
-      <beddifferences>
-         <dc:call-macro name="bedheight_differences"/>
-      </beddifferences>
+      <dc:comment>
+        No diffs between beddiffs and others, for now.
+        <beddifferences>
+           <dc:call-macro name="bedheight_differences"/>
+        </beddifferences>
+      </dc:comment>
       <dc:comment comment="Vollmer curves need own factory"/>
       <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and (($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and
         (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location')))">
@@ -977,7 +980,7 @@
                     <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="ids" value="${facet_num}"/>
                     <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="${out_name}"/>
                   </dc:element>

http://dive4elements.wald.intevation.org