Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 7177:336d7690b38c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix wrong usage of a_id and add more datacage stuff to WSPL longitundinal
author Andre Heinecke <aheinecke@intevation.de>
date Thu, 26 Sep 2013 19:14:37 +0200
parents 87a7cdb6ee1e
children 851fc99be4bc
comparison
equal deleted inserted replaced
7176:1a938a5a7e21 7177:336d7690b38c
139 <dc:call-macro name="basedata_5_flood-protections"/> 139 <dc:call-macro name="basedata_5_flood-protections"/>
140 <dc:call-macro name="hyks"/> 140 <dc:call-macro name="hyks"/>
141 </dc:when> 141 </dc:when>
142 <dc:when test="$out = 'longitudinal_section'"> 142 <dc:when test="$out = 'longitudinal_section'">
143 <dc:call-macro name="longitudinal-section-prototype"/> 143 <dc:call-macro name="longitudinal-section-prototype"/>
144 <dc:call-macro name="bedheight_differences"/>
144 </dc:when> 145 </dc:when>
145 <dc:when test="$out = 'w_differences'"> 146 <dc:when test="$out = 'w_differences'">
146 <dc:call-macro name="longitudinal-section-prototype"/> 147 <dc:call-macro name="longitudinal-section-prototype"/>
147 <dc:call-macro name="bedheight_differences"/> 148 <dc:call-macro name="bedheight_differences"/>
148 </dc:when> 149 </dc:when>
352 <dc:choose> 353 <dc:choose>
353 <dc:when test="$out = 'longitudinal_section'"> 354 <dc:when test="$out = 'longitudinal_section'">
354 <dc:call-macro name="longitudinal"/> 355 <dc:call-macro name="longitudinal"/>
355 <dc:call-macro name="differences"/> 356 <dc:call-macro name="differences"/>
356 <dc:call-macro name="bedheight_differences"/> 357 <dc:call-macro name="bedheight_differences"/>
358 <dc:call-macro name="bedquality-bed"/>
359 <dc:call-macro name="bedquality-load"/>
360 <dc:call-macro name="flow-velocity"/>
361 <dc:call-macro name="sediment-load"/>
362 <dc:call-macro name="bedquality-density"/>
363 <dc:call-macro name="bedquality-porosity"/>
364 <dc:call-macro name="waterlevels-discharge"/>
365 <dc:call-macro name="differenceable-fix"/>
366 <dc:call-macro name="delta-wt-ls"/>
367 <dc:call-macro name="longitudinal-section"/>
357 </dc:when> 368 </dc:when>
358 <dc:when test="$out = 'discharge_longitudinal_section'"> 369 <dc:when test="$out = 'discharge_longitudinal_section'">
359 <dc:call-macro name="longitudinal"/> 370 <dc:call-macro name="longitudinal"/>
360 <dc:call-macro name="differences"/> 371 <dc:call-macro name="differences"/>
361 </dc:when> 372 </dc:when>
874 <dc:element name="${facet_name}"> 885 <dc:element name="${facet_name}">
875 <dc:attribute name="factory" value="minfo"/> 886 <dc:attribute name="factory" value="minfo"/>
876 <dc:attribute name="target_out" value="${out}"/> 887 <dc:attribute name="target_out" value="${out}"/>
877 <dc:attribute name="description" value="${facet_description}"/> 888 <dc:attribute name="description" value="${facet_description}"/>
878 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> 889 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
879 <dc:attribute name="artifact-id" value="${a_id}"/> 890 <dc:attribute name="artifact-id" value="${a_gid}"/>
880 <dc:attribute name="out" value="bed_longitudinal_section"/> 891 <dc:attribute name="out" value="bed_longitudinal_section"/>
881 </dc:element> 892 </dc:element>
882 </dc:for-each> 893 </dc:for-each>
883 </quality-bed> 894 </quality-bed>
884 </dc:group> 895 </dc:group>
898 <dc:element name="${facet_name}"> 909 <dc:element name="${facet_name}">
899 <dc:attribute name="factory" value="minfo"/> 910 <dc:attribute name="factory" value="minfo"/>
900 <dc:attribute name="target_out" value="${out}"/> 911 <dc:attribute name="target_out" value="${out}"/>
901 <dc:attribute name="description" value="${facet_description}"/> 912 <dc:attribute name="description" value="${facet_description}"/>
902 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> 913 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
903 <dc:attribute name="artifact-id" value="${a_id}"/> 914 <dc:attribute name="artifact-id" value="${a_gid}"/>
904 <dc:attribute name="out" value="bed_longitudinal_section"/> 915 <dc:attribute name="out" value="bed_longitudinal_section"/>
905 </dc:element> 916 </dc:element>
906 </dc:for-each> 917 </dc:for-each>
907 </quality-load> 918 </quality-load>
908 </dc:group> 919 </dc:group>
923 <dc:element name="${facet_name}"> 934 <dc:element name="${facet_name}">
924 <dc:attribute name="factory" value="minfo"/> 935 <dc:attribute name="factory" value="minfo"/>
925 <dc:attribute name="target_out" value="${out}"/> 936 <dc:attribute name="target_out" value="${out}"/>
926 <dc:attribute name="description" value="${facet_description}"/> 937 <dc:attribute name="description" value="${facet_description}"/>
927 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> 938 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
928 <dc:attribute name="artifact-id" value="${a_id}"/> 939 <dc:attribute name="artifact-id" value="${a_gid}"/>
929 <dc:attribute name="out" value="bed_longitudinal_section"/> 940 <dc:attribute name="out" value="bed_longitudinal_section"/>
930 </dc:element> 941 </dc:element>
931 </dc:for-each> 942 </dc:for-each>
932 </density> 943 </density>
933 </dc:group> 944 </dc:group>
948 <dc:element name="${facet_name}"> 959 <dc:element name="${facet_name}">
949 <dc:attribute name="factory" value="minfo"/> 960 <dc:attribute name="factory" value="minfo"/>
950 <dc:attribute name="target_out" value="${out}"/> 961 <dc:attribute name="target_out" value="${out}"/>
951 <dc:attribute name="description" value="${facet_description}"/> 962 <dc:attribute name="description" value="${facet_description}"/>
952 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> 963 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
953 <dc:attribute name="artifact-id" value="${a_id}"/> 964 <dc:attribute name="artifact-id" value="${a_gid}"/>
954 <dc:attribute name="out" value="bed_longitudinal_section"/> 965 <dc:attribute name="out" value="bed_longitudinal_section"/>
955 </dc:element> 966 </dc:element>
956 </dc:for-each> 967 </dc:for-each>
957 </porosity> 968 </porosity>
958 </dc:group> 969 </dc:group>
975 <dc:element name="${facet_name}"> 986 <dc:element name="${facet_name}">
976 <dc:attribute name="factory" value="minfo"/> 987 <dc:attribute name="factory" value="minfo"/>
977 <dc:attribute name="target_out" value="${out}"/> 988 <dc:attribute name="target_out" value="${out}"/>
978 <dc:attribute name="description" value="${facet_description}"/> 989 <dc:attribute name="description" value="${facet_description}"/>
979 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> 990 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
980 <dc:attribute name="artifact-id" value="${a_id}"/> 991 <dc:attribute name="artifact-id" value="${a_gid}"/>
981 <dc:attribute name="out" value="flow_velocity"/> 992 <dc:attribute name="out" value="flow_velocity"/>
982 </dc:element> 993 </dc:element>
983 </dc:for-each> 994 </dc:for-each>
984 </flow> 995 </flow>
985 </dc:group> 996 </dc:group>
998 <dc:element name="${facet_name}"> 1009 <dc:element name="${facet_name}">
999 <dc:attribute name="factory" value="minfo"/> 1010 <dc:attribute name="factory" value="minfo"/>
1000 <dc:attribute name="target_out" value="${out}"/> 1011 <dc:attribute name="target_out" value="${out}"/>
1001 <dc:attribute name="description" value="${facet_description}"/> 1012 <dc:attribute name="description" value="${facet_description}"/>
1002 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> 1013 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
1003 <dc:attribute name="artifact-id" value="${a_id}"/> 1014 <dc:attribute name="artifact-id" value="${a_gid}"/>
1004 <dc:attribute name="out" value="sedimentload_ls"/> 1015 <dc:attribute name="out" value="sedimentload_ls"/>
1005 </dc:element> 1016 </dc:element>
1006 </dc:for-each> 1017 </dc:for-each>
1007 </load> 1018 </load>
1008 </dc:group> 1019 </dc:group>
1037 1048
1038 <dc:macro name="waterlevels-discharge"> 1049 <dc:macro name="waterlevels-discharge">
1039 <dc:filter expr="$out_name = 'discharge_longitudinal_section' and $facet_name = 'discharge_longitudinal_section.w'"> 1050 <dc:filter expr="$out_name = 'discharge_longitudinal_section' and $facet_name = 'discharge_longitudinal_section.w'">
1040 <dc:if test="dc:has-result()"> 1051 <dc:if test="dc:has-result()">
1041 <waterlevels-discharge> 1052 <waterlevels-discharge>
1042 <dc:group expr="concat($oid, ' ', $river, ' ', $a_id, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)"> 1053 <dc:group expr="concat($oid, ' ', $river, ' ', $a_gid, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)">
1043 <discharge description="{dc:group-key()}"> 1054 <discharge description="{dc:group-key()}">
1044 <dc:for-each> 1055 <dc:for-each>
1045 <dc:element name="${facet_name}"> 1056 <dc:element name="${facet_name}">
1046 <dc:attribute name="factory" value="winfo"/> 1057 <dc:attribute name="factory" value="winfo"/>
1047 <dc:attribute name="target_out" value="${out}"/> 1058 <dc:attribute name="target_out" value="${out}"/>
1048 <dc:attribute name="description" value="${facet_description}"/> 1059 <dc:attribute name="description" value="${facet_description}"/>
1049 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> 1060 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
1050 <dc:attribute name="artifact-id" value="${a_id}"/> 1061 <dc:attribute name="artifact-id" value="${a_gid}"/>
1051 <dc:attribute name="out" value="longitudinal_section"/> 1062 <dc:attribute name="out" value="longitudinal_section"/>
1052 </dc:element> 1063 </dc:element>
1053 </dc:for-each> 1064 </dc:for-each>
1054 </discharge> 1065 </discharge>
1055 </dc:group> 1066 </dc:group>
http://dive4elements.wald.intevation.org