Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/TkhSeriesImport.java @ 9032:1f63e9d3b0ec
New columns for bed_height, tkh and depth_evolution, a few syntactic corrections for Oracle
author | mschaefer |
---|---|
date | Fri, 27 Apr 2018 17:35:12 +0200 |
parents | dcbdff96d1a8 |
children | 4c5eeaff554c |
comparison
equal
deleted
inserted
replaced
9031:efd2de78d158 | 9032:1f63e9d3b0ec |
---|---|
16 import org.apache.log4j.Logger; | 16 import org.apache.log4j.Logger; |
17 import org.dive4elements.river.importer.ImporterSession; | 17 import org.dive4elements.river.importer.ImporterSession; |
18 import org.dive4elements.river.importer.common.StoreMode; | 18 import org.dive4elements.river.importer.common.StoreMode; |
19 import org.dive4elements.river.model.River; | 19 import org.dive4elements.river.model.River; |
20 import org.dive4elements.river.model.sinfo.Tkh; | 20 import org.dive4elements.river.model.sinfo.Tkh; |
21 import org.dive4elements.river.model.sinfo.Tkh.Group; | |
21 import org.hibernate.Query; | 22 import org.hibernate.Query; |
22 import org.hibernate.Session; | 23 import org.hibernate.Session; |
23 | 24 |
24 /** | 25 /** |
25 * Imported Transportkörperhöhe data series group of a river | 26 * Imported Transportkörperhöhe data series group of a river |
35 | 36 |
36 /** | 37 /** |
37 * Name of the imported file without type extension | 38 * Name of the imported file without type extension |
38 */ | 39 */ |
39 private final String filename; | 40 private final String filename; |
41 | |
42 private Group group; | |
40 | 43 |
41 private String kmrange_info; | 44 private String kmrange_info; |
42 | 45 |
43 private String comment; | 46 private String comment; |
44 | 47 |
62 | 65 |
63 /***** METHODS *****/ | 66 /***** METHODS *****/ |
64 | 67 |
65 public String getFilename() { | 68 public String getFilename() { |
66 return this.filename; | 69 return this.filename; |
70 } | |
71 | |
72 public Group getGroup() { | |
73 return this.group; | |
74 } | |
75 | |
76 public void setGroup(final Group group) { | |
77 this.group = group; | |
67 } | 78 } |
68 | 79 |
69 public String getKmrange_info() { | 80 public String getKmrange_info() { |
70 return this.kmrange_info; | 81 return this.kmrange_info; |
71 } | 82 } |
139 query.setParameter("filename", this.filename.toLowerCase()); | 150 query.setParameter("filename", this.filename.toLowerCase()); |
140 return query.list(); | 151 return query.list(); |
141 } | 152 } |
142 | 153 |
143 private Tkh createSeriesItem(final River river) { | 154 private Tkh createSeriesItem(final River river) { |
144 return new Tkh(river, this.filename, this.kmrange_info, this.comment, this.day, this.sounding_info, this.evaluation_by); | 155 return new Tkh(river, this.filename, this.kmrange_info, this.comment, this.day, this.sounding_info, this.evaluation_by, this.group); |
145 } | 156 } |
146 } | 157 } |