[Dive4elements-commits] [PATCH 3 of 3] Merged backouts

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1352292000 -3600
# Node ID 471baa410470aea9297fee7321c1a6add20da305
# Parent  5b8919ef601d5068ca9b7852ae09c85a7b0795cf
# Parent  60c728e557f48f064680d4efcea47c0c554fec1e
Merged backouts.

diff -r 5b8919ef601d -r 471baa410470 flys-artifacts/doc/conf/artifacts/minfo.xml
--- 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>
diff -r 5b8919ef601d -r 471baa410470 flys-artifacts/doc/conf/meta-data.xml
--- 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>
diff -r 5b8919ef601d -r 471baa410470 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadFactory.java
--- 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 :
diff -r 5b8919ef601d -r 471baa410470 flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java
--- 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 :