Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 7279:237d5305b1a9
issue1345: Added macro for the differing epoch-description, extended query.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Thu, 10 Oct 2013 11:22:16 +0200 |
parents | 03fa985dd044 |
children | 2584a114a350 |
comparison
equal
deleted
inserted
replaced
7278:03fa985dd044 | 7279:237d5305b1a9 |
---|---|
1304 info="{$description}" | 1304 info="{$description}" |
1305 ids="{$syid}" /> | 1305 ids="{$syid}" /> |
1306 </dc:for-each> | 1306 </dc:for-each> |
1307 </dc:macro> | 1307 </dc:macro> |
1308 | 1308 |
1309 <dc:macro name="epoch-load"> | |
1310 <dc:for-each> | |
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)"/> | |
1313 <year description="{$syear}-${eyear}" | |
1314 factory="sedimentyield" | |
1315 target_out="{$out}" | |
1316 info="{$description}" | |
1317 ids="{$syid}" /> | |
1318 </dc:for-each> | |
1319 </dc:macro> | |
1320 | |
1309 <dc:macro name="loads"> | 1321 <dc:macro name="loads"> |
1310 <dc:if test="dc:has-result()"> | 1322 <dc:if test="dc:has-result()"> |
1311 <dc:filter expr="$fraction='sand'"> | 1323 <dc:filter expr="$fraction='sand'"> |
1312 <dc:if test="dc:has-result()"> | 1324 <dc:if test="dc:has-result()"> |
1313 <sand> | 1325 <sand> |
1380 <dc:context> | 1392 <dc:context> |
1381 <dc:statement> | 1393 <dc:statement> |
1382 SELECT DISTINCT | 1394 SELECT DISTINCT |
1383 sy.id AS syid, | 1395 sy.id AS syid, |
1384 sy.description AS description, | 1396 sy.description AS description, |
1385 ti.start_time AS year, | 1397 ti.start_time AS startyear, |
1398 ti.stop_time AS endyear, | |
1386 gf.name AS fraction | 1399 gf.name AS fraction |
1387 FROM sediment_yield sy | 1400 FROM sediment_yield sy |
1388 JOIN rivers r ON sy.river_id = r.id | 1401 JOIN rivers r ON sy.river_id = r.id |
1389 JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id | 1402 JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id |
1390 JOIN time_intervals ti ON sy.time_interval_id = ti.id | 1403 JOIN time_intervals ti ON sy.time_interval_id = ti.id |