Mercurial > dive4elements > river
changeset 4435:471baa410470
Merged backouts.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 07 Nov 2012 13:40:00 +0100 |
| parents | 5b8919ef601d (current diff) 60c728e557f4 (diff) |
| children | 9fca4d60fb7c |
| files | flys-artifacts/doc/conf/meta-data.xml flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties flys-client/src/main/webapp/WEB-INF/web.xml |
| diffstat | 4 files changed, 6 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/artifacts/minfo.xml Wed Nov 07 12:23:41 2012 +0100 +++ b/flys-artifacts/doc/conf/artifacts/minfo.xml Wed Nov 07 13:40:00 2012 +0100 @@ -421,7 +421,6 @@ <facet name="sedimentload.susp_sand_bed"/> <facet name="sedimentload.susp_sediment"/> <facet name="sedimentload.total"/> - <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/> </facets> </outputmode> </outputmodes>
--- a/flys-artifacts/doc/conf/meta-data.xml Wed Nov 07 12:23:41 2012 +0100 +++ b/flys-artifacts/doc/conf/meta-data.xml Wed Nov 07 13:40:00 2012 +0100 @@ -687,9 +687,6 @@ <dc:if test="dc:contains($artifact-outs, 'flow_velocity')"> <dc:call-macro name="annotations"/> </dc:if> - <dc:if test="dc:contains($artifact-outs, 'sedimentload_ls')"> - <dc:call-macro name="annotations"/> - </dc:if> </dc:when> <dc:otherwise> <dc:comment>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadFactory.java Wed Nov 07 12:23:41 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadFactory.java Wed Nov 07 13:40:00 2012 +0100 @@ -27,7 +27,7 @@ public static final String LOADS_CACHE_NAME = "sedimentloads"; public static final String LOAD_DATA_CACHE_NAME = "sedimentload-data"; - /** Query to get description and start year, given name and a km range. */ + /** Query to get km and ws for wst_id and column_pos. */ public static final String SQL_SELECT_SINGLES = "SELECT DISTINCT " + " sy.description AS description, " + @@ -40,7 +40,7 @@ " AND ti.stop_time IS NULL " + " AND syv.station BETWEEN :startKm AND :endKm"; - /** Query to get start time, stop time and description. */ + /** Query to get name for wst_id and column_pos. */ public static final String SQL_SELECT_EPOCHS = "SELECT DISTINCT " + " sy.description AS description, " + @@ -92,7 +92,9 @@ private SedimentLoadFactory() { } - + /** + * + */ public static SedimentLoad[] getLoads( String river, String type, @@ -276,7 +278,6 @@ List<Object []> results = sqlQuery.list(); SedimentLoad load = new SedimentLoad(); Object[] row = results.get(0); - // TODO Handle empty result. load = new SedimentLoad( (String) row[0], (Date) row[1], @@ -373,4 +374,3 @@ } } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java Wed Nov 07 12:23:41 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java Wed Nov 07 13:40:00 2012 +0100 @@ -211,5 +211,5 @@ addAxisSeries(series, YAXIS.L.idx, visible); } + } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :