Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java @ 5845:1830dae8cb9b
Importer-Parser: set time intevals for complete years when parsing years
| author | Tom Gottfried <tom.gottfried@intevation.de> |
|---|---|
| date | Fri, 26 Apr 2013 08:52:18 +0200 |
| parents | 4dd33b86dc61 |
| children | 92bc0aa3831d |
comparison
equal
deleted
inserted
replaced
| 5844:4dd33b86dc61 | 5845:1830dae8cb9b |
|---|---|
| 157 return tmp; | 157 return tmp; |
| 158 } | 158 } |
| 159 } | 159 } |
| 160 | 160 |
| 161 | 161 |
| 162 public static Date getDateFromYear(int year) { | 162 public static Date getStartDateFromYear(int year) { |
| 163 Calendar cal = Calendar.getInstance(); | 163 Calendar cal = Calendar.getInstance(); |
| 164 cal.set(year, 0, 1); | 164 cal.clear(); |
| 165 cal.set(year, 0, 1, 0, 0, 0); | |
| 166 | |
| 167 return cal.getTime(); | |
| 168 } | |
| 169 | |
| 170 public static Date getEndDateFromYear(int year) { | |
| 171 Calendar cal = Calendar.getInstance(); | |
| 172 cal.clear(); | |
| 173 cal.set(year, 11, 31, 23, 59, 59); | |
| 165 | 174 |
| 166 return cal.getTime(); | 175 return cal.getTime(); |
| 167 } | 176 } |
| 168 | 177 |
| 169 | 178 |
| 235 | 244 |
| 236 try { | 245 try { |
| 237 int lower = Integer.valueOf(lo); | 246 int lower = Integer.valueOf(lo); |
| 238 int upper = Integer.valueOf(up); | 247 int upper = Integer.valueOf(up); |
| 239 | 248 |
| 240 Date fromYear = getDateFromYear(lower); | 249 Date fromYear = getStartDateFromYear(lower); |
| 241 Date toYear = getDateFromYear(upper); | 250 Date toYear = getEndDateFromYear(upper); |
| 242 | 251 |
| 243 obj.setTimeInterval(new ImportTimeInterval(fromYear, toYear)); | 252 obj.setTimeInterval(new ImportTimeInterval(fromYear, toYear)); |
| 244 } | 253 } |
| 245 catch (NumberFormatException e) { | 254 catch (NumberFormatException e) { |
| 246 log.warn("BHP: could not parse timeinterval", e); | 255 log.warn("BHP: could not parse timeinterval", e); |