Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/DepthEvolutionSeriesImport.java @ 9657:a79881a892c9
Importer (s/u-info) extensions: depth-evolution: corrected directory name Bezug_aktueller_GlW,
detecting and logging of wrong units, then cancelling,
various checks of the plausibility of the meta data year values and cancelling in case of errors,
detecting and logging missing change values, skipping those lines
| author | mschaefer |
|---|---|
| date | Mon, 23 Mar 2020 15:26:50 +0100 |
| parents | 4c5eeaff554c |
| children |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/DepthEvolutionSeriesImport.java Mon Mar 23 15:21:39 2020 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/DepthEvolutionSeriesImport.java Mon Mar 23 15:26:50 2020 +0100 @@ -18,7 +18,7 @@ import org.dive4elements.river.model.sinfo.DepthEvolution; import org.dive4elements.river.model.sinfo.DepthEvolution.Group; import org.dive4elements.river.model.sinfo.DepthEvolutionValue; -import org.hibernate.SQLQuery; +import org.hibernate.Query; import org.hibernate.Session; /** @@ -65,10 +65,18 @@ this.start_year = start_year; } + public Integer getStart_year() { + return this.start_year; + } + public void setReference_year(final Integer reference_year) { this.reference_year = reference_year; } + public Integer getReference_year() { + return this.reference_year; + } + public void setCurr_sounding(final String curr_sounding) { this.curr_sounding = curr_sounding; } @@ -91,15 +99,10 @@ } @Override - public List<DepthEvolution> querySeriesItem(final Session session, final River river) { - /* - * final Query query = session.createQuery("FROM DepthEvolution WHERE river=:river AND lower(filename)=:filename"); - * query.setParameter("river", river); - * query.setParameter("filename", this.filename.toLowerCase()); - */ - final SQLQuery query = session.createSQLQuery("SELECT * FROM depth_evolution WHERE (river_id=:river) AND (lower(filename)=:filename)"); - query.setParameter("river", river.getId()); - query.setParameter("filename", getFilename().toLowerCase()); + public List<DepthEvolution> querySeriesItem(final Session session, final River river, final boolean doQueryParent) { + final Query query = session.createQuery("FROM DepthEvolution WHERE river=:river AND lower(filename)=:filename"); + query.setParameter("river", river); + query.setParameter("filename", this.filename.toLowerCase()); return query.list(); }