Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/uinfo/importitem/VegetationSeriesImport.java @ 9661:9b8ba3b83a15
Importer (s/u-info) vegetation zones: new database column in vegetation_type table for german type name,
localized vegetation type names by querying the database instead of translating by resource property,
detecting and cancelling the import of a second vegetation zone file for a river,
detecting, logging, cancelling in case of wrong column titles,
detecting, logging and ignoring lines with missing (color) values,
comparing vegetation zone name and class with the database and logging+ignoring in case of inconsistencies,
starting the most elevated zone with 0 instead of -1 overflow days
| author | mschaefer |
|---|---|
| date | Mon, 23 Mar 2020 16:38:12 +0100 |
| parents | 4c5eeaff554c |
| children |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/uinfo/importitem/VegetationSeriesImport.java Mon Mar 23 15:40:12 2020 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/uinfo/importitem/VegetationSeriesImport.java Mon Mar 23 16:38:12 2020 +0100 @@ -54,10 +54,9 @@ } @Override - public List<Vegetation> querySeriesItem(final Session session, final River river) { - final Query query = session.createQuery("FROM Vegetation WHERE river=:river AND lower(filename)=:filename"); + public List<Vegetation> querySeriesItem(final Session session, final River river, final boolean doQueryParent) { + final Query query = session.createQuery("FROM Vegetation WHERE river=:river"); query.setParameter("river", river); - query.setParameter("filename", this.filename.toLowerCase()); return query.list(); }