Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java @ 8412:17db08570637
SCHEMA CHANGE: removed superfluous columns station and river_id from measurement_stations and adapted other components accordingly.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Wed, 15 Oct 2014 19:20:26 +0200 |
parents | 3bb1c62ad732 |
children | 11c88a2f695a |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java Wed Oct 15 14:58:46 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java Wed Oct 15 19:20:26 2014 +0200 @@ -19,6 +19,10 @@ import org.apache.log4j.Logger; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.MeasurementStation; + +import org.dive4elements.river.importer.ImporterSession; import org.dive4elements.river.importer.ImportSQRelation; import org.dive4elements.river.importer.ImportSQRelationValue; import org.dive4elements.river.importer.ImportTimeInterval; @@ -36,16 +40,17 @@ private static final NumberFormat nf = NumberFormat.getInstance(DEFAULT_LOCALE); - private List<ImportSQRelation> relations; private ImportSQRelation current; private String currentDescription; + protected River river; - public SQRelationParser() { + public SQRelationParser(River river) { relations = new ArrayList<ImportSQRelation>(); + this.river = river; } @@ -144,17 +149,25 @@ } return; } - current.addValue(new ImportSQRelationValue( - cols[1], - km, - a, - b, - qMax, - rSq, - nTot, - nOutlier, - cFer, - cDuan)); + + List<MeasurementStation> ms = + ImporterSession.getInstance().getMeasurementStations( + river, km); + + if (ms != null && !ms.isEmpty()) { + current.addValue(new ImportSQRelationValue( + cols[1], + ms.get(0), + a, + b, + qMax, + rSq, + nTot, + nOutlier, + cFer, + cDuan + )); + } } private Double parseDouble(String value, String line) {