Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java @ 7709:0737573aa9ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
S/Q relation removed false COALSCE from SQL statement. Removed misplaced sieve adjustment.
author Sascha L. Teichmann <teichmann@intevation.de>
date Wed, 18 Dec 2013 19:51:23 +0100
parents a877d2680a4a
children a8fd76b15d41
comparison
equal deleted inserted replaced
7708:a4cef1b17b2b 7709:0737573aa9ac
67 "g.UFERABLINKS AS UFERABLINKS," + 67 "g.UFERABLINKS AS UFERABLINKS," +
68 "COALESCE(m.TSCHWEB, 0) AS TSCHWEB," + 68 "COALESCE(m.TSCHWEB, 0) AS TSCHWEB," +
69 "COALESCE(m.TSAND, 0) AS TSAND," + 69 "COALESCE(m.TSAND, 0) AS TSAND," +
70 "COALESCE(gp.GTRIEB_F, 0) AS GTRIEB," + 70 "COALESCE(gp.GTRIEB_F, 0) AS GTRIEB," +
71 "COALESCE(m.TGESCHIEBE, 0) AS TGESCHIEBE," + 71 "COALESCE(m.TGESCHIEBE, 0) AS TGESCHIEBE," +
72 "COALESCE(si.SIEB01, 0) AS SIEB01, COALESCE(si.SIEB02, 0) AS SIEB02," + 72 "si.SIEB01 AS SIEB01, si.SIEB02 AS SIEB02," +
73 "COALESCE(si.SIEB03, 0) AS SIEB03, COALESCE(si.SIEB04, 0) AS SIEB04," + 73 "si.SIEB03 AS SIEB03, si.SIEB04 AS SIEB04," +
74 "COALESCE(si.SIEB05, 0) AS SIEB05, COALESCE(si.SIEB06, 0) AS SIEB06," + 74 "si.SIEB05 AS SIEB05, si.SIEB06 AS SIEB06," +
75 "COALESCE(si.SIEB07, 0) AS SIEB07, COALESCE(si.SIEB08, 0) AS SIEB08," + 75 "si.SIEB07 AS SIEB07, si.SIEB08 AS SIEB08," +
76 "COALESCE(si.SIEB09, 0) AS SIEB09, COALESCE(si.SIEB10, 0) AS SIEB10," + 76 "si.SIEB09 AS SIEB09, si.SIEB10 AS SIEB10," +
77 "COALESCE(si.SIEB11, 0) AS SIEB11, COALESCE(si.SIEB12, 0) AS SIEB12," + 77 "si.SIEB11 AS SIEB11, si.SIEB12 AS SIEB12," +
78 "COALESCE(si.SIEB13, 0) AS SIEB13, COALESCE(si.SIEB14, 0) AS SIEB14," + 78 "si.SIEB13 AS SIEB13, si.SIEB14 AS SIEB14," +
79 "COALESCE(si.SIEB15, 0) AS SIEB15, COALESCE(si.SIEB16, 0) AS SIEB16," + 79 "si.SIEB15 AS SIEB15, si.SIEB16 AS SIEB16," +
80 "COALESCE(si.SIEB17, 0) AS SIEB17, COALESCE(si.SIEB18, 0) AS SIEB18," + 80 "si.SIEB17 AS SIEB17, si.SIEB18 AS SIEB18," +
81 "COALESCE(si.SIEB19, 0) AS SIEB19, COALESCE(si.SIEB20, 0) AS SIEB20," + 81 "si.SIEB19 AS SIEB19, si.SIEB20 AS SIEB20," +
82 "COALESCE(si.SIEB21, 0) AS SIEB21," + 82 "si.SIEB21 AS SIEB21," +
83 "COALESCE(gs.RSIEB01, 0) AS RSIEB01, COALESCE(gs.RSIEB02, 0) AS RSIEB02," + 83 "gs.RSIEB01 AS RSIEB01, gs.RSIEB02 AS RSIEB02," +
84 "COALESCE(gs.RSIEB03, 0) AS RSIEB03, COALESCE(gs.RSIEB04, 0) AS RSIEB04," + 84 "gs.RSIEB03 AS RSIEB03, gs.RSIEB04 AS RSIEB04," +
85 "COALESCE(gs.RSIEB05, 0) AS RSIEB05, COALESCE(gs.RSIEB06, 0) AS RSIEB06," + 85 "gs.RSIEB05 AS RSIEB05, gs.RSIEB06 AS RSIEB06," +
86 "COALESCE(gs.RSIEB07, 0) AS RSIEB07, COALESCE(gs.RSIEB08, 0) AS RSIEB08," + 86 "gs.RSIEB07 AS RSIEB07, gs.RSIEB08 AS RSIEB08," +
87 "COALESCE(gs.RSIEB09, 0) AS RSIEB09, COALESCE(gs.RSIEB10, 0) AS RSIEB10," + 87 "gs.RSIEB09 AS RSIEB09, gs.RSIEB10 AS RSIEB10," +
88 "COALESCE(gs.RSIEB11, 0) AS RSIEB11, COALESCE(gs.RSIEB12, 0) AS RSIEB12," + 88 "gs.RSIEB11 AS RSIEB11, gs.RSIEB12 AS RSIEB12," +
89 "COALESCE(gs.RSIEB13, 0) AS RSIEB13, COALESCE(gs.RSIEB14, 0) AS RSIEB14," + 89 "gs.RSIEB13 AS RSIEB13, gs.RSIEB14 AS RSIEB14," +
90 "COALESCE(gs.RSIEB15, 0) AS RSIEB15, COALESCE(gs.RSIEB16, 0) AS RSIEB16," + 90 "gs.RSIEB15 AS RSIEB15, gs.RSIEB16 AS RSIEB16," +
91 "COALESCE(gs.RSIEB17, 0) AS RSIEB17, COALESCE(gs.RSIEB18, 0) AS RSIEB18," + 91 "gs.RSIEB17 AS RSIEB17, gs.RSIEB18 AS RSIEB18," +
92 "COALESCE(gs.RSIEB19, 0) AS RSIEB19, COALESCE(gs.RSIEB20, 0) AS RSIEB20," + 92 "gs.RSIEB19 AS RSIEB19, gs.RSIEB20 AS RSIEB20," +
93 "COALESCE(gs.RSIEB21, 0) AS RSIEB21, COALESCE(gs.REST , 0) AS REST " + 93 "gs.RSIEB21 AS RSIEB21, gs.REST AS REST " +
94 "FROM MESSUNG m " + 94 "FROM MESSUNG m " +
95 "JOIN STATION s ON m.STATIONID = s.STATIONID " + 95 "JOIN STATION s ON m.STATIONID = s.STATIONID " +
96 "JOIN GEWAESSER r ON s.GEWAESSERID = r.GEWAESSERID " + 96 "JOIN GEWAESSER r ON s.GEWAESSERID = r.GEWAESSERID " +
97 "JOIN GLOTRECHTE g ON m.MESSUNGID = g.MESSUNGID " + 97 "JOIN GLOTRECHTE g ON m.MESSUNGID = g.MESSUNGID " +
98 "JOIN GPROBE gp ON g.GLOTRECHTEID = gp.GLOTRECHTEID " + 98 "JOIN GPROBE gp ON g.GLOTRECHTEID = gp.GLOTRECHTEID " +
209 map.put(alias, value); 209 map.put(alias, value);
210 } 210 }
211 211
212 } 212 }
213 for (Sieve s: sieves) { 213 for (Sieve s: sieves) {
214 if (s != null) { 214 if (s != null && !Double.isNaN(s.getLoad())) {
215 validSieves.add(s); 215 validSieves.add(s);
216 } 216 }
217 } 217 }
218 return new Measurement(map, validSieves); 218 return new Measurement(map, validSieves);
219 } 219 }
http://dive4elements.wald.intevation.org