Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 8222:1cd7225df846
Let official epochs be showy and remove detritus of 'yields' in datacage config.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Mon, 08 Sep 2014 15:54:12 +0200 |
parents | ceeeaf228fe4 |
children | a65afd85d516 |
comparison
equal
deleted
inserted
replaced
8221:a0994a326e2a | 8222:1cd7225df846 |
---|---|
1409 <dc:macro name="load"> | 1409 <dc:macro name="load"> |
1410 <year description="{$timespan}" | 1410 <year description="{$timespan}" |
1411 factory="sedimentload" | 1411 factory="sedimentload" |
1412 target_out="{$out}" | 1412 target_out="{$out}" |
1413 info="{$info}" | 1413 info="{$info}" |
1414 ids="{$syid};{$fraction};{$timespan}" /> | 1414 ids="{$slid};{$fraction};{$timespan};{$kind}" /> |
1415 </dc:macro> | 1415 </dc:macro> |
1416 | 1416 |
1417 <dc:macro name="load_ls"> | 1417 <dc:macro name="load_ls"> |
1418 <year description="{$timespan}" | 1418 <year description="{$timespan}" |
1419 factory="sedimentload_ls" | 1419 factory="sedimentload_ls" |
1420 target_out="{$out}" | 1420 target_out="{$out}" |
1421 info="{$info}" | 1421 info="{$info}" |
1422 ids="{$syid};{$timespan}" /> | 1422 ids="{$slid};{$timespan};{$kind}" /> |
1423 </dc:macro> | 1423 </dc:macro> |
1424 | 1424 |
1425 <dc:macro name="loads"> | 1425 <dc:macro name="loads"> |
1426 <dc:if test="dc:has-result()"> | 1426 <dc:if test="dc:has-result()"> |
1427 <dc:group expr="$fraction"> | 1427 <dc:group expr="$fraction"> |
1437 <dc:variable name="timespan" type="string" | 1437 <dc:variable name="timespan" type="string" |
1438 expr="concat(dc:date-format('yyyy', $startyear), | 1438 expr="concat(dc:date-format('yyyy', $startyear), |
1439 '-', dc:date-format('yyyy', $endyear))"/> | 1439 '-', dc:date-format('yyyy', $endyear))"/> |
1440 </dc:otherwise> | 1440 </dc:otherwise> |
1441 </dc:choose> | 1441 </dc:choose> |
1442 <dc:if test="$kind = 'official'"> | |
1443 <dc:variable name="info" type="string" | |
1444 expr="concat('Amtliche Epoche<BR>', $info)"/> | |
1445 </dc:if> | |
1442 <dc:macro-body/> | 1446 <dc:macro-body/> |
1443 </dc:for-each> | 1447 </dc:for-each> |
1444 </fraction> | 1448 </fraction> |
1445 </dc:group> | 1449 </dc:group> |
1446 </dc:if> | 1450 </dc:if> |
1473 <dc:call-macro name="annotations_sediment_load_ls"/> | 1477 <dc:call-macro name="annotations_sediment_load_ls"/> |
1474 <measurement_stations> | 1478 <measurement_stations> |
1475 <dc:context> | 1479 <dc:context> |
1476 <dc:statement> | 1480 <dc:statement> |
1477 SELECT DISTINCT | 1481 SELECT DISTINCT |
1478 sy.id AS syid, | 1482 sl.id AS slid, |
1483 slk.kind AS kind, | |
1479 ti.start_time AS startyear, | 1484 ti.start_time AS startyear, |
1480 ti.stop_time AS endyear, | 1485 ti.stop_time AS endyear, |
1481 sq.start_time AS sqstart, | 1486 sq.start_time AS sqstart, |
1482 sq.stop_time AS sqstop, | 1487 sq.stop_time AS sqstop, |
1483 gf.name AS fraction, | 1488 gf.name AS fraction, |
1484 sy.description || '<BR>' || | 1489 sl.description || '<BR>' || |
1485 'Fraktion: ' || gf.lower || ' bis ' || gf.upper || | 1490 'Fraktion: ' || gf.lower || ' bis ' || gf.upper || |
1486 ' mm<BR>Einheit: t/a' AS info | 1491 ' mm<BR>Einheit: t/a' AS info |
1487 FROM sediment_load sy | 1492 FROM sediment_load sl |
1488 JOIN sediment_load_values syv | 1493 JOIN sediment_load_kinds slk ON slk.id = sl.kind |
1489 ON sy.id = syv.sediment_load_id | 1494 JOIN sediment_load_values slv |
1495 ON sl.id = slv.sediment_load_id | |
1490 JOIN measurement_station ms | 1496 JOIN measurement_station ms |
1491 ON ms.id = syv.measurement_station_id | 1497 ON ms.id = slv.measurement_station_id |
1492 JOIN rivers r ON ms.river_id = r.id | 1498 JOIN rivers r ON ms.river_id = r.id |
1493 JOIN time_intervals ti ON sy.time_interval_id = ti.id | 1499 JOIN time_intervals ti ON sl.time_interval_id = ti.id |
1494 LEFT JOIN time_intervals sq ON sy.sq_time_interval_id = sq.id | 1500 LEFT JOIN time_intervals sq ON sl.sq_time_interval_id = sq.id |
1495 JOIN grain_fraction gf ON gf.id = sy.grain_fraction_id | 1501 JOIN grain_fraction gf ON gf.id = sl.grain_fraction_id |
1496 WHERE r.id = ${river_id} | 1502 WHERE r.id = ${river_id} |
1497 AND ms.station BETWEEN ${fromkm} AND ${tokm} | 1503 AND ms.station BETWEEN ${fromkm} AND ${tokm} |
1498 ORDER BY sqstart DESC, sqstop DESC, | 1504 ORDER BY sqstart DESC, sqstop DESC, |
1499 fraction, startyear DESC, endyear DESC | 1505 fraction, startyear DESC, endyear DESC |
1500 </dc:statement> | 1506 </dc:statement> |
1507 </measurement_stations> | 1513 </measurement_stations> |
1508 <sediment_load_ls> | 1514 <sediment_load_ls> |
1509 <dc:context> | 1515 <dc:context> |
1510 <dc:statement> | 1516 <dc:statement> |
1511 SELECT DISTINCT | 1517 SELECT DISTINCT |
1512 sy.id AS syid, | 1518 sl.id AS slid, |
1519 slk.kind AS kind, | |
1513 ti.start_time AS startyear, | 1520 ti.start_time AS startyear, |
1514 ti.stop_time AS endyear, | 1521 ti.stop_time AS endyear, |
1515 sq.start_time AS sqstart, | 1522 sq.start_time AS sqstart, |
1516 sq.stop_time AS sqstop, | 1523 sq.stop_time AS sqstop, |
1517 gf.name AS fraction, | 1524 gf.name AS fraction, |
1518 sy.description || '<BR>' || | 1525 sl.description || '<BR>' || |
1519 'Fraktion: ' || gf.lower || ' bis ' || gf.upper || | 1526 'Fraktion: ' || gf.lower || ' bis ' || gf.upper || |
1520 ' mm<BR>Einheit: ' || u.name AS info | 1527 ' mm<BR>Einheit: ' || u.name AS info |
1521 FROM sediment_load_ls sy | 1528 FROM sediment_load_ls sl |
1522 JOIN rivers r ON sy.river_id = r.id | 1529 JOIN sediment_load_kinds slk ON slk.id = sl.kind |
1523 JOIN sediment_load_ls_values syv | 1530 JOIN rivers r ON sl.river_id = r.id |
1524 ON sy.id = syv.sediment_load_ls_id | 1531 JOIN sediment_load_ls_values slv |
1525 JOIN time_intervals ti ON sy.time_interval_id = ti.id | 1532 ON sl.id = slv.sediment_load_ls_id |
1526 LEFT JOIN time_intervals sq ON sy.sq_time_interval_id = sq.id | 1533 JOIN time_intervals ti ON sl.time_interval_id = ti.id |
1527 JOIN grain_fraction gf ON gf.id = sy.grain_fraction_id | 1534 LEFT JOIN time_intervals sq ON sl.sq_time_interval_id = sq.id |
1528 JOIN units u ON sy.unit_id = u.id | 1535 JOIN grain_fraction gf ON gf.id = sl.grain_fraction_id |
1536 JOIN units u ON sl.unit_id = u.id | |
1529 WHERE r.id = ${river_id} | 1537 WHERE r.id = ${river_id} |
1530 AND syv.station BETWEEN ${fromkm} AND ${tokm} | 1538 AND slv.station BETWEEN ${fromkm} AND ${tokm} |
1531 ORDER BY sqstart DESC, sqstop DESC, | 1539 ORDER BY sqstart DESC, sqstop DESC, |
1532 fraction, startyear DESC, endyear DESC | 1540 fraction, startyear DESC, endyear DESC |
1533 </dc:statement> | 1541 </dc:statement> |
1534 <dc:call-macro name="sedimentloads-filter"> | 1542 <dc:call-macro name="sedimentloads-filter"> |
1535 <dc:call-macro name="loads"> | 1543 <dc:call-macro name="loads"> |