Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 9652:dd93bb84561d | 9653:3b3c7513472e |
|---|---|
| 58 public Logger getLog() { | 58 public Logger getLog() { |
| 59 return log; | 59 return log; |
| 60 } | 60 } |
| 61 | 61 |
| 62 @Override | 62 @Override |
| 63 public List<Channel> querySeriesItem(final Session session, final River river) { | 63 public List<Channel> querySeriesItem(final Session session, final River river, final boolean doQueryParent) { |
| 64 final Query query = session.createQuery("FROM Channel WHERE river=:river"); | 64 final Query query = session.createQuery("FROM Channel WHERE river=:river AND (lower(filename)=:filename" |
| 65 + " OR (:newfrom BETWEEN year_from AND year_to) OR (:newto BETWEEN year_from AND year_to))"); | |
| 65 query.setParameter("river", river); | 66 query.setParameter("river", river); |
| 67 query.setParameter("filename", this.filename.toLowerCase()); | |
| 68 query.setParameter("newfrom", this.year_from); | |
| 69 query.setParameter("newto", this.year_to); | |
| 66 return query.list(); | 70 return query.list(); |
| 67 } | 71 } |
| 68 | |
| 69 | 72 |
| 70 @Override | 73 @Override |
| 71 public Channel createSeriesItem(final River river) { | 74 public Channel createSeriesItem(final River river) { |
| 72 return new Channel(river, this.filename, this.kmrange_info, this.notes, this.year_from, this.year_to); | 75 return new Channel(river, this.filename, this.kmrange_info, this.notes, this.year_from, this.year_to); |
| 73 } | 76 } |