Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 9144:7879c2ca8bd3
Fixed three queries (channel, infrastructure, collision) by removing the trailing semicolon (produces oracle errors)
| author | mschaefer |
|---|---|
| date | Mon, 11 Jun 2018 09:55:35 +0200 |
| parents | dbb26bc81843 |
| children | 568961ff709a |
comparison
equal
deleted
inserted
replaced
| 9143:3c3608283eba | 9144:7879c2ca8bd3 |
|---|---|
| 3394 <dc:statement> | 3394 <dc:statement> |
| 3395 SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max, | 3395 SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max, |
| 3396 MIN(s.filename) || '<br />' | 3396 MIN(s.filename) || '<br />' |
| 3397 || MIN(s.kmrange_info) || ']<br />' | 3397 || MIN(s.kmrange_info) || ']<br />' |
| 3398 || MIN(s.year_from) || ' - ' || MIN(s.year_to) || '<br />' AS info | 3398 || MIN(s.year_from) || ' - ' || MIN(s.year_to) || '<br />' AS info |
| 3399 FROM channel s INNER JOIN channel_values v ON s.id=v.channel_id | 3399 FROM channel s |
| 3400 INNER JOIN channel_values v ON s.id=v.channel_id | |
| 3400 WHERE (s.river_id=${river_id}) | 3401 WHERE (s.river_id=${river_id}) |
| 3401 AND (v.station BETWEEN | 3402 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) |
| 3402 ${fromkm}-0.0001 AND ${tokm}+0.0001) | |
| 3403 GROUP BY s.id | 3403 GROUP BY s.id |
| 3404 ORDER BY MIN(s.year_to) DESC; | 3404 ORDER BY MIN(s.year_to) DESC |
| 3405 </dc:statement> | 3405 </dc:statement> |
| 3406 <dc:if test="dc:has-result()"> | 3406 <dc:if test="dc:has-result()"> |
| 3407 <dc:for-each> | 3407 <dc:for-each> |
| 3408 <channelseries name="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}" /> | 3408 <channelseries name="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}" /> |
| 3409 </dc:for-each> | 3409 </dc:for-each> |
| 3433 MIN(s.filename) AS tkh_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, | 3433 MIN(s.filename) AS tkh_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, |
| 3434 MIN(s.filename) || '<br />' | 3434 MIN(s.filename) || '<br />' |
| 3435 || MIN(s.kmrange_info) || ']<br />' | 3435 || MIN(s.kmrange_info) || ']<br />' |
| 3436 || MIN(s.sounding_info) || '<br />' | 3436 || MIN(s.sounding_info) || '<br />' |
| 3437 || MIN(s.evaluation_by) AS info | 3437 || MIN(s.evaluation_by) AS info |
| 3438 FROM tkh_column sc INNER JOIN tkh s ON sc.tkh_id=s.id | 3438 FROM tkh_column sc |
| 3439 INNER JOIN tkh_values | 3439 INNER JOIN tkh s ON sc.tkh_id=s.id |
| 3440 v ON sc.id=v.tkh_column_id | 3440 INNER JOIN tkh_values v ON sc.id=v.tkh_column_id |
| 3441 WHERE (s.river_id=${river_id}) | 3441 WHERE (s.river_id=${river_id}) |
| 3442 AND (lower(s.groupname)=${tkh_groupname}) | 3442 AND (lower(s.groupname)=${tkh_groupname}) |
| 3443 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) | 3443 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) |
| 3444 GROUP BY sc.tkh_id, sc.id | 3444 GROUP BY sc.tkh_id, sc.id |
| 3445 ORDER BY sc.id | 3445 ORDER BY sc.id |
| 3479 || MIN(s.kmrange_info) || ']<br />' | 3479 || MIN(s.kmrange_info) || ']<br />' |
| 3480 || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '<br />' | 3480 || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '<br />' |
| 3481 || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '<br />' | 3481 || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '<br />' |
| 3482 || MIN(s.old_glw) || ' - ' || | 3482 || MIN(s.old_glw) || ' - ' || |
| 3483 MIN(s.curr_glw) AS info | 3483 MIN(s.curr_glw) AS info |
| 3484 FROM depth_evolution s INNER JOIN depth_evolution_values v ON s.id=v.depth_evolution_id | 3484 FROM depth_evolution s |
| 3485 INNER JOIN depth_evolution_values v ON s.id=v.depth_evolution_id | |
| 3485 WHERE (s.river_id=${river_id}) | 3486 WHERE (s.river_id=${river_id}) |
| 3486 AND (lower(s.groupname)=${depthevol_groupname}) | 3487 AND (lower(s.groupname)=${depthevol_groupname}) |
| 3487 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) | 3488 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) |
| 3488 GROUP BY s.id | 3489 GROUP BY s.id |
| 3489 ORDER BY s.id | 3490 ORDER BY s.id |
| 3506 MIN(s.filename) AS flowdepth_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, | 3507 MIN(s.filename) AS flowdepth_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, |
| 3507 MIN(s.filename) || '<br />' | 3508 MIN(s.filename) || '<br />' |
| 3508 || MIN(s.kmrange_info) || ']<br />' | 3509 || MIN(s.kmrange_info) || ']<br />' |
| 3509 || MIN(s.sounding_info) || '<br />' | 3510 || MIN(s.sounding_info) || '<br />' |
| 3510 || MIN(s.evaluation_by) AS info | 3511 || MIN(s.evaluation_by) AS info |
| 3511 FROM flow_depth_column sc INNER JOIN | 3512 FROM flow_depth_column sc |
| 3512 flow_depth s ON sc.flow_depth_id=s.id | 3513 INNER JOIN flow_depth s ON sc.flow_depth_id=s.id |
| 3513 INNER JOIN flow_depth_values v ON sc.id=v.flow_depth_column_id | 3514 INNER JOIN flow_depth_values v ON sc.id=v.flow_depth_column_id |
| 3514 WHERE (s.river_id=${river_id}) | 3515 WHERE (s.river_id=${river_id}) |
| 3515 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) | 3516 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) |
| 3516 GROUP BY sc.flow_depth_id, sc.id | 3517 GROUP BY sc.flow_depth_id, sc.id |
| 3517 ORDER BY sc.id | 3518 ORDER BY sc.id |
| 3535 SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max, | 3536 SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max, |
| 3536 MIN(x.name) AS typename, | 3537 MIN(x.name) AS typename, |
| 3537 MIN(s.filename) || '<br />' | 3538 MIN(s.filename) || '<br />' |
| 3538 || MIN(s.kmrange_info) || '<br />' | 3539 || MIN(s.kmrange_info) || '<br />' |
| 3539 || MIN(s.year) || '<br />' AS info | 3540 || MIN(s.year) || '<br />' AS info |
| 3540 FROM infrastructure s INNER JOIN infrastructure_values v ON s.id=v.infrastructure_id | 3541 FROM infrastructure s |
| 3542 INNER JOIN infrastructure_values v ON s.id=v.infrastructure_id | |
| 3541 INNER JOIN annotation_types x ON | 3543 INNER JOIN annotation_types x ON |
| 3542 s.annotation_type_id=x.id | 3544 s.annotation_type_id=x.id |
| 3543 WHERE (s.river_id=${river_id}) | 3545 WHERE (s.river_id=${river_id}) |
| 3544 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) | 3546 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) |
| 3545 GROUP BY s.id | 3547 GROUP BY s.id |
| 3546 ORDER BY MIN(s.filename) DESC; | 3548 ORDER BY MIN(s.filename) DESC |
| 3547 </dc:statement> | 3549 </dc:statement> |
| 3548 <dc:if test="dc:has-result()"> | 3550 <dc:if test="dc:has-result()"> |
| 3549 <dc:for-each> | 3551 <dc:for-each> |
| 3550 <infrastructureseries name="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}" /> | 3552 <infrastructureseries name="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}" /> |
| 3551 </dc:for-each> | 3553 </dc:for-each> |
| 3559 <dc:statement> | 3561 <dc:statement> |
| 3560 SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max, MIN(s.year) AS year, | 3562 SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max, MIN(s.year) AS year, |
| 3561 MIN(s.filename) || '<br />' | 3563 MIN(s.filename) || '<br />' |
| 3562 || MIN(s.kmrange_info) || '<br />' | 3564 || MIN(s.kmrange_info) || '<br />' |
| 3563 || MIN(s.year) || '<br />' AS info | 3565 || MIN(s.year) || '<br />' AS info |
| 3564 FROM collision s INNER JOIN collision_values v ON s.id=v.collision_id | 3566 FROM collision s |
| 3567 INNER JOIN collision_values v ON s.id=v.collision_id | |
| 3565 WHERE (s.river_id=${river_id}) | 3568 WHERE (s.river_id=${river_id}) |
| 3566 AND (v.station BETWEEN ${fromkm}-0.0001 AND | 3569 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) |
| 3567 ${tokm}+0.0001) | |
| 3568 GROUP BY s.id | 3570 GROUP BY s.id |
| 3569 ORDER BY MIN(s.year) ASC; | 3571 ORDER BY MIN(s.year) |
| 3570 </dc:statement> | 3572 </dc:statement> |
| 3571 <dc:if test="dc:has-result()"> | 3573 <dc:if test="dc:has-result()"> |
| 3572 <dc:for-each> | 3574 <dc:for-each> |
| 3573 <collisionseries name="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}" /> | 3575 <collisionseries name="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}" /> |
| 3574 </dc:for-each> | 3576 </dc:for-each> |