Mercurial > dive4elements > river
changeset 1865:ba6659083fa0
Revert/apply accidental/corrected commit.
flys-artifacts/trunk@3214 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 10 Nov 2011 11:21:20 +0000 |
| parents | 9da663b7a865 |
| children | dd7d6614747e |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/conf.xml flys-artifacts/doc/conf/meta-data.xml |
| diffstat | 3 files changed, 31 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Nov 10 10:29:01 2011 +0000 +++ b/flys-artifacts/ChangeLog Thu Nov 10 11:21:20 2011 +0000 @@ -1,3 +1,10 @@ +2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * doc/conf/conf.xml: Reverted accidental commit. + + * doc/conf/meta-data.xml: Extracted annotations-macro, add recommendation + for discharge longitudinal sections. + 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> Made discharge longitudinal section out compatible with annotations. @@ -8,7 +15,7 @@ 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> Extracted Annotations-Macro in dc conf, recommend Annotations for - discharge longitudinal sections. + discharge longitudinal sections. (Note correction two commits later). * doc/conf/conf.xml: Extracted annotations-macro, add recommendation for discharge longitudinal sections.
--- a/flys-artifacts/doc/conf/conf.xml Thu Nov 10 10:29:01 2011 +0000 +++ b/flys-artifacts/doc/conf/conf.xml Thu Nov 10 11:21:20 2011 +0000 @@ -47,12 +47,6 @@ <artifact-factory name="staticwkms" description="Factory to create an artifact to access 'other' WKms data" ttl="3600000" artifact="de.intevation.flys.artifacts.StaticWKmsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> - <artifact-factory name="staticwqkms" description="Factory to create an artifact to access 'other' WKms data" - ttl="3600000" - artifact="de.intevation.flys.artifacts.StaticWQKmsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> - <artifact-factory name="wqinterpol" description="Factory to create an artifact to access 'other' WQ (at km) data" - ttl="3600000" - artifact="de.intevation.flys.artifacts.WQKmsInterpolArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> </artifact-factories> <user-factory name="default" description="Factory to create new users">de.intevation.artifactdatabase.DefaultUserFactory</user-factory>
--- a/flys-artifacts/doc/conf/meta-data.xml Thu Nov 10 10:29:01 2011 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Thu Nov 10 11:21:20 2011 +0000 @@ -83,6 +83,15 @@ <dc:attribute name="ids" value="${river_id}"/> </mainvalue> </dc:macro> + + + <dc:macro name="annotations"> + <annotation> + <dc:attribute name="factory" value="annotations"/> + <dc:attribute name="ids" value="${river_id}"/> + </annotation> + </dc:macro> + <river> <dc:attribute name="name" value="${river_name}"/> <dc:if test="dc:contains($artifact-outs, 'w_differences')"> @@ -91,6 +100,19 @@ <dc:attribute name="ids" value="${river_id}"/> </annotation> </dc:if> + + <dc:choose> + <dc:when test="dc:contains($parameters, 'recommended')"> + <dc:comment> + Recommendations. + </dc:comment> + <dc:if test="dc:contains($artifact-outs, 'w_differences') or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))"> + <dc:call-macro name="annotations"/> + </dc:if> + </dc:when> + <dc:otherwise> + </dc:otherwise> + </dc:choose> <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))"> <dc:choose> <dc:when test="dc:contains($parameters, 'recommended')"> @@ -442,14 +464,8 @@ </dc:if> <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')"> <longitudinal-section> - <dc:call-macro name="longitudinal_section-recommended"/> + <dc:call-macro name="annotations"/> </longitudinal-section> - <dc:macro name="longitudinal_section-recommended"> - <annotation> - <dc:attribute name="factory" value="annotations"/> - <dc:attribute name="ids" value="${river_id}"/> - </annotation> - </dc:macro> </dc:if> <dc:if test="dc:contains($artifact-outs, 'floodmap')"> <floodmap>