Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/importer/ImportSQRelationValue.java @ 5458:e667c127b600
Removed column 'fraction' from sq relation parser and model.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Wed, 27 Mar 2013 13:02:53 +0100 |
| parents | 13596605e81f |
| children | bc140668db82 |
comparison
equal
deleted
inserted
replaced
| 5457:1b676aefaf3a | 5458:e667c127b600 |
|---|---|
| 21 | 21 |
| 22 | 22 |
| 23 private SQRelationValue peer; | 23 private SQRelationValue peer; |
| 24 | 24 |
| 25 private String parameter; | 25 private String parameter; |
| 26 private String fraction; | |
| 27 | 26 |
| 28 private Double km; | 27 private Double km; |
| 29 private Double a; | 28 private Double a; |
| 30 private Double b; | 29 private Double b; |
| 31 private Double qMax; | 30 private Double qMax; |
| 36 private Double cDuan; | 35 private Double cDuan; |
| 37 | 36 |
| 38 | 37 |
| 39 public ImportSQRelationValue( | 38 public ImportSQRelationValue( |
| 40 String parameter, | 39 String parameter, |
| 41 String fraction, | |
| 42 Double km, | 40 Double km, |
| 43 Double a, | 41 Double a, |
| 44 Double b, | 42 Double b, |
| 45 Double qMax, | 43 Double qMax, |
| 46 Double rSQ, | 44 Double rSQ, |
| 48 Integer nOutlier, | 46 Integer nOutlier, |
| 49 Double cFerguson, | 47 Double cFerguson, |
| 50 Double cDuan | 48 Double cDuan |
| 51 ) { | 49 ) { |
| 52 this.parameter = parameter; | 50 this.parameter = parameter; |
| 53 this.fraction = fraction; | |
| 54 this.km = km; | 51 this.km = km; |
| 55 this.a = a; | 52 this.a = a; |
| 56 this.b = b; | 53 this.b = b; |
| 57 this.qMax = qMax; | 54 this.qMax = qMax; |
| 58 this.rSQ = rSQ; | 55 this.rSQ = rSQ; |
| 89 | 86 |
| 90 Query query2 = session.createQuery( | 87 Query query2 = session.createQuery( |
| 91 "from SQRelationValue " + | 88 "from SQRelationValue " + |
| 92 " where sqRelation=:owner " + | 89 " where sqRelation=:owner " + |
| 93 " and parameter=:parameter" + | 90 " and parameter=:parameter" + |
| 94 " and fraction=:fraction" + | |
| 95 " and measurementStation=:measurementStation" + | 91 " and measurementStation=:measurementStation" + |
| 96 " and a=:a" + | 92 " and a=:a" + |
| 97 " and b=:b" + | 93 " and b=:b" + |
| 98 " and qMax=:qMax" + | 94 " and qMax=:qMax" + |
| 99 " and rSQ=:rSQ" + | 95 " and rSQ=:rSQ" + |
| 100 " and cFerguson=:cFerguson" + | 96 " and cFerguson=:cFerguson" + |
| 101 " and cDuan=:cDuan"); | 97 " and cDuan=:cDuan"); |
| 102 | 98 |
| 103 query2.setParameter("owner", owner); | 99 query2.setParameter("owner", owner); |
| 104 query2.setString("parameter", parameter); | 100 query2.setString("parameter", parameter); |
| 105 query2.setString("fraction", fraction); | |
| 106 query2.setParameter("measurementStation", result.get(0)); | 101 query2.setParameter("measurementStation", result.get(0)); |
| 107 query2.setBigDecimal("a", toBigDecimal(a)); | 102 query2.setBigDecimal("a", toBigDecimal(a)); |
| 108 query2.setBigDecimal("b", toBigDecimal(b)); | 103 query2.setBigDecimal("b", toBigDecimal(b)); |
| 109 query2.setBigDecimal("qMax", toBigDecimal(qMax)); | 104 query2.setBigDecimal("qMax", toBigDecimal(qMax)); |
| 110 query2.setBigDecimal("rSQ", toBigDecimal(rSQ)); | 105 query2.setBigDecimal("rSQ", toBigDecimal(rSQ)); |
| 115 | 110 |
| 116 if (values.isEmpty()) { | 111 if (values.isEmpty()) { |
| 117 peer = new SQRelationValue( | 112 peer = new SQRelationValue( |
| 118 owner, | 113 owner, |
| 119 parameter, | 114 parameter, |
| 120 fraction, | |
| 121 result.get(0), | 115 result.get(0), |
| 122 a, | 116 a, |
| 123 b, | 117 b, |
| 124 qMax, | 118 qMax, |
| 125 rSQ, | 119 rSQ, |