Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 7280:2584a114a350

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
issue1345: Factored out description creation for loads. Make epochs show end time.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 10 Oct 2013 11:27:56 +0200
parents 237d5305b1a9
children 8943ab11ed3f
comparison
equal deleted inserted replaced
7279:237d5305b1a9 7280:2584a114a350
1307 </dc:macro> 1307 </dc:macro>
1308 1308
1309 <dc:macro name="epoch-load"> 1309 <dc:macro name="epoch-load">
1310 <dc:for-each> 1310 <dc:for-each>
1311 <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $startyear)"/> 1311 <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $startyear)"/>
1312 <dc:variable name="eyear" type="string" expr="dc:date-format('yyyy', $stopyear)"/> 1312 <dc:variable name="eyear" type="string" expr="dc:date-format('yyyy', $endyear)"/>
1313 <year description="{$syear}-${eyear}" 1313 <year description="{$syear}-${eyear}"
1314 factory="sedimentyield" 1314 factory="sedimentyield"
1315 target_out="{$out}" 1315 target_out="{$out}"
1316 info="{$description}" 1316 info="{$description}"
1317 ids="{$syid}" /> 1317 ids="{$syid}" />
1321 <dc:macro name="loads"> 1321 <dc:macro name="loads">
1322 <dc:if test="dc:has-result()"> 1322 <dc:if test="dc:has-result()">
1323 <dc:filter expr="$fraction='sand'"> 1323 <dc:filter expr="$fraction='sand'">
1324 <dc:if test="dc:has-result()"> 1324 <dc:if test="dc:has-result()">
1325 <sand> 1325 <sand>
1326 <dc:call-macro name="one-load"/> 1326 <dc:macro-body/>
1327 </sand> 1327 </sand>
1328 </dc:if> 1328 </dc:if>
1329 </dc:filter> 1329 </dc:filter>
1330 <dc:filter expr="$fraction='fine_middle'"> 1330 <dc:filter expr="$fraction='fine_middle'">
1331 <dc:if test="dc:has-result()"> 1331 <dc:if test="dc:has-result()">
1332 <fine_middle> 1332 <fine_middle>
1333 <dc:call-macro name="one-load"/> 1333 <dc:macro-body/>
1334 </fine_middle> 1334 </fine_middle>
1335 </dc:if> 1335 </dc:if>
1336 </dc:filter> 1336 </dc:filter>
1337 <dc:filter expr="$fraction='coarse'"> 1337 <dc:filter expr="$fraction='coarse'">
1338 <dc:if test="dc:has-result()"> 1338 <dc:if test="dc:has-result()">
1339 <coarse> 1339 <coarse>
1340 <dc:call-macro name="one-load"/> 1340 <dc:macro-body/>
1341 </coarse> 1341 </coarse>
1342 </dc:if> 1342 </dc:if>
1343 </dc:filter> 1343 </dc:filter>
1344 <dc:filter expr="$fraction='suspended_sediment'"> 1344 <dc:filter expr="$fraction='suspended_sediment'">
1345 <dc:if test="dc:has-result()"> 1345 <dc:if test="dc:has-result()">
1346 <susp_sediment> 1346 <susp_sediment>
1347 <dc:call-macro name="one-load"/> 1347 <dc:macro-body/>
1348 </susp_sediment> 1348 </susp_sediment>
1349 </dc:if> 1349 </dc:if>
1350 </dc:filter> 1350 </dc:filter>
1351 <dc:filter expr="$fraction='susp_sand'"> 1351 <dc:filter expr="$fraction='susp_sand'">
1352 <dc:if test="dc:has-result()"> 1352 <dc:if test="dc:has-result()">
1353 <susp_sand> 1353 <susp_sand>
1354 <dc:call-macro name="one-load"/> 1354 <dc:macro-body/>
1355 </susp_sand> 1355 </susp_sand>
1356 </dc:if> 1356 </dc:if>
1357 </dc:filter> 1357 </dc:filter>
1358 <dc:filter expr="$fraction='susp_sand_bed'"> 1358 <dc:filter expr="$fraction='susp_sand_bed'">
1359 <dc:if test="dc:has-result()"> 1359 <dc:if test="dc:has-result()">
1360 <susp_sand_bed> 1360 <susp_sand_bed>
1361 <dc:call-macro name="one-load"/> 1361 <dc:macro-body/>
1362 </susp_sand_bed> 1362 </susp_sand_bed>
1363 </dc:if> 1363 </dc:if>
1364 </dc:filter> 1364 </dc:filter>
1365 </dc:if> 1365 </dc:if>
1366 </dc:macro> 1366 </dc:macro>
1383 WHERE r.id = ${river_id} 1383 WHERE r.id = ${river_id}
1384 AND ti.stop_time IS NULL 1384 AND ti.stop_time IS NULL
1385 AND syv.station BETWEEN ${fromkm} AND ${tokm} 1385 AND syv.station BETWEEN ${fromkm} AND ${tokm}
1386 ORDER BY fraction 1386 ORDER BY fraction
1387 </dc:statement> 1387 </dc:statement>
1388 <dc:call-macro name="loads"/> 1388 <dc:call-macro name="loads">
1389 <dc:call-macro name="one-load"/>
1390 </dc:call-macro>
1389 </dc:context> 1391 </dc:context>
1390 </years> 1392 </years>
1391 <epochs> 1393 <epochs>
1392 <dc:context> 1394 <dc:context>
1393 <dc:statement> 1395 <dc:statement>
1405 WHERE r.id = ${river_id} 1407 WHERE r.id = ${river_id}
1406 AND ti.stop_time IS NOT NULL 1408 AND ti.stop_time IS NOT NULL
1407 AND syv.station BETWEEN ${fromkm} AND ${tokm} 1409 AND syv.station BETWEEN ${fromkm} AND ${tokm}
1408 ORDER BY fraction 1410 ORDER BY fraction
1409 </dc:statement> 1411 </dc:statement>
1410 <dc:call-macro name="loads"/> 1412 <dc:call-macro name="loads">
1413 <dc:call-macro name="epoch-load"/>
1414 </dc:call-macro>
1411 </dc:context> 1415 </dc:context>
1412 </epochs> 1416 </epochs>
1413
1414 </yields> 1417 </yields>
1415 </dc:macro> 1418 </dc:macro>
1416 1419
1417 1420
1418 <dc:macro name="basedata_5_flood-protections"> 1421 <dc:macro name="basedata_5_flood-protections">
http://dive4elements.wald.intevation.org