Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurementFactory.java @ 3874:2c40832cb596
Fixed some stupid bugs in bed quality data factory and calculation.
flys-artifacts/trunk@5507 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Tue, 18 Sep 2012 15:03:20 +0000 |
parents | 728ecd2afa20 |
children | dbae69a57927 |
comparison
equal
deleted
inserted
replaced
3873:b02bd3eff479 | 3874:2c40832cb596 |
---|---|
43 " JOIN sohlprobe sp ON sp.sohltestid = st.sohltestid " + | 43 " JOIN sohlprobe sp ON sp.sohltestid = st.sohltestid " + |
44 " JOIN siebanalyse sa ON sa.sohlprobeid = sp.sohlprobeid " + | 44 " JOIN siebanalyse sa ON sa.sohlprobeid = sp.sohlprobeid " + |
45 "WHERE gw.name = :name AND " + | 45 "WHERE gw.name = :name AND " + |
46 " st.km IS NOT NULL AND " + | 46 " st.km IS NOT NULL AND " + |
47 " sp.tiefevon IS NOT NULL AND " + | 47 " sp.tiefevon IS NOT NULL AND " + |
48 " sp.tiefebis IS NOT NULL AND " + | 48 " sp.tiefebis IS NOT NULL AND " + // TODO: Test if char diameter ist null. |
49 " st.km BETWEEN :from - 0.001 AND :to + 0.001 AND " + | 49 " st.km BETWEEN :from - 0.001 AND :to + 0.001 AND " + |
50 " st.datum BETWEEN :start AND :end"; | 50 " st.datum BETWEEN :start AND :end"; |
51 | 51 |
52 private static final String SQL_BEDLOAD_MEASUREMENT = | 52 private static final String SQL_BEDLOAD_MEASUREMENT = |
53 "SELECT m.km as km," + | 53 "SELECT m.km as km," + |
70 "FROM messung m" + | 70 "FROM messung m" + |
71 " JOIN station sn ON sn.stationid = m.stationid" + | 71 " JOIN station sn ON sn.stationid = m.stationid" + |
72 " JOIN gewaesser gw ON gw.gewaesserid = sn.gewaesserid " + | 72 " JOIN gewaesser gw ON gw.gewaesserid = sn.gewaesserid " + |
73 "WHERE gw.name = :name AND " + | 73 "WHERE gw.name = :name AND " + |
74 " m.km IS NOT NULL AND " + | 74 " m.km IS NOT NULL AND " + |
75 " m.d10 IS NOT NULL AND" + //TODO: Add all other char. diameter. | |
75 " m.km BETWEEN :from - 0.001 AND :to + 0.001 AND" + | 76 " m.km BETWEEN :from - 0.001 AND :to + 0.001 AND" + |
76 " m.datum BETWEEN :start AND :end"; | 77 " m.datum BETWEEN :start AND :end"; |
77 | 78 |
78 public static final class QualityMeasurementResultTransformer | 79 public static final class QualityMeasurementResultTransformer |
79 extends BasicTransformerAdapter { | 80 extends BasicTransformerAdapter { |
194 start, | 195 start, |
195 end, | 196 end, |
196 SQL_BEDLOAD_MEASUREMENT); | 197 SQL_BEDLOAD_MEASUREMENT); |
197 } | 198 } |
198 finally { | 199 finally { |
199 session.close(); | 200 //session.close(); |
200 } | 201 } |
201 } | 202 } |
202 } | 203 } |