Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java @ 6665:b7945db8a43b
issue1413: Only show unknown sediment loads of selected unit type.
Therefore, adjusted the factory to take the units name. Unfortunately,
names in db do not match values of data items. Thus do manual replacing.
In Facet and Calculate, take the chosen unit via access and to the string
replacement.
In Facet, do not transform data (we assume it comes in unit as labeled in
the db), and removed the possibility of m3/a-data of unknown yields in a
t/a diagram and vice versa.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 25 Jul 2013 15:08:13 +0200 |
| parents | a4f60641e445 |
| children | 7ea933f9c6ea |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Thu Jul 25 14:58:21 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Thu Jul 25 15:08:13 2013 +0200 @@ -115,8 +115,10 @@ " JOIN rivers r ON sy.river_id = r.id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + - "WHERE r.name = :river" + - " AND gf.name = 'unknown'"; + " JOIN units u ON sy.unit_id = u.id " + + "WHERE r.name = :river " + + " AND gf.name = 'unknown' " + + " AND u.name = :unit"; public static final String SQL_SELECT_EPOCHS_DATA = "SELECT" + @@ -550,13 +552,18 @@ return load; } - public static SedimentLoad[] getSedimentLoadUnknown(String river) { + /** + * Return sediment loads with 'unknown' fraction type. + * @param unit Restrict result set to those of given unit. + */ + public static SedimentLoad[] getSedimentLoadUnknown(String river, String unit) { Session session = SessionHolder.HOLDER.get(); SQLQuery sqlQuery = session.createSQLQuery(SQL_SELECT_UNKNOWN) .addScalar("description", StandardBasicTypes.STRING) .addScalar("startYear", StandardBasicTypes.DATE) .addScalar("end", StandardBasicTypes.DATE); sqlQuery.setString("river", river); + sqlQuery.setString("unit", unit); List<Object[]> results = sqlQuery.list(); SedimentLoad[] loads = new SedimentLoad[results.size()]; int counter = 0;