Mercurial > dive4elements > river
changeset 1757:63d5d52ba7f3
Cosmetics.
flys-artifacts/trunk@3068 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 25 Oct 2011 12:13:04 +0000 |
| parents | bf356c5cfead |
| children | 1d78039a36e6 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml |
| diffstat | 2 files changed, 47 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Mon Oct 24 10:40:37 2011 +0000 +++ b/flys-artifacts/ChangeLog Tue Oct 25 12:13:04 2011 +0000 @@ -1,3 +1,7 @@ +2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * doc/conf/meta-data.xml: Cosmetics. + 2011-10-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> * doc/conf/themes.xml: Added theme for w_differences facets.
--- a/flys-artifacts/doc/conf/meta-data.xml Mon Oct 24 10:40:37 2011 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Tue Oct 25 12:13:04 2011 +0000 @@ -236,7 +236,8 @@ <dc:elements> <column> <dc:attribute name="name" value="${wl_column_name}"/> - <dc:attribute name="db-id" value="${wl_column_id}"/></column> + <dc:attribute name="db-id" value="${wl_column_id}"/> + </column> </dc:elements> </dc:context> </columns> @@ -254,7 +255,7 @@ </dc:statement> <dc:elements> <extra-longitudinal-section> - <dc:attribute name="name" value="${els_description}"/> + <dc:attribute name="name" value="${els_description}"/> <dc:attribute name="db-id" value="${els_id}"/> <columns> <dc:context> @@ -266,8 +267,9 @@ </dc:statement> <dc:elements> <column> - <dc:attribute name="name" value="${els_column_name}"/> - <dc:attribute name="db-id" value="${els_column_id}"/></column> + <dc:attribute name="name" value="${els_column_name}"/> + <dc:attribute name="db-id" value="${els_column_id}"/> + </column> </dc:elements> </dc:context> </columns> @@ -281,18 +283,28 @@ <computed-discharge-curve> <mainvalue> <dc:attribute name="factory" value="mainvalue"/> - <dc:attribute name="db-ids" value="${river_id}"/> + <dc:attribute name="db-ids" value="${river_id}"/> </mainvalue> </computed-discharge-curve> </dc:if> <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')"> <longitudinal-section> <dc:call-macro name="longitudinal_section-recommended"/> - <fixations><dc:attribute name="ref" value="fixations-${river_id}"/></fixations> - <flood-protections><dc:attribute name="ref" value="flood-protections-${river_id}"/></flood-protections> - <flood-water-marks><dc:attribute name="ref" value="flood-water-marks-${river_id}"/></flood-water-marks> - <water-levels><dc:attribute name="ref" value="water-levels-${river_id}"/></water-levels> - <extra-longitudinal-sections><dc:attribute name="ref" value="extra-longitudinal-sections-${river_id}"/></extra-longitudinal-sections> + <fixations> + <dc:attribute name="ref" value="fixations-${river_id}"/> + </fixations> + <flood-protections> + <dc:attribute name="ref" value="flood-protections-${river_id}"/> + </flood-protections> + <flood-water-marks> + <dc:attribute name="ref" value="flood-water-marks-${river_id}"/> + </flood-water-marks> + <water-levels> + <dc:attribute name="ref" value="water-levels-${river_id}"/> + </water-levels> + <extra-longitudinal-sections> + <dc:attribute name="ref" value="extra-longitudinal-sections-${river_id}"/> + </extra-longitudinal-sections> </longitudinal-section> <dc:macro name="longitudinal_section-recommended"> <annotation> @@ -409,12 +421,18 @@ </dc:comment> <dc:when test="dc:contains($artifact-outs, 'longitudinal_section')"> <dc:context> - <dc:statement>SELECT id AS out_id FROM outs WHERE artifact_id = ${a_id} AND name = 'longitudinal_section' + <dc:statement> + SELECT id AS out_id + FROM outs + WHERE artifact_id = ${a_id} AND name = 'longitudinal_section' </dc:statement> <dc:elements> <dc:context> - <dc:statement>SELECT name AS facet_name, num as facet_num, description AS facet_description - FROM facets WHERE out_id = ${out_id} ORDER BY num ASC, name DESC + <dc:statement> + SELECT name AS facet_name, num as facet_num, description AS facet_description + FROM facets + WHERE out_id = ${out_id} + ORDER BY num ASC, name DESC </dc:statement> <longitudinal_section_columns> <dc:attribute name="description" value="${river} ${a_creation}"/> @@ -443,22 +461,28 @@ </dc:comment> <dc:when test="dc:contains($artifact-outs, 'waterlevels')"> <dc:context> - <dc:statement>SELECT id AS out_id FROM outs WHERE artifact_id = ${a_id} AND name = 'longitudinal_section' + <dc:statement> + SELECT id AS out_id + FROM outs + WHERE artifact_id = ${a_id} AND name = 'longitudinal_section' </dc:statement> <dc:elements> <dc:context> - <dc:statement>SELECT name AS facet_name, num as facet_num, description AS facet_description - FROM facets WHERE out_id = ${out_id} and name = 'longitudinal_section.w' ORDER BY num ASC, name DESC + <dc:statement> + SELECT name AS facet_name, num as facet_num, description AS facet_description + FROM facets + WHERE out_id = ${out_id} and name = 'longitudinal_section.w' + ORDER BY num ASC, name DESC </dc:statement> <waterlevels> <dc:attribute name="description" value="${river} ${a_creation} ${collection_name}"/> <dc:elements> <dc:element name="${facet_name}"> <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="winfo"/> + <dc:attribute name="ids" value="${facet_num}"/> + <dc:attribute name="factory" value="winfo"/> <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="longitudinal_section"/> + <dc:attribute name="out" value="longitudinal_section"/> </dc:element> </dc:elements> </waterlevels>