Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/ChannelSeriesImport.java @ 9653:3b3c7513472e
Importer (s/u-info) extensions: support of multiple channel data series, check for non-overlapping year ranges
author | mschaefer |
---|---|
date | Mon, 23 Mar 2020 15:06:26 +0100 |
parents | 4c5eeaff554c |
children |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/ChannelSeriesImport.java Mon Mar 23 15:03:11 2020 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/ChannelSeriesImport.java Mon Mar 23 15:06:26 2020 +0100 @@ -60,13 +60,16 @@ } @Override - public List<Channel> querySeriesItem(final Session session, final River river) { - final Query query = session.createQuery("FROM Channel WHERE river=:river"); + public List<Channel> querySeriesItem(final Session session, final River river, final boolean doQueryParent) { + final Query query = session.createQuery("FROM Channel WHERE river=:river AND (lower(filename)=:filename" + + " OR (:newfrom BETWEEN year_from AND year_to) OR (:newto BETWEEN year_from AND year_to))"); query.setParameter("river", river); + query.setParameter("filename", this.filename.toLowerCase()); + query.setParameter("newfrom", this.year_from); + query.setParameter("newto", this.year_to); return query.list(); } - @Override public Channel createSeriesItem(final River river) { return new Channel(river, this.filename, this.kmrange_info, this.notes, this.year_from, this.year_to);