Mercurial > dive4elements > river
changeset 3219:fa30e6322ef3
Removed trailing whitespace.
flys-artifacts/trunk@4842 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sun, 01 Jul 2012 08:46:04 +0000 |
| parents | e0e9a2629d7d |
| children | 0c8a6145098b |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifact-db.xml flys-artifacts/doc/conf/cache.xml flys-artifacts/doc/conf/meta-data.xml |
| diffstat | 4 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Sun Jul 01 08:41:43 2012 +0000 +++ b/flys-artifacts/ChangeLog Sun Jul 01 08:46:04 2012 +0000 @@ -1,4 +1,10 @@ -2012-06-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> +2012-07-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * doc/conf/artifact-db.xml, + doc/conf/cache.xml, + doc/conf/meta-data.xml: Removed trailing whitespace. + +2012-07-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: Removed embedded class IdGenerator.
--- a/flys-artifacts/doc/conf/artifact-db.xml Sun Jul 01 08:41:43 2012 +0000 +++ b/flys-artifacts/doc/conf/artifact-db.xml Sun Jul 01 08:46:04 2012 +0000 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?> <database> - <!-- This Section configures the Settings for connecting to the + <!-- This Section configures the Settings for connecting to the Artifact-Database instance. e.g. SQLite --> <user>SA</user> <password></password>
--- a/flys-artifacts/doc/conf/cache.xml Sun Jul 01 08:41:43 2012 +0000 +++ b/flys-artifacts/doc/conf/cache.xml Sun Jul 01 08:46:04 2012 +0000 @@ -134,7 +134,7 @@ diskPersistent="true" /> - <!-- This one is used for the cross section lookup + <!-- This one is used for the cross section lookup Because of lazy fetching and relatively big amount of data, disabled cache for now. <cache name="cross_sections"
--- a/flys-artifacts/doc/conf/meta-data.xml Sun Jul 01 08:41:43 2012 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Sun Jul 01 08:46:04 2012 +0000 @@ -627,11 +627,11 @@ <dc:attribute name="db-id" value="${gauge_id}"/> <dc:context> <dc:statement> - SELECT description AS gauge_desc, + SELECT description AS gauge_desc, d.id AS discharge_id, - ti.start_time AS g_start, + ti.start_time AS g_start, ti.stop_time AS g_stop - FROM discharge_tables d JOIN time_intervals ti + FROM discharge_tables d JOIN time_intervals ti ON d.time_interval_id = ti.id WHERE d.gauge_id = ${gauge_id} AND d.kind = 1 </dc:statement> @@ -1248,7 +1248,7 @@ </dc:elements> </computed_discharge_curves> </dc:if> - + <dc:comment> CROSS SECTION </dc:comment>