Mercurial > dive4elements > river
comparison flys-artifacts/doc/conf/meta-data.xml @ 2717:4cd55689e9a9
Allow to load previous DurationCurves and fixations in Dur.C. via DC.
flys-artifacts/trunk@4446 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Mon, 21 May 2012 09:02:58 +0000 |
parents | 15c6f79ca3e2 |
children | f1c639493941 |
comparison
equal
deleted
inserted
replaced
2716:150dcdefeb7d | 2717:4cd55689e9a9 |
---|---|
503 </computed_discharge_curve> | 503 </computed_discharge_curve> |
504 <dc:call-macro name="basedata_2_fixations_wst"/> | 504 <dc:call-macro name="basedata_2_fixations_wst"/> |
505 </dc:if> | 505 </dc:if> |
506 | 506 |
507 <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> | 507 <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> |
508 <dc:call-macro name="mainvalues"/> | 508 <dc:choose> |
509 <dc:when test="dc:contains($parameters, 'recommended')"> | |
510 <dc:call-macro name="mainvalues"/> | |
511 </dc:when> | |
512 <dc:otherwise> | |
513 <dc:call-macro name="mainvalues"/> | |
514 <dc:call-macro name="basedata_2_fixations"/> | |
515 </dc:otherwise> | |
516 </dc:choose> | |
509 </dc:if> | 517 </dc:if> |
510 | 518 |
511 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')"> | 519 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')"> |
512 <longitudinal_section> | 520 <longitudinal_section> |
513 <dc:call-macro name="annotations"/> | 521 <dc:call-macro name="annotations"/> |
1090 <dc:elements> | 1098 <dc:elements> |
1091 <dc:context> | 1099 <dc:context> |
1092 <dc:statement> | 1100 <dc:statement> |
1093 SELECT a.gid as aid, f.id AS fid, f.name AS facet_name, f.num AS facet_num, f.description as facet_description | 1101 SELECT a.gid as aid, f.id AS fid, f.name AS facet_name, f.num AS facet_num, f.description as facet_description |
1094 FROM outs as o, facets as f, artifacts as a | 1102 FROM outs as o, facets as f, artifacts as a |
1095 WHERE f.name = 'duration_curve.q' and f.out_id = o.id and o.artifact_id = ${a_id} and a.id = ${a_id} | 1103 WHERE (f.name = 'duration_curve.q' or f.name = 'duration_curve.w') and f.out_id = o.id and o.artifact_id = ${a_id} and a.id = ${a_id} |
1096 </dc:statement> | 1104 </dc:statement> |
1097 <dc:elements> | 1105 <dc:elements> |
1098 <dc:element name="${facet_name}"> | 1106 <dc:element name="${facet_name}"> |
1099 <dc:attribute name="description" value="${facet_description}"/> | 1107 <dc:attribute name="description" value="${facet_description}"/> |
1100 <dc:attribute name="factory" value="winfo"/> | 1108 <dc:attribute name="factory" value="winfo"/> |