Mercurial > dive4elements > river

comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurementFactory.java @ 3785:a5f65e8983be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 5501-5502,5504-5508,5511-5513,5516-5519 via svnmerge from file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk ........ r5501 | felix | 2012-09-18 11:49:45 +0200 (Di, 18 Sep 2012) | 1 line fix issue865 - missing showarea theme prop. ........ r5502 | clins | 2012-09-18 12:18:30 +0200 (Di, 18 Sep 2012) | 1 line Add robustness checks to prevent NPEs ........ r5504 | felix | 2012-09-18 14:03:15 +0200 (Di, 18 Sep 2012) | 1 line i18n for area label (fix issue487). ........ r5505 | clins | 2012-09-18 16:19:59 +0200 (Di, 18 Sep 2012) | 1 line Update themes to show point descriptions ........ r5506 | rrenkert | 2012-09-18 17:00:30 +0200 (Di, 18 Sep 2012) | 3 lines Removed incorrect characteristic diameter. ........ r5507 | rrenkert | 2012-09-18 17:03:20 +0200 (Di, 18 Sep 2012) | 3 lines Fixed some stupid bugs in bed quality data factory and calculation. ........ r5508 | teichmann | 2012-09-18 17:45:49 +0200 (Di, 18 Sep 2012) | 1 line The usual whitespace and import cleanups. ........ r5511 | teichmann | 2012-09-18 18:24:51 +0200 (Di, 18 Sep 2012) | 1 line Use generics aware Collections.emptyList(). ........ r5512 | teichmann | 2012-09-18 20:36:52 +0200 (Di, 18 Sep 2012) | 1 line Some more little steps towards "Auslagerung extremer Wasserspiegellagen". ........ r5513 | clins | 2012-09-18 23:38:19 +0200 (Di, 18 Sep 2012) | 1 line A and B facets of fix analyis are now deactivated by default ........ r5516 | bricks | 2012-09-19 10:45:51 +0200 (Mi, 19 Sep 2012) | 2 lines Add the gauge station to the GaugeOverviewInfoService xml response ........ r5517 | rrenkert | 2012-09-19 10:50:23 +0200 (Mi, 19 Sep 2012) | 3 lines Added CSV export to bed quality calculation. ........ r5518 | bricks | 2012-09-19 11:04:04 +0200 (Mi, 19 Sep 2012) | 2 lines Fix date in changelog entry ........ r5519 | teichmann | 2012-09-19 11:17:14 +0200 (Mi, 19 Sep 2012) | 1 line Removed trailing whitespace. ........ flys-artifacts/tags/2.9.1@5531 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 19 Sep 2012 14:58:31 +0000
parents 728ecd2afa20
children dbae69a57927
comparison
equal deleted inserted replaced
3784:9f9d5ada96ca 3785:a5f65e8983be
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 }
http://dive4elements.wald.intevation.org