Mercurial > dive4elements > river

comparison flys-artifacts/doc/conf/meta-data.xml @ 5758:c59ba0eade8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added new macro for deltaW ls and removed the old one. Use the new macro in bed differences.
author Raimund Renkert <rrenkert@intevation.de>
date Thu, 18 Apr 2013 11:51:53 +0200
parents 1dab240f9f55
children dc5f81885918
comparison
equal deleted inserted replaced
5757:036d5591e65d 5758:c59ba0eade8e
2231 </dc:context> 2231 </dc:context>
2232 </dc:for-each> 2232 </dc:for-each>
2233 </waterlevels> 2233 </waterlevels>
2234 </dc:macro> 2234 </dc:macro>
2235 2235
2236 <dc:macro name="delta-wt-ls">
2237 <waterlevels>
2238 <dc:for-each>
2239 <dc:context>
2240 <dc:call-macro name="range-filter">
2241 <dc:context>
2242 <dc:statement>
2243 SELECT id AS out_id
2244 FROM outs
2245 WHERE artifact_id = ${a_id} AND name = 'fix_deltawt_curve'
2246 </dc:statement>
2247 <dc:for-each>
2248 <dc:context>
2249 <dc:statement>
2250 SELECT name AS facet_name, num AS facet_num, description AS facet_description
2251 FROM facets
2252 WHERE out_id = ${out_id} and (
2253 name LIKE 'fix_sector_average_dwt%' OR
2254 name LIKE 'fix_deviation_dwt%')
2255 ORDER BY num ASC, name DESC
2256 </dc:statement>
2257 <waterlevels description="{$river} {$a_creation} {$collection_name}">
2258 <dc:for-each>
2259 <dc:element name="${facet_name}">
2260 <dc:attribute name="description" value="${facet_description}"/>
2261 <dc:attribute name="ids" value="${facet_num}"/>
2262 <dc:attribute name="factory" value="fixanalysis"/>
2263 <dc:attribute name="artifact-id" value="${a_gid}"/>
2264 <dc:attribute name="out" value="fix_deltawt_curve"/>
2265 </dc:element>
2266 </dc:for-each>
2267 </waterlevels>
2268 </dc:context>
2269 </dc:for-each>
2270 </dc:context>
2271 </dc:call-macro>
2272 </dc:context>
2273 </dc:for-each>
2274 </waterlevels>
2275 </dc:macro>
2276
2236 <dc:macro name="fix-derivate-curve"> 2277 <dc:macro name="fix-derivate-curve">
2237 <waterlevels> 2278 <waterlevels>
2238 <dc:for-each> 2279 <dc:for-each>
2239 <dc:context> 2280 <dc:context>
2240 <dc:call-macro name="range-filter"> 2281 <dc:call-macro name="range-filter">
2429 </dc:context> 2470 </dc:context>
2430 </dc:call-macro> 2471 </dc:call-macro>
2431 </dc:context> 2472 </dc:context>
2432 </dc:for-each> 2473 </dc:for-each>
2433 </floodmap> 2474 </floodmap>
2434 </dc:macro>
2435
2436 <dc:comment>
2437 MINFO bedheight difference
2438 </dc:comment>
2439
2440 <dc:macro name="bed-difference">
2441 <fix_longitudinal_section_curve>
2442 <dc:for-each>
2443 <dc:context>
2444 <dc:call-macro name="range-filter">
2445 <dc:context>
2446 <dc:statement>
2447 SELECT a.gid AS aid,
2448 f.id AS fid,
2449 f.name AS facet_name,
2450 f.num AS facet_num,
2451 f.description AS facet_description
2452 FROM outs AS o, facets AS f, artifacts AS a
2453 WHERE (
2454 f.name = 'fix_sector_average_ls_0' OR
2455 f.name = 'fix_sector_average_ls_1' OR
2456 f.name = 'fix_sector_average_ls_2' OR
2457 f.name = 'fix_sector_average_ls_3' OR
2458 f.name = 'fix_analysis_events_ls' OR
2459 f.name = 'fix_reference_events_ls'
2460 ) AND f.out_id = o.id AND o.artifact_id = ${a_id} AND a.id = ${a_id}
2461 </dc:statement>
2462 <fix_longitudinal_section_curve description="{$river} {$a_creation} {$collection_name}">
2463 <dc:for-each>
2464 <dc:element name="${facet_name}">
2465 <dc:attribute name="description" value="${facet_description}"/>
2466 <dc:attribute name="factory" value="fixanalysis"/>
2467 <dc:attribute name="artifact-id" value="${aid}"/>
2468 <dc:attribute name="ids" value="${facet_num}"/>
2469 <dc:attribute name="out" value="fix_longitudinal_section_curve"/>
2470 </dc:element>
2471 </dc:for-each>
2472 </fix_longitudinal_section_curve>
2473 </dc:context>
2474 </dc:call-macro>
2475 </dc:context>
2476 </dc:for-each>
2477 </fix_longitudinal_section_curve>
2478 </dc:macro> 2475 </dc:macro>
2479 2476
2480 <dc:comment> 2477 <dc:comment>
2481 MINFO bedheight middle 2478 MINFO bedheight middle
2482 </dc:comment> 2479 </dc:comment>
3058 dc:contains($artifact-outs, 'bed_difference_epoch')"> 3055 dc:contains($artifact-outs, 'bed_difference_epoch')">
3059 <dc:call-macro name="waterlevels-discharge"/> 3056 <dc:call-macro name="waterlevels-discharge"/>
3060 <dc:call-macro name="bedheight-differences"/> 3057 <dc:call-macro name="bedheight-differences"/>
3061 <dc:call-macro name="differences"/> 3058 <dc:call-macro name="differences"/>
3062 <dc:call-macro name="waterlevels-fix"/> 3059 <dc:call-macro name="waterlevels-fix"/>
3060 <dc:call-macro name="delta-wt-ls"/>
3063 </dc:if> 3061 </dc:if>
3064 </dc:context> 3062 </dc:context>
3065 </dc:call-macro> 3063 </dc:call-macro>
3066 3064
3067 </old_calculations> 3065 </old_calculations>
http://dive4elements.wald.intevation.org