Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/TkhKmLineImport.java @ 9655:1f57381b3bb5
Importer (s/u-info) extensions: uniform formatting of from-to series names,
warning instead of cancelling in case of missing tkh column values,
detecting, logging and skipping columns with wrong unit
| author | mschaefer |
|---|---|
| date | Mon, 23 Mar 2020 15:16:35 +0100 |
| parents | bf8a9df86f32 |
| children |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/TkhKmLineImport.java Mon Mar 23 15:10:09 2020 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/TkhKmLineImport.java Mon Mar 23 15:16:35 2020 +0100 @@ -15,7 +15,7 @@ import org.dive4elements.river.importer.common.AbstractKmLineImport; import org.dive4elements.river.model.sinfo.TkhColumn; import org.dive4elements.river.model.sinfo.TkhValue; -import org.hibernate.SQLQuery; +import org.hibernate.Query; import org.hibernate.Session; /** @@ -46,15 +46,10 @@ @Override protected TkhValue queryValueItem(final Session session, final TkhColumn parent) { - /* - * final Query query = session.createQuery("FROM TkhValue WHERE (TkhColumn=:parent)" - * + " AND (station BETWEEN (:station-0.0001) AND (:station+0.0001))"); - * query.setParameter("parent", parent); - * query.setParameter("station", this.station); - */ - final SQLQuery query = session.createSQLQuery("SELECT * FROM tkh_values WHERE (tkh_column_id=:parent)" + final Query query = session.createQuery("FROM TkhValue WHERE (tkhColumn=:parent)" + " AND (station BETWEEN (:station-0.0001) AND (:station+0.0001))"); - query.setParameter("parent", parent.getId()).setParameter("station", this.station); + query.setParameter("parent", parent); + query.setParameter("station", this.station); final List rows = query.list(); if (!rows.isEmpty()) return (TkhValue) rows.get(0);