Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 7277:0ba4c4fbd410
issue1345: Show fraction and year for sediment load dc subtree.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Thu, 10 Oct 2013 11:10:50 +0200 |
parents | c9d448b959ac |
children | 03fa985dd044 |
comparison
equal
deleted
inserted
replaced
7276:c9d448b959ac | 7277:0ba4c4fbd410 |
---|---|
1293 </dc:if> | 1293 </dc:if> |
1294 </dc:context> | 1294 </dc:context> |
1295 </densities> | 1295 </densities> |
1296 </dc:macro> | 1296 </dc:macro> |
1297 | 1297 |
1298 | 1298 <dc:macro name="one-load"> |
1299 <dc:for-each> | |
1300 <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $year)"/> | |
1301 <year description="{$syear}" | |
1302 factory="sedimentyield" | |
1303 target_out="{$out}" | |
1304 info="{$description}" | |
1305 ids="{$syid}" /> | |
1306 </dc:for-each> | |
1307 </dc:macro> | |
1308 | |
1299 <dc:macro name="yields"> | 1309 <dc:macro name="yields"> |
1300 <yields> | 1310 <yields> |
1301 <years> | 1311 <years> |
1302 <dc:context> | 1312 <dc:context> |
1303 <dc:statement> | 1313 <dc:statement> |
1315 AND ti.stop_time IS NULL | 1325 AND ti.stop_time IS NULL |
1316 AND syv.station BETWEEN ${fromkm} AND ${tokm} | 1326 AND syv.station BETWEEN ${fromkm} AND ${tokm} |
1317 ORDER BY fraction | 1327 ORDER BY fraction |
1318 </dc:statement> | 1328 </dc:statement> |
1319 <dc:if test="dc:has-result()"> | 1329 <dc:if test="dc:has-result()"> |
1320 <dc:for-each> | 1330 <dc:filter expr="$fraction='sand'"> |
1321 <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $year)"/> | 1331 <dc:if test="dc:has-result()"> |
1322 <year description="{$syear} - {$description}" | 1332 <sand> |
1323 factory="sedimentyield" | 1333 <dc:call-macro name="one-load"/> |
1324 target_out="{$out}" | 1334 </sand> |
1325 info="{$syear}-{$fraction}" | 1335 </dc:if> |
1326 ids="{$syid}" /> | 1336 </dc:filter> |
1327 </dc:for-each> | 1337 <dc:filter expr="$fraction='fine_middle'"> |
1338 <dc:if test="dc:has-result()"> | |
1339 <fine_middle> | |
1340 <dc:call-macro name="one-load"/> | |
1341 </fine_middle> | |
1342 </dc:if> | |
1343 </dc:filter> | |
1344 <dc:filter expr="$fraction='coarse'"> | |
1345 <dc:if test="dc:has-result()"> | |
1346 <coarse> | |
1347 <dc:call-macro name="one-load"/> | |
1348 </coarse> | |
1349 </dc:if> | |
1350 </dc:filter> | |
1351 <dc:filter expr="$fraction='suspended_sediment'"> | |
1352 <dc:if test="dc:has-result()"> | |
1353 <susp_sediment> | |
1354 <dc:call-macro name="one-load"/> | |
1355 </susp_sediment> | |
1356 </dc:if> | |
1357 </dc:filter> | |
1358 <dc:filter expr="$fraction='susp_sand'"> | |
1359 <dc:if test="dc:has-result()"> | |
1360 <susp_sand> | |
1361 <dc:call-macro name="one-load"/> | |
1362 </susp_sand> | |
1363 </dc:if> | |
1364 </dc:filter> | |
1365 <dc:filter expr="$fraction='susp_sand_bed'"> | |
1366 <dc:if test="dc:has-result()"> | |
1367 <susp_sand_bed> | |
1368 <dc:call-macro name="one-load"/> | |
1369 </susp_sand_bed> | |
1370 </dc:if> | |
1371 </dc:filter> | |
1328 </dc:if> | 1372 </dc:if> |
1329 </dc:context> | 1373 </dc:context> |
1330 </years> | 1374 </years> |
1331 <epochs> | 1375 <epochs> |
1332 <dc:context> | 1376 <dc:context> |