Mercurial > dive4elements > river
comparison flys-backend/ChangeLog @ 1259:54365104835c 2.5
merged flys-backend/2.5
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 28 Sep 2012 12:14:18 +0200 |
parents | 2bdbaf9b0cf7 |
children | e1fb4a1e0b4a |
comparison
equal
deleted
inserted
replaced
1190:f514894ec2fd | 1259:54365104835c |
---|---|
1 2011-09-19 Ingo Weinzierl <ingo@intevation.de> | |
2 | |
3 Tagged RELEASE 2.5 | |
4 | |
5 * Changes: Prepared changes for release. | |
6 | |
7 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
8 | |
9 * src/main/java/de/intevation/flys/model/DGM.java: Added function to query | |
10 a DGM by Id. | |
11 | |
12 2011-09-15 Bjoern Schilberg <bjoern@intevation.de> | |
13 | |
14 * pom.xml: Removed oracle dependency. | |
15 | |
16 2011-09-15 Bjoern Schilberg <bjoern@intevation.de> | |
17 | |
18 * doc/schema/oracle.sql: Added inital oracle schema. | |
19 | |
20 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
21 | |
22 * doc/schema/oracle-spatial_idx.sql: Added inital oracle-spatial_idx.sql | |
23 script. | |
24 | |
25 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
26 | |
27 * doc/schema/oracle-spatial.sql: Deactivated spatial indexes. | |
28 | |
29 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
30 | |
31 * doc/schema/oracle_create_user.sql: Added inital oracle_create_user.sql | |
32 script. | |
33 | |
34 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
35 | |
36 * doc/schema/oracle-spatial.sql: Added schema floodplain. | |
37 | |
38 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
39 | |
40 * doc/schema/oracle-spatial.sql: Added schema hws. | |
41 | |
42 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
43 | |
44 * doc/schema/oracle-spatial.sql: Added schema cross_section_tracks. | |
45 | |
46 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
47 | |
48 * doc/schema/oracle-spatial.sql: Added schema river_axes. | |
49 | |
50 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
51 | |
52 * doc/schema/oracle-spatial.sql: Added schema fixpoints. | |
53 | |
54 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
55 | |
56 * doc/schema/oracle-spatial.sql: Added schema buildings. | |
57 | |
58 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
59 | |
60 * doc/schema/oracle-spatial.sql: Fixed table river_axes_km. | |
61 | |
62 2011-09-13 Bjoern Schilberg <bjoern@intevation.de> | |
63 | |
64 * doc/schema/oracle-spatial.sql: Added initial oracle schemas. | |
65 | |
66 2011-09-12 Bjoern Schilberg <bjoern@intevation.de> | |
67 | |
68 * doc/schema/postgresql-spatial.sql: Added initial schemas for | |
69 Hydrologie/Einzugsgebiete, Hydrologie/HW-Schutzanlagen, Hydrologie/Hydr. | |
70 Grenzen/Linien, BfG/hauptoeff_*.shp, BfG/MNQ-*.shp, | |
71 BfG/modellgrenze*.shp, BfG/uferlinie.shp, BfG/vorland_*.shp, | |
72 Hydrologie/Streckendaten, Hydrologie/UeSG/Berechnung, | |
73 Hydrologie/UeSG/Messung | |
74 | |
75 2011-09-02 Ingo Weinzierl <ingo@intevation.de> | |
76 | |
77 * doc/schema/postgresql-spatial.sql: Removed SERIALs from schema. | |
78 Auto-Increment is realized through SERIALs now. | |
79 | |
80 * src/main/java/de/intevation/flys/model/DGM.java: The table for dem has | |
81 been renamed to 'dem' (before 'dgm'). | |
82 | |
83 2011-09-01 Hans Plum <hans@intevation.de> | |
84 | |
85 * doc/schema/postgresql-spatial.sql: | |
86 Hint for unifying table names: dgm -> dem | |
87 | |
88 2011-09-01 Hans Plum <hans@intevation.de> | |
89 | |
90 * doc/schema/postgresql-spatial.sql: | |
91 Added mappings to existing data in file system (based on | |
92 river Saar); added TODOs for missing tables/mappings | |
93 | |
94 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
95 | |
96 * doc/schema/postgresql-spatial.sql: New relation for floodplains (german | |
97 "Talaue"). | |
98 | |
99 * src/main/java/de/intevation/flys/model/Floodplain.java: New. Model class | |
100 that represents a floodplain. | |
101 | |
102 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
103 Registered the Floodplain mapping. | |
104 | |
105 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
106 | |
107 * doc/schema/postgresql-spatial.sql: Added a relation for DGMs. Note, that | |
108 no data of the DGM is stored in this relation, but only the file path to | |
109 the DGM file. | |
110 | |
111 * src/main/java/de/intevation/flys/model/DGM.java: New. This class provides | |
112 information for a DGM (km range and file path). | |
113 | |
114 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
115 Registered the DGM. | |
116 | |
117 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
118 | |
119 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java: New | |
120 static function to retrieve all CrossSectionTracks of a specific river. | |
121 | |
122 2011-08-25 Ingo Weinzierl <ingo@intevation.de> | |
123 | |
124 * src/main/java/de/intevation/flys/utils/FileTools.java: Moved to | |
125 artifacts-common module. | |
126 | |
127 * src/main/java/de/intevation/flys/importer/parsers/PegelGltParser.java, | |
128 src/main/java/de/intevation/flys/importer/parsers/PRFParser.java, | |
129 src/main/java/de/intevation/flys/importer/parsers/HYKParser.java, | |
130 src/main/java/de/intevation/flys/importer/parsers/AnnotationsParser.java, | |
131 src/main/java/de/intevation/flys/importer/parsers/InfoGewParser.java, | |
132 src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
133 src/main/java/de/intevation/flys/importer/ImportGauge.java: Adjusted | |
134 imports of FileTools. | |
135 | |
136 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
137 | |
138 * src/main/java/de/intevation/flys/model/Gauge.java (getMainValues) | |
139 (setMainValues): | |
140 New method and mapping to get/set MainValues of a Gauge. Essentially | |
141 developed by Sascha L. Teichmann. | |
142 | |
143 2011-08-22 Ingo Weinzierl <ingo@intevation.de> | |
144 | |
145 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
146 Reverted the default db dialect to PostgreSQL - this has been changed to | |
147 PostGIS by accident. | |
148 Configure the dialect "org.hibernatespatial.postgis.PostgisDialect" to | |
149 use the PostGIS stuff. | |
150 | |
151 2011-08-22 Ingo Weinzierl <ingo@intevation.de> | |
152 | |
153 * src/main/java/de/intevation/flys/model/RiverAxis.java: Added a function | |
154 that returns the RiverAxis for a given River. | |
155 | |
156 * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Use the new | |
157 function of RiverAxis to retrieve the RiverAxis. | |
158 | |
159 2011-08-18 Ingo Weinzierl <ingo@intevation.de> | |
160 | |
161 * doc/schema/postgresql-spatial.sql: The PostGIS database schema for | |
162 FLYS spatial data. | |
163 | |
164 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java, | |
165 src/main/java/de/intevation/flys/model/RiverAxis.java, | |
166 src/main/java/de/intevation/flys/model/Line.java, | |
167 src/main/java/de/intevation/flys/model/Building.java, | |
168 src/main/java/de/intevation/flys/model/Fixpoint.java: Model classes that | |
169 represent FLYS spatial data. | |
170 | |
171 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
172 Registered model classes. | |
173 | |
174 * pom.xml: Added dependencies to HibernateSpatial and PostGIS. | |
175 | |
176 * src/main/java/de/intevation/flys/backend/SpatialInfo.java, | |
177 contrib/spatial-info.sh: A small demo application that prints out some | |
178 information about spatial data of specific rivers. Modify the system | |
179 property -Dflys.backend.spatial.river to get information of a river of | |
180 your choice. | |
181 | |
182 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
183 | |
184 Re-enabled Hibernate schema dumps. | |
185 | |
186 * src/main/java/de/intevation/flys/App.java: Removed old code | |
187 and use new SessionFactoryProvider infrastructure. | |
188 | |
189 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
190 Added methods to create db configurations without opening them. | |
191 Useful for introspection only purposes. | |
192 | |
193 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
194 | |
195 * pom.xml: Bumped Apache DBCP up to 1.4 to use the same version | |
196 as artifact database. | |
197 | |
198 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
199 | |
200 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
201 Make use of the LRU cache from artifacts common. | |
202 | |
203 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
204 | |
205 * doc/schema/postgresql.sql: Added missing foreign key contraint on hyks table. | |
206 To update existing databases: | |
207 | |
208 ALTER TABLE hyks ADD CONSTRAINT hyks_river_id_fkey FOREIGN KEY (river_id) REFERENCES rivers(id); | |
209 | |
210 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
211 | |
212 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: | |
213 Check if zone coordinates in HYKs are swapped and warn the user. | |
214 | |
215 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
216 | |
217 * src/main/java/de/intevation/flys/model/HYK.java | |
218 src/main/java/de/intevation/flys/importer/parsers/HYKParser.java, | |
219 src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, | |
220 src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, | |
221 src/main/java/de/intevation/flys/importer/ImportHYK.java: | |
222 Various small fixes and some extra logging. | |
223 | |
224 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
225 | |
226 * src/main/java/de/intevation/flys/importer/Config.java: New. | |
227 Central singleton to configure the Importer. | |
228 Uses system properties by now: | |
229 | |
230 flys.backend.importer.dry.run: boolean | |
231 default false. true: don't write to database. | |
232 | |
233 flys.backend.importer.annotation.types: String | |
234 default unset. Filename of annotation type classifications. | |
235 | |
236 flys.backend.importer.skip.gauges: boolean | |
237 default: false. true: don't parse/store *.glt, *.sta files | |
238 | |
239 flys.backend.importer.skip.annotations: boolean | |
240 default: false. true: don't parse/store *.km files | |
241 | |
242 flys.backend.importer.skip.prfs: boolean | |
243 default: false. true: don't parse/store *.prf files | |
244 | |
245 flys.backend.importer.skip.hyks: boolean | |
246 default: false. true: don't parse/store *.hyk files | |
247 | |
248 flys.backend.importer.skip.wst: boolean | |
249 default: false. true: don't parse/store river wst files | |
250 | |
251 flys.backend.importer.skip.extra.wsts: boolean | |
252 default: false. true: don't parse/store extra *.zus, *.wst files | |
253 | |
254 flys.backend.importer.skip.fixations: boolean | |
255 default: false. true: don't parse/store fixation *.wst files | |
256 | |
257 flys.backend.importer.skip.official.lines: boolean | |
258 default: false. true: don't parse/store 'amtliche Linien' *.wst files | |
259 | |
260 flys.backend.importer.skip.flood.water: boolean | |
261 default: false. true: don't parse/store 'HW-Marken' *.wst files | |
262 | |
263 flys.backend.importer.skip.flood.protection: boolean | |
264 default: false. true: don't parse/store 'HW-Schutzanlagen' *.wst files | |
265 | |
266 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
267 | |
268 * src/main/java/de/intevation/flys/model/HYKEntry.java: Fixed OrderBy | |
269 clause. | |
270 | |
271 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
272 | |
273 * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, | |
274 src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java, | |
275 src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, | |
276 src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
277 src/main/java/de/intevation/flys/importer/ImportHYK.java: | |
278 Store HYK data structures to database. Needs testing. | |
279 | |
280 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
281 | |
282 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
283 Parse the HYKs from the importer. TODO: Store them in database. | |
284 | |
285 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
286 | |
287 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: | |
288 Create data structures while parsing. | |
289 | |
290 * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, | |
291 src/main/java/de/intevation/flys/importer/ImportHYK.java: Added | |
292 getters/setters to ease model wiring. | |
293 | |
294 2011-07-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
295 | |
296 * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, | |
297 src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java, | |
298 src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, | |
299 src/main/java/de/intevation/flys/importer/ImportHYK.java: New. | |
300 Importer models for HYKs. | |
301 | |
302 2011-07-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
303 | |
304 * doc/schema/postgresql.sql: Each entry in a HYK can have | |
305 an optional 'Peilungsjahr' (measure) not only the whole HYK. | |
306 To update existing databases: | |
307 BEGIN; | |
308 ALTER TABLE hyks DROP COLUMN measure; | |
309 ALTER TABLE hyk_entries ADD COLUMN measure TIMESTAMP; | |
310 COMMIT; | |
311 | |
312 * src/main/java/de/intevation/flys/model/HYKEntry.java, | |
313 src/main/java/de/intevation/flys/model/HYK.java: | |
314 Adjusted Hibernate models. | |
315 | |
316 2011-07-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
317 | |
318 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: | |
319 Added callback mechanism and recursive file search like in the PRF parser. | |
320 All BfG-HYK files seem to parse correctly now. TODO: Build the data structures. | |
321 | |
322 * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java: | |
323 Added x.canRead() before accepting files for parsing. | |
324 | |
325 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
326 | |
327 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: | |
328 Initial version of the HYK parser. Not ready, yet. | |
329 | |
330 * src/main/java/de/intevation/flys/importer/ImportHYKFlowZoneType.java: | |
331 Importer model for HYK flow zone types. | |
332 | |
333 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
334 | |
335 * doc/schema/postgresql.sql: Argh! Added distance_{vl|hf|vr} to | |
336 wrong table. | |
337 To update existing databases: | |
338 BEGIN; | |
339 ALTER TABLE hyk_entries DROP COLUMN distance_vl; | |
340 ALTER TABLE hyk_entries DROP COLUMN distance_hf; | |
341 ALTER TABLE hyk_entries DROP COLUMN distance_vr; | |
342 ALTER TABLE hyk_formations ADD COLUMN distance_vl NUMERIC NOT NULL; | |
343 ALTER TABLE hyk_formations ADD COLUMN distance_hf NUMERIC NOT NULL; | |
344 ALTER TABLE hyk_formations ADD COLUMN distance_vr NUMERIC NOT NULL; | |
345 COMMIT; | |
346 | |
347 * src/main/java/de/intevation/flys/model/HYKFormation.java, | |
348 src/main/java/de/intevation/flys/model/HYKEntry.java: | |
349 Adjusted Hibernate models. | |
350 | |
351 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
352 | |
353 * src/main/java/de/intevation/flys/utils/FileTools.java: Added method | |
354 walkTree() to traverse a directory tree. To be reused in HYK parser. | |
355 | |
356 * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java: | |
357 Uses the FileTools.walkTree() method now to find all PRF file. | |
358 | |
359 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
360 | |
361 * doc/schema/postgresql.sql: Added missing columns. | |
362 To update existing databases: | |
363 BEGIN; | |
364 ALTER TABLE hyks ADD COLUMN measure TIMESTAMP; | |
365 ALTER TABLE hyk_entries ADD COLUMN distance_vl NUMERIC NOT NULL; | |
366 ALTER TABLE hyk_entries ADD COLUMN distance_hf NUMERIC NOT NULL; | |
367 ALTER TABLE hyk_entries ADD COLUMN distance_vr NUMERIC NOT NULL; | |
368 COMMIT; | |
369 | |
370 * src/main/java/de/intevation/flys/model/HYKEntry.java, | |
371 src/main/java/de/intevation/flys/model/HYK.java: | |
372 Adjusted Hibernate models. | |
373 | |
374 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
375 | |
376 * src/main/java/de/intevation/flys/importer/parsers/*.java: | |
377 New package. Moved the file parsers (*.gew, *.sta, *.at, *.glt, *.prf, *.km, *.wst) | |
378 into this package. | |
379 | |
380 * src/main/java/de/intevation/flys/importer/*.java: Adjusted the imports. | |
381 | |
382 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
383 | |
384 * src/main/java/de/intevation/flys/model/HYKFormation.java, | |
385 src/main/java/de/intevation/flys/model/HYKEntry.java, | |
386 src/main/java/de/intevation/flys/model/HYKFlowZone.java, | |
387 src/main/java/de/intevation/flys/model/HYKFlowZoneType.java, | |
388 src/main/java/de/intevation/flys/model/HYK.java: New. The hibernate models | |
389 for the HYK structures. | |
390 | |
391 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
392 Registered new models. | |
393 | |
394 * src/main/java/de/intevation/flys/model/CrossSection.java: Added | |
395 'order by' annotation for fetching the cross section lines. | |
396 | |
397 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
398 | |
399 * doc/schema/postgresql.sql: Added structures for HYKs "Hydraulische Kenngroessen" | |
400 To update existing databases: | |
401 | |
402 BEGIN; | |
403 CREATE SEQUENCE HYKS_ID_SEQ; | |
404 CREATE TABLE hyks ( | |
405 id int PRIMARY KEY NOT NULL, | |
406 river_id int NOT NULL, | |
407 description VARCHAR(256) NOT NULL | |
408 ); | |
409 | |
410 CREATE SEQUENCE HYK_ENTRIES_ID_SEQ; | |
411 CREATE TABLE hyk_entries ( | |
412 id int PRIMARY KEY NOT NULL, | |
413 hyk_id int NOT NULL REFERENCES hyks(id), | |
414 km NUMERIC NOT NULL, | |
415 UNIQUE (hyk_id, km) | |
416 ); | |
417 | |
418 CREATE SEQUENCE HYK_FORMATIONS_ID_SEQ; | |
419 CREATE TABLE hyk_formations ( | |
420 id int PRIMARY KEY NOT NULL, | |
421 formation_num int NOT NULL DEFAULT 0, | |
422 hyk_entry_id int NOT NULL REFERENCES hyk_entries(id), | |
423 top NUMERIC NOT NULL, | |
424 bottom NUMERIC NOT NULL, | |
425 UNIQUE (hyk_entry_id, formation_num) | |
426 ); | |
427 | |
428 CREATE SEQUENCE HYK_FLOW_ZONE_TYPES_ID_SEQ; | |
429 CREATE TABLE hyk_flow_zone_types ( | |
430 id int PRIMARY KEY NOT NULL, | |
431 name VARCHAR(50) NOT NULL UNIQUE, | |
432 description VARCHAR(256) | |
433 ); | |
434 | |
435 CREATE SEQUENCE HYK_FLOW_ZONES_ID_SEQ; | |
436 CREATE TABLE hyk_flow_zones ( | |
437 id int PRIMARY KEY NOT NULL, | |
438 formation_id int NOT NULL REFERENCES hyk_formations(id), | |
439 type_id int NOT NULL REFERENCES hyk_flow_zone_types(id), | |
440 a NUMERIC NOT NULL, | |
441 b NUMERIC NOT NULL, | |
442 CHECK (a <= b) | |
443 ); | |
444 COMMIT; | |
445 | |
446 2011-07-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
447 | |
448 * pom.xml: Bumped Hibernate up to 3.6.5. | |
449 | |
450 2011-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
451 | |
452 * src/main/java/de/intevation/flys/utils/FileTools.java: Argh! | |
453 Forget to call the file hashing so only the file lengths were | |
454 compared. | |
455 | |
456 2011-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
457 | |
458 * src/main/java/de/intevation/flys/utils/FileTools.java: | |
459 Added a class HashedFile to compare files by there length | |
460 and a message digest. Digest can be set with system property | |
461 "flys.backend.file.cmp.digest" and defaults to MD5. Useful to | |
462 detect file duplicates. | |
463 | |
464 * src/main/java/de/intevation/flys/importer/PRFParser.java: Added | |
465 method prfAccept(File) to callback to check if a found PRF file | |
466 should be parsed. Useful to prevent parsing file duplicates. | |
467 | |
468 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
469 Use the HashedFile and the PRFParser.Callback to prevent | |
470 parsing of PRF duplicates. | |
471 | |
472 2011-07-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
473 | |
474 * doc/schema/postgresql.sql: Misspelled sequence. | |
475 To update existing databases: | |
476 | |
477 DROP SEQUENCE CROSS_SECTION_LINES_SEQ; | |
478 CREATE SEQUENCE CROSS_SECTION_LINES_ID_SEQ; | |
479 | |
480 * src/main/java/de/intevation/flys/importer/ImportCrossSection.java: | |
481 Added some logging because importing is slow. | |
482 | |
483 * src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java: | |
484 Prevent NPE if a cross section line from db has no points. | |
485 | |
486 2011-07-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
487 | |
488 Parse all PRFs in all subfolders of a river and store them | |
489 as cross sections into the database. Needs testing! | |
490 | |
491 * src/main/java/de/intevation/flys/importer/ImportCrossSection.java, | |
492 src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java: | |
493 New. Importer models for cross sections. | |
494 | |
495 * src/main/java/de/intevation/flys/importer/XY.java: | |
496 New. Made top level class from inner PRFParser.XY. | |
497 | |
498 * src/main/java/de/intevation/flys/importer/PRFParser.java: | |
499 Moved out XY class. Renamed callback. | |
500 | |
501 * src/main/java/de/intevation/flys/model/CrossSection.java, | |
502 src/main/java/de/intevation/flys/model/CrossSectionLine.java, | |
503 src/main/java/de/intevation/flys/model/CrossSectionPoint.java, | |
504 src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: | |
505 Added convinience constructors. | |
506 | |
507 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
508 Parse and store cross sections into database. | |
509 | |
510 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
511 | |
512 * doc/schema/postgresql.sql: Introduced a new table cross_section_line | |
513 holding the km of a set of points. | |
514 | |
515 * src/main/java/de/intevation/flys/model/CrossSectionLine.java: | |
516 New. Model for a single line of a "Querprofil". | |
517 | |
518 * src/main/java/de/intevation/flys/model/CrossSection.java: Removed | |
519 'km' and 'points' they are part of the line now. | |
520 | |
521 * src/main/java/de/intevation/flys/model/CrossSectionPoint.java: | |
522 They reference to the containing line now. | |
523 | |
524 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
525 Registered new model. | |
526 | |
527 To update existing databases: | |
528 BEGIN; | |
529 DROP SEQUENCE CROSS_SECTIONS_ID_SEQ; | |
530 DROP SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; | |
531 DROP TABLE cross_section_points; | |
532 DROP TABLE cross_sections; | |
533 CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ; | |
534 CREATE TABLE cross_sections ( | |
535 id int PRIMARY KEY NOT NULL, | |
536 river_id int NOT NULL REFERENCES rivers(id), | |
537 time_interval_id int REFERENCES time_intervals(id), | |
538 description VARCHAR(256) | |
539 ); | |
540 CREATE SEQUENCE CROSS_SECTION_LINES_SEQ; | |
541 CREATE TABLE cross_section_lines ( | |
542 id int PRIMARY KEY NOT NULL, | |
543 km NUMERIC NOT NULL, | |
544 cross_section_id int NOT NULL REFERENCES cross_sections(id), | |
545 UNIQUE (km, cross_section_id) | |
546 ); | |
547 CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; | |
548 CREATE TABLE cross_section_points ( | |
549 id int PRIMARY KEY NOT NULL, | |
550 cross_section_line_id int NOT NULL REFERENCES cross_section_lines(id), | |
551 col_pos int NOT NULL, | |
552 x NUMERIC NOT NULL, | |
553 y NUMERIC NOT NULL, | |
554 UNIQUE (cross_section_line_id, col_pos) | |
555 ); | |
556 COMMIT; | |
557 | |
558 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
559 | |
560 * doc/schema/postgresql.sql: Dropped constraint that enforces the | |
561 uniqueness of km and river. This is violated because there are | |
562 more than one sounding in different year at the same km of a river. | |
563 Added column 'description' to the cross section table to make it | |
564 human readable. | |
565 | |
566 To update existing databases: | |
567 | |
568 ALTER TABLE cross_sections DROP CONSTRAINT cross_sections_km_key; | |
569 ALTER TABLE cross_sections ADD COLUMN description VARCHAR(256); | |
570 | |
571 * src/main/java/de/intevation/flys/model/CrossSection.java: | |
572 Added the description column to the Hibernate model. | |
573 | |
574 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
575 | |
576 * doc/schema/postgresql.sql: Dropped constraint that enforces the | |
577 uniqueness of x in a "Querprofil-Spur". There are vertical lines | |
578 in the soundings so this constraint is violated. | |
579 | |
580 To update existing databases: | |
581 | |
582 ALTER TABLE cross_section_points DROP CONSTRAINT cross_section_points_cross_section_id_key2; | |
583 | |
584 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
585 | |
586 * src/main/java/de/intevation/flys/importer/PRFParser.java: | |
587 Added a callback to be called from parsePRFs() if | |
588 a PRF was parsed successfully. Useful to scan whole | |
589 sub directories for PRF files. | |
590 | |
591 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
592 | |
593 * src/main/java/de/intevation/flys/importer/PRFParser.java: | |
594 Extract the year of sounding from file names. If not found | |
595 from the name of th containing directory. Description is made | |
596 of file name and parent directory file name. | |
597 | |
598 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
599 | |
600 * src/main/java/de/intevation/flys/importer/PRFParser.java: | |
601 Extracted the data. All BfG PRFs are parsed correctly, now. | |
602 | |
603 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
604 | |
605 * src/main/java/de/intevation/flys/importer/PRFParser.java: | |
606 Extract km from lines. TODO: extract data. | |
607 | |
608 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
609 | |
610 * src/main/java/de/intevation/flys/importer/PRFParser.java: New. | |
611 Parser for PRF files. TODO extra data and station from data lines. | |
612 | |
613 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
614 | |
615 * src/main/java/de/intevation/flys/model/Point3d.java: Deleted. | |
616 Not needed (braindead). | |
617 | |
618 * src/main/java/de/intevation/flys/model/CrossSectionPoint.java: | |
619 Directly store the x/y values now. | |
620 | |
621 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
622 Removed registration of Point3d. | |
623 | |
624 To update existing databases: | |
625 | |
626 BEGIN; | |
627 ALTER TABLE cross_section_points DROP COLUMN point3d_id; | |
628 DROP SEQUENCE POINTS3D_ID_SEQ; | |
629 DROP TABLE points3d; | |
630 ALTER TABLE cross_section_points ADD COLUMN x NUMERIC NOT NULL; | |
631 ALTER TABLE cross_section_points ADD COLUMN y NUMERIC NOT NULL; | |
632 ALTER TABLE cross_section_points ADD CONSTRAINT | |
633 cross_section_points_cross_section_id_key2 UNIQUE (cross_section_id, x); | |
634 COMMIT; | |
635 | |
636 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
637 | |
638 * src/main/java/de/intevation/flys/model/CrossSection.java, | |
639 src/main/java/de/intevation/flys/model/CrossSectionPoint.java: | |
640 New. Hibernate models for cross-sections and their forming points. | |
641 | |
642 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
643 Registered the new models. | |
644 | |
645 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
646 | |
647 * src/main/java/de/intevation/flys/model/Point3d.java: New. point3d model | |
648 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
649 Registered point3d model. | |
650 | |
651 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
652 | |
653 * doc/schema/postgresql.sql: Add relations for cross sections. | |
654 To update existing databases: | |
655 BEGIN; | |
656 | |
657 CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ; | |
658 CREATE TABLE cross_sections ( | |
659 id int PRIMARY KEY NOT NULL, | |
660 km NUMERIC NOT NULL, | |
661 river_id int NOT NULL REFERENCES rivers(id), | |
662 time_interval_id int REFERENCES time_intervals(id), | |
663 UNIQUE (km, river_id) | |
664 ); | |
665 | |
666 CREATE SEQUENCE POINTS3D_ID_SEQ; | |
667 CREATE TABLE points3d ( | |
668 id int PRIMARY KEY NOT NULL, | |
669 x NUMERIC NOT NULL, | |
670 y NUMERIC NOT NULL, | |
671 z NUMERIC NOT NULL | |
672 ); | |
673 | |
674 CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; | |
675 CREATE TABLE cross_section_points ( | |
676 id int PRIMARY KEY NOT NULL, | |
677 cross_section_id int NOT NULL REFERENCES cross_sections(id), | |
678 point3d_id int NOT NULL REFERENCES points3d(id), | |
679 col_pos int NOT NULL, | |
680 UNIQUE (cross_section_id, point3d_id, col_pos), | |
681 UNIQUE (cross_section_id, col_pos) | |
682 ); | |
683 | |
684 COMMIT; | |
685 | |
686 2011-06-28 Ingo Weinzierl <ingo@intevation.de> | |
687 | |
688 Tagged RELEASE 2.4 | |
689 | |
690 2011-06-27 Ingo Weinzierl <ingo@intevation.de> | |
691 | |
692 * Changes: Prepared changes for the upcoming release. | |
693 | |
694 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
695 | |
696 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, | |
697 src/main/java/de/intevation/flys/importer/AnnotationClassifier.java, | |
698 src/main/java/de/intevation/flys/importer/AtFileParser.java, | |
699 src/main/java/de/intevation/flys/importer/ValueKey.java, | |
700 src/main/java/de/intevation/flys/importer/WstParser.java: | |
701 Removed trailing whitespace. | |
702 | |
703 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
704 | |
705 * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: | |
706 Removed superfluous imports. | |
707 | |
708 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
709 | |
710 * src/main/java/de/intevation/flys/model/River.java: | |
711 Added a method maxOverlap to determine the gauge which has | |
712 the max common length to a given interval. This is for | |
713 numerical stability in slightly overlapping gauge ranges. | |
714 | |
715 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
716 | |
717 * src/main/java/de/intevation/flys/model/River.java: When | |
718 looking up a gauge by km containment use precision of 1e-6. | |
719 | |
720 2011-06-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
721 | |
722 * src/main/java/de/intevation/flys/model/River.java: | |
723 Added method to find gauge by its name. | |
724 | |
725 2011-06-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
726 | |
727 * doc/annotation-types.xml: Fixed some rules. | |
728 | |
729 * src/main/java/de/intevation/flys/importer/Importer.java, | |
730 src/main/java/de/intevation/flys/importer/InfoGewParser.java, | |
731 src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
732 Call the right constructors now. | |
733 | |
734 * src/main/java/de/intevation/flys/importer/ImportAnnotationType.java: | |
735 Added getter/setter for name property. | |
736 | |
737 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: | |
738 Print duplicated at WARN level not as DEBUG. | |
739 | |
740 * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: | |
741 Fixed XPath expression to build the internal lookup structures | |
742 correctly. | |
743 | |
744 2011-06-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
745 | |
746 Added classification of annotation types. Needs testing! | |
747 | |
748 * doc/annotation-types.xml: New. Rules to classify the different | |
749 types of annotations. The classification works like this: | |
750 | |
751 There are unique types like 'Bruecke', 'Pegel' and so on. | |
752 They are defined in the /annotation/type section and | |
753 identified by their name. One of the types can be set | |
754 as the default type if no rule applies. | |
755 | |
756 In the /annotation/pattern section are two types of pattern. | |
757 | |
758 1 - file pattern: If a KM file is opened its filename is | |
759 matched against the regular expressions of these | |
760 patterns. If a match is found the corresponding type | |
761 is used as the default type in the open file. | |
762 If no match is found the global default type is used | |
763 as the default type. | |
764 | |
765 2 - line patterns: For each line of an open KM file these | |
766 patterns are applied to find a match. If a match is | |
767 found the corresponding type is used as the type of | |
768 the annotation. If no match is found the default | |
769 file default is assumed to be the right type. For | |
770 the file default see 1. | |
771 | |
772 * src/main/java/de/intevation/flys/importer/Importer.java: | |
773 To activate the annotation type classification set | |
774 the system property | |
775 | |
776 'flys.backend.importer.annotation.types' | |
777 | |
778 to the path of a XML looking like the annotation-types.xml | |
779 file. If the system property is not set no classification | |
780 is done. | |
781 | |
782 * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: | |
783 New. Implements the classification. | |
784 | |
785 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, | |
786 src/main/java/de/intevation/flys/importer/InfoGewParser.java, | |
787 src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
788 Looped through the annotation type classification. | |
789 | |
790 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
791 | |
792 * src/main/java/de/intevation/flys/model/River.java: | |
793 Added method to find gauge by a position lying in its range. | |
794 | |
795 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
796 | |
797 First part of flys/issue18 | |
798 | |
799 * doc/schema/postgresql.sql: Add new table 'annotation_types'. | |
800 To update existing databases: | |
801 BEGIN; | |
802 CREATE SEQUENCE ANNOTATION_TYPES_ID_SEQ; | |
803 CREATE TABLE annotation_types ( | |
804 id int PRIMARY KEY NOT NULL, | |
805 name VARCHAR(256) NOT NULL UNIQUE | |
806 ); | |
807 ALTER TABLE annotations ADD COLUMN type_id int REFERENCES annotation_types(id); | |
808 COMMIT; | |
809 | |
810 * doc/schema/postgresql-cleanup.sql: Removed. Hopeless out-dated. | |
811 | |
812 * src/main/java/de/intevation/flys/model/AnnotationType.java: | |
813 New. Hibernate model to access the type. | |
814 | |
815 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
816 Register the new backend type. | |
817 | |
818 * src/main/java/de/intevation/flys/model/Annotation.java: | |
819 References the annotation type. | |
820 | |
821 * src/main/java/de/intevation/flys/importer/ImportAnnotationType.java: | |
822 New. Model to help import the annotation type. | |
823 | |
824 * src/main/java/de/intevation/flys/importer/ImportAnnotation.java: | |
825 Uses the import type. | |
826 | |
827 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: | |
828 Set the annotation type to 'null'. TODO: Do the classification! | |
829 | |
830 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
831 | |
832 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
833 Fix for flys/issue110. start index was shifted by one. | |
834 | |
835 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
836 | |
837 * src/main/java/de/intevation/flys/importer/ImportAnnotation.java: | |
838 Forgot to store reference to edge. | |
839 | |
840 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
841 | |
842 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
843 Register backend model. | |
844 | |
845 * src/main/java/de/intevation/flys/importer/ImportEdge.java: New. Model | |
846 for importing the edges. | |
847 | |
848 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: | |
849 Parses the edges of an annotation, too. | |
850 | |
851 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
852 | |
853 * doc/schema/postgresql.sql: Added table edges to model 'Kanten' of an annotation. | |
854 To update existing databases: | |
855 BEGIN; | |
856 CREATE SEQUENCE EDGES_ID_SEQ; | |
857 CREATE TABLE edges ( | |
858 id int PRIMARY KEY NOT NULL, | |
859 top NUMERIC, | |
860 bottom NUMERIC); | |
861 ALTER TABLE annotations ADD COLUMN edge_id int REFERENCES edges(id); | |
862 COMMIT; | |
863 | |
864 * src/main/java/de/intevation/flys/model/Edge.java: New. A 'Kanten'-Model. | |
865 * src/main/java/de/intevation/flys/model/Annotation.java: References the | |
866 edges. | |
867 | |
868 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
869 | |
870 * src/main/java/de/intevation/flys/model/River.java: | |
871 Added method to find gauge only by station position. | |
872 | |
873 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
874 | |
875 * src/main/java/de/intevation/flys/model/River.java: | |
876 Make search for gauges independent of from/to order. | |
877 | |
878 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
879 | |
880 * doc/schema/postgresql.sql: Added a new view to select qs of a WST. | |
881 To update existing databases: | |
882 | |
883 CREATE VIEW wst_q_values AS | |
884 SELECT wc.position AS column_pos, | |
885 wqr.q AS q, | |
886 r.a AS a, | |
887 r.b AS b, | |
888 wc.wst_id AS wst_id | |
889 FROM wst_column_q_ranges wcqr | |
890 JOIN wst_q_ranges wqr ON wcqr.wst_q_range_id = wqr.id | |
891 JOIN ranges r ON wqr.range_id = r.id | |
892 JOIN wst_columns wc ON wcqr.wst_column_id = wc.id | |
893 ORDER BY wc.position, wcqr.wst_column_id, r.a; | |
894 | |
895 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
896 | |
897 * doc/schema/postgresql.sql: Added a new view to select ws of a WST. | |
898 To update existing databases: | |
899 | |
900 CREATE VIEW wst_w_values AS | |
901 SELECT wcv."position" AS km, | |
902 wcv.w AS w, | |
903 wc."position" AS column_pos, | |
904 w.id AS wst_id | |
905 FROM wst_column_values wcv | |
906 JOIN wst_columns wc ON wcv.wst_column_id = wc.id | |
907 JOIN wsts w ON wc.wst_id = w.id | |
908 ORDER BY wcv."position", wc."position"; | |
909 | |
910 2011-05-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
911 | |
912 flys/issue76 | |
913 | |
914 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
915 Close gaps between q ranges. | |
916 | |
917 2011-05-20 Ingo Weinzierl <ingo@intevation.de> | |
918 | |
919 Tagged RELEASE 2.3.1 | |
920 | |
921 2011-05-13 Ingo Weinzierl <ingo@intevation.de> | |
922 | |
923 Tagged RELEASE 2.3 | |
924 | |
925 2011-05-13 Ingo Weinzierl <ingo@intevation.de> | |
926 | |
927 * Changes: Changes for release 2.3 - see Changes file to get to know about | |
928 the version numbers of this software. | |
929 | |
930 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
931 | |
932 * doc/schema/postgresql.sql: Added a column which tells | |
933 if a river counts its km up or downwards. | |
934 To update existing databases: | |
935 | |
936 ALTER TABLE rivers ADD COLUMN km_up BOOLEAN NOT NULL DEFAULT true; | |
937 | |
938 * src/main/java/de/intevation/flys/model/River.java: | |
939 Adjust Hibernate mapping of new column. | |
940 | |
941 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
942 | |
943 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
944 Fixed flys/issue11 and flys51. | |
945 | |
946 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
947 | |
948 * src/main/java/de/intevation/flys/importer/ValueKey.java: | |
949 Add some unsharp comparison (eps = 1e-6) to avoid | |
950 numerical problems. | |
951 | |
952 * src/main/java/de/intevation/flys/importer/IdValueKey.java: | |
953 Removed. Not need any longer. | |
954 | |
955 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
956 Use unsharp lookup. | |
957 | |
958 * src/main/java/de/intevation/flys/importer/ImportWst.java, | |
959 src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
960 Flush more often. Hopefully this reduces hibernate sync | |
961 problems?! | |
962 | |
963 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
964 | |
965 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
966 Fixed silly bug. Set flush mode back to auto because | |
967 manual flushing causes some undetermined problems. | |
968 | |
969 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
970 | |
971 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
972 Do not load _all_ values from discharge tables and | |
973 wst columns. This is extremly slow and will lead | |
974 to OOM if more rivers are imported. Now only the | |
975 last 20 columns und discharge tables are cached. | |
976 | |
977 * src/main/java/de/intevation/flys/importer/ValueKey.java: | |
978 New. Key for caching discharge table values and wst | |
979 column values. | |
980 | |
981 * src/main/java/de/intevation/flys/importer/IdValueKey.java: | |
982 Fixed bug in equals(). | |
983 | |
984 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: | |
985 Removed too eloquent debug output. | |
986 | |
987 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
988 | |
989 * src/main/java/de/intevation/flys/importer/IdValueKey.java: | |
990 Use BigDecimals as representation for the numeric components | |
991 which prevents running into unique constraint problems | |
992 caused by imprecision. | |
993 | |
994 * src/main/java/de/intevation/flys/importer/ImportRange.java, | |
995 src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
996 Ranges are now cached globally, too. | |
997 | |
998 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: | |
999 Improved logging. | |
1000 | |
1001 * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java: | |
1002 Removed superfluous imports. | |
1003 | |
1004 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1005 | |
1006 * src/main/java/de/intevation/flys/importer/StaFileParser.java: | |
1007 Only accept main value types 'Q', 'W', 'D' and 'T' by default. | |
1008 '-' is not handled any more because it causes too much constraint | |
1009 problems. You can overwrite the imported type with the | |
1010 system property flys.backend.main.value.types" (default "QWTD") | |
1011 | |
1012 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
1013 Set session flush mode to manual. Hopefully this improves the | |
1014 performance a bit. | |
1015 | |
1016 * src/main/java/de/intevation/flys/importer/ImportWst.java, | |
1017 src/main/java/de/intevation/flys/importer/ImportGauge.java, | |
1018 src/main/java/de/intevation/flys/importer/ImportWstColumn.java, | |
1019 src/main/java/de/intevation/flys/importer/ImportRange.java, | |
1020 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
1021 Improved logging. | |
1022 | |
1023 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1024 | |
1025 * src/main/java/de/intevation/flys/importer/WstColumnValueKey.java: Deleted | |
1026 * src/main/java/de/intevation/flys/importer/IdValueKey.java: Reinserted | |
1027 here in a more generalized form. | |
1028 | |
1029 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
1030 Cache the discharge table value, too. | |
1031 | |
1032 * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java: | |
1033 Use the global cache. | |
1034 | |
1035 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1036 | |
1037 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
1038 New. Centralized caching in the thread local context. Importing | |
1039 the Elbe leads to OOM because the column values of the | |
1040 WST files where loaded separately for every file. | |
1041 | |
1042 * src/main/java/de/intevation/flys/importer/ImportPosition.java, | |
1043 src/main/java/de/intevation/flys/importer/Importer.java, | |
1044 src/main/java/de/intevation/flys/importer/ImportAnnotation.java, | |
1045 src/main/java/de/intevation/flys/importer/ImportWstQRange.java, | |
1046 src/main/java/de/intevation/flys/importer/ImportWst.java, | |
1047 src/main/java/de/intevation/flys/importer/ImportMainValue.java, | |
1048 src/main/java/de/intevation/flys/importer/ImportMainValueType.java, | |
1049 src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java, | |
1050 src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
1051 src/main/java/de/intevation/flys/importer/ImportGauge.java, | |
1052 src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java, | |
1053 src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, | |
1054 src/main/java/de/intevation/flys/importer/ImportWstColumn.java, | |
1055 src/main/java/de/intevation/flys/importer/ImportRange.java, | |
1056 src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java, | |
1057 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java, | |
1058 src/main/java/de/intevation/flys/importer/ImportAttribute.java, | |
1059 src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: | |
1060 Adjusted to use the new global context. | |
1061 | |
1062 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1063 | |
1064 * doc/schema/postgresql.sql: Dropped constraint which | |
1065 forces discharge tables to have a unique time interval | |
1066 for a given gauge and kind. | |
1067 | |
1068 There are AT files (historical Mosel/Perl/Perl/1967-1981.at | |
1069 and Mosel/Perl/1967-1981-1.at) which violate this | |
1070 constraint. Its a technical question to the customer | |
1071 how to handle these cases. | |
1072 | |
1073 To adjust existing databases: | |
1074 | |
1075 ALTER TABLE discharge_tables DROP CONSTRAINT discharge_tables_gauge_id_key; | |
1076 | |
1077 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1078 | |
1079 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
1080 There are wst files where column names are not unique. | |
1081 Make them unique by appending (1), (2) and so on. | |
1082 | |
1083 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1084 | |
1085 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1086 Import the "HW-Schutzanlagen", too. | |
1087 | |
1088 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1089 | |
1090 Make import of historical discharge tables work. | |
1091 | |
1092 * doc/schema/postgresql.sql: Added forgotten column 'description'. | |
1093 | |
1094 !!! You have to drop your database !!! | |
1095 | |
1096 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
1097 src/main/java/de/intevation/flys/model/DischargeTable.java: | |
1098 Add the forgotten description property. | |
1099 | |
1100 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
1101 Fixed problems with date recognition. | |
1102 | |
1103 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
1104 Prefix the description of the historical discharge tables | |
1105 with "Histor.Abflusstafeln". | |
1106 | |
1107 * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: | |
1108 Fixed silly programming error. | |
1109 | |
1110 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1111 | |
1112 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
1113 Inject 'kind' attribute. | |
1114 | |
1115 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
1116 Traverse the "Histor.Abflusstafeln" for the historical | |
1117 discharge tables. too. TODO: Store them in the database. | |
1118 | |
1119 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
1120 Added convinience constructor to set the kind of the | |
1121 discharge table. | |
1122 | |
1123 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1124 | |
1125 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1126 Prefix "Zusätzliche Längsschnitte" with "Zus.Längsschnitte" | |
1127 in description. | |
1128 | |
1129 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1130 | |
1131 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1132 Import 'Hochwasser-Marken', too. | |
1133 | |
1134 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
1135 Removed superfluous import. | |
1136 | |
1137 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1138 | |
1139 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
1140 Ignore lines that contain km positions which were found | |
1141 before in the same file. | |
1142 | |
1143 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
1144 | |
1145 * src/main/java/de/intevation/flys/model/River.java: Added a method that | |
1146 returns all gauges of the river intersected by a given start and end | |
1147 point. | |
1148 | |
1149 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1150 | |
1151 * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: | |
1152 Forgot to fetch peer from result set. | |
1153 | |
1154 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1155 | |
1156 * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: | |
1157 New. Importer model help fetching the database peer. | |
1158 | |
1159 * src/main/java/de/intevation/flys/model/TimeInterval.java: | |
1160 Add convinience constructor with start and stop time. | |
1161 | |
1162 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
1163 Attach a time interval to a discharge table if we find one. | |
1164 | |
1165 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
1166 Store the reference to the importer model of the | |
1167 time interval of the discharge table. | |
1168 | |
1169 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1170 | |
1171 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
1172 Try to extract time ranges from at files. | |
1173 | |
1174 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1175 | |
1176 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1177 Parse and store "amtliche Linien" wst files. | |
1178 | |
1179 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1180 | |
1181 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1182 Parse and store fixation wst files as well. | |
1183 | |
1184 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1185 | |
1186 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1187 Parse the "zusaetzliche Laengsschnitte", too. | |
1188 | |
1189 * src/main/java/de/intevation/flys/importer/ImportWst.java: | |
1190 Add getter/setter for column 'kind'. | |
1191 | |
1192 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1193 | |
1194 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
1195 Fixed flys/issue19: Do not take km column in wst file as a water level. | |
1196 | |
1197 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
1198 | |
1199 * src/main/java/de/intevation/flys/model/Gauge.java: Introduced a 'scale' | |
1200 that is used to adjust the range of min/max W values. | |
1201 | |
1202 2011-05-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1203 | |
1204 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
1205 Removed superfluous import. | |
1206 | |
1207 2011-04-20 Ingo Weinzierl <ingo@intevation.de> | |
1208 | |
1209 * src/main/java/de/intevation/flys/importer/WstColumnValueKey.java: | |
1210 New. This class is used as distinct key of a WstColumnValue - e.g. as | |
1211 key in a map. | |
1212 | |
1213 * src/main/java/de/intevation/flys/importer/ImportWst.java: A | |
1214 WstColumnValue cache is build up while initialization. This cache | |
1215 contains all WstColumnValues that exist in the database. | |
1216 | |
1217 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: New | |
1218 constructor that takes the WstColumnValues cache. It is used to | |
1219 initialize new ImportWstColumnValue objects. | |
1220 | |
1221 * src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java: | |
1222 Speedup: A ImportWstColumnValue has a WstColumnValues cache that | |
1223 contains all WstColumnValues existing in the database. This makes it | |
1224 unnecessary to call an sql statement for each WstColumnValue to | |
1225 determine its existence in the database. | |
1226 | |
1227 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1228 | |
1229 * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: | |
1230 Added a view 'wst_value_table' which aggregates the data | |
1231 to build w/q value tables. | |
1232 | |
1233 To update existing databases: | |
1234 | |
1235 BEGIN; | |
1236 CREATE VIEW wst_value_table AS | |
1237 SELECT wcv.position AS position, | |
1238 w, | |
1239 (SELECT q | |
1240 FROM wst_column_q_ranges wcqr | |
1241 JOIN wst_q_ranges wqr | |
1242 ON wcqr.wst_q_range_id = wqr.id | |
1243 JOIN ranges r | |
1244 ON r.id = wqr.range_id | |
1245 WHERE wcqr.wst_column_id = wc.id | |
1246 AND wcv.position BETWEEN r.a AND r.b) AS q, | |
1247 wc.position AS column_pos, | |
1248 w.id AS wst_id | |
1249 FROM wst_column_values wcv | |
1250 JOIN wst_columns wc | |
1251 ON wcv.wst_column_id = wc.id | |
1252 JOIN wsts w | |
1253 ON wc.wst_id = w.id | |
1254 ORDER BY wcv.position ASC, | |
1255 wc.position DESC; | |
1256 COMMIT; | |
1257 | |
1258 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1259 | |
1260 * src/main/java/de/intevation/flys/model/Wst.java: | |
1261 Add forgotten one to many relation Wst -> WstColumn. | |
1262 | |
1263 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1264 | |
1265 * src/main/java/de/intevation/flys/importer/ImportWst.java, | |
1266 src/main/java/de/intevation/flys/importer/WstParser.java: | |
1267 Import of q ranges of wst files was totally broken. :-/ | |
1268 You have to reimport all your data. | |
1269 | |
1270 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1271 | |
1272 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
1273 Forgot kind parameter in peer fetching query. | |
1274 | |
1275 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
1276 | |
1277 * src/main/java/de/intevation/flys/model/River.java:: | |
1278 Added a new method to determine the gauge based on a given start and end | |
1279 point of the river. | |
1280 | |
1281 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1282 | |
1283 * doc/schema/postgresql.sql: Added 'position' column to wst_columns | |
1284 to allow order them by there column position in the original | |
1285 wst file. | |
1286 | |
1287 Update existing database with: | |
1288 | |
1289 BEGIN; | |
1290 ALTER TABLE wst_columns ADD COLUMN position int; | |
1291 UPDATE wst_columns w SET | |
1292 position = id - (SELECT min(id) FROM wst_columns WHERE wst_id = w.wst_id); | |
1293 ALTER TABLE wst_columns ADD CONSTRAINT wst_columns_wst_id_position_key | |
1294 UNIQUE (wst_id, position); | |
1295 COMMIT; | |
1296 | |
1297 * src/main/java/de/intevation/flys/model/Wst.java, | |
1298 src/main/java/de/intevation/flys/model/WstColumn.java: | |
1299 Adjusted models. | |
1300 | |
1301 * src/main/java/de/intevation/flys/importer/ImportWst.java, | |
1302 src/main/java/de/intevation/flys/importer/ImportWstColumn.java: | |
1303 Adjusted importer. | |
1304 | |
1305 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1306 | |
1307 * doc/schema/postgresql.sql: Forget ',' in schema. | |
1308 | |
1309 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1310 | |
1311 * src/main/java/de/intevation/flys/model/Wst.java (determineMinMaxQ): | |
1312 Fixed index problem when an empty list is returned. | |
1313 | |
1314 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
1315 | |
1316 * src/main/java/de/intevation/flys/model/Wst.java: A Wst is now able to | |
1317 return its min and max Q values. | |
1318 | |
1319 * src/main/java/de/intevation/flys/model/Gauge.java: A Gauge is now able | |
1320 to return its min and max W values. | |
1321 | |
1322 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1323 | |
1324 * doc/schema/postgresql.sql: Added new column 'kind' in | |
1325 discharge tables and wst to distinguish between different | |
1326 kinds like 'Haupt-WST', 'zusaetzliche Laengsschnitte', | |
1327 'amtliche Daten' and so on. | |
1328 | |
1329 Update existing databases with: | |
1330 BEGIN; | |
1331 ALTER TABLE discharge_tables ADD COLUMN kind int NOT NULL DEFAULT 0; | |
1332 ALTER TABLE wsts ADD COLUMN kind int NOT NULL DEFAULT 0; | |
1333 COMMIT; | |
1334 | |
1335 * src/main/java/de/intevation/flys/model/DischargeTable.java | |
1336 src/main/java/de/intevation/flys/model/Wst.java, | |
1337 src/main/java/de/intevation/flys/importer/ImportWst.java, | |
1338 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
1339 Adjusted the models. | |
1340 | |
1341 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
1342 | |
1343 * src/main/java/de/intevation/flys/backend/SessionHolder.java: Moved to | |
1344 this module from flys-artifacts. This is necessary to get access to the | |
1345 current session in this module as well. | |
1346 | |
1347 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
1348 | |
1349 * src/main/java/de/intevation/flys/model/River.java: Added a method that | |
1350 returns the min and max distance of a river. | |
1351 | |
1352 2011-04-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1353 | |
1354 * src/**/*.java: Removed trailing whitespace. | |
1355 | |
1356 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
1357 | |
1358 Tagged RELEASE 0.1 | |
1359 | |
1360 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1361 | |
1362 * src/main/java/de/intevation/flys/model/Range.java: | |
1363 Forgot to save the last change before commit. | |
1364 | |
1365 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1366 | |
1367 * src/main/java/de/intevation/flys/model/Range.java: | |
1368 Added methods to find out if two ranges intersects. | |
1369 | |
1370 2011-03-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1371 | |
1372 * src/main/java/de/intevation/flys/model/Gauge.java: | |
1373 Added an one to many relation to the discharge tables of a gauge. | |
1374 | |
1375 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1376 | |
1377 Finished import of WSTs. | |
1378 | |
1379 TODO 1: Speed it up! It takes on a high end machine over 7(!) | |
1380 minutes only for the data of the Saar. | |
1381 TODO 2: Double precision floating point representations produced | |
1382 by the the parsers leed to unique constraint violations | |
1383 in the backend on a second run. So the import is currently | |
1384 only working on freshly initialized data bases. | |
1385 More consequent working with BigDecimal and some | |
1386 rounding may be of help here. | |
1387 | |
1388 * src/main/java/de/intevation/flys/model/WstColumnValue.java: | |
1389 Added convinience constructors. | |
1390 | |
1391 * src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java: | |
1392 Added getPeer() method. | |
1393 | |
1394 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: | |
1395 Add a list of the ImportWstColumnValues produced by the WST parser. | |
1396 | |
1397 * src/main/java/de/intevation/flys/importer/WstParser.java: Add | |
1398 the (km, w) values to the ImportWstColumns. | |
1399 | |
1400 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1401 | |
1402 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
1403 Build models for wsts, wst columns and q ranges and | |
1404 store them in the backend. TODO: store the w values. | |
1405 | |
1406 * src/main/java/de/intevation/flys/model/WstQRange.java | |
1407 src/main/java/de/intevation/flys/model/Wst.java, | |
1408 src/main/java/de/intevation/flys/model/Range.java, | |
1409 src/main/java/de/intevation/flys/model/WstColumnQRange.java, | |
1410 src/main/java/de/intevation/flys/model/WstColumn.java: | |
1411 Added convinience constructors. | |
1412 | |
1413 * src/main/java/de/intevation/flys/importer/ImportWstQRange.java, | |
1414 src/main/java/de/intevation/flys/importer/ImportWst.java, | |
1415 src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
1416 src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, | |
1417 src/main/java/de/intevation/flys/importer/ImportWstColumn.java, | |
1418 src/main/java/de/intevation/flys/importer/ImportRange.java: | |
1419 Added getPeer() methods. | |
1420 | |
1421 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1422 | |
1423 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
1424 The unit extraction in the WST parser of desktop FLYS | |
1425 is broken! Add a hack here to repair this for our | |
1426 importer. Desktop FLYS needs a fix, too! | |
1427 | |
1428 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1429 | |
1430 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
1431 Ported some stuff ver from WSTSource.java of desktop flys to | |
1432 parse WST files. TODO: create instances of the import models. | |
1433 | |
1434 * src/main/java/de/intevation/flys/utils/StringUtil.java: | |
1435 Copied from desktop flys. Used for some string operations | |
1436 in WST parser. | |
1437 | |
1438 * src/main/java/de/intevation/flys/importer/Importer.java: | |
1439 Added system property 'flys.backend.importer.dry.run'. | |
1440 Set to true only the parsing is done and no writing | |
1441 to the backend. Default: false. | |
1442 | |
1443 * src/main/java/de/intevation/flys/App.java, | |
1444 src/main/java/de/intevation/flys/model/MainValueType.java: | |
1445 Removed needless imports. | |
1446 | |
1447 2011-03-22 Ingo Weinzierl <ingo@intevation.de> | |
1448 | |
1449 * src/main/java/de/intevation/flys/model/DischargeTableValue.java, | |
1450 src/main/java/de/intevation/flys/model/DischargeTable.java: Added new | |
1451 constructors. | |
1452 | |
1453 * src/main/java/de/intevation/flys/importer/AtFileParser.java: New. This | |
1454 parser is used to '*.at' files. | |
1455 | |
1456 * src/main/java/de/intevation/flys/importer/ImportGauge.java: Added code to | |
1457 import discharge tables. | |
1458 | |
1459 * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java, | |
1460 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: New. | |
1461 Helper models for import discharge tables. | |
1462 | |
1463 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1464 | |
1465 * src/main/java/de/intevation/flys/importer/WstParser.java, | |
1466 src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1467 Added stub for WST parser. | |
1468 | |
1469 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1470 | |
1471 * src/main/java/de/intevation/flys/importer/ImportWstQRange.java, | |
1472 src/main/java/de/intevation/flys/importer/ImportWst.java, | |
1473 src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java, | |
1474 src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, | |
1475 src/main/java/de/intevation/flys/importer/ImportWstColumn.java: | |
1476 Added importer helper model stubs for WST imports. | |
1477 | |
1478 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1479 | |
1480 Second part of parsing/storing main values. Should be finished now. | |
1481 | |
1482 * src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java, | |
1483 src/main/java/de/intevation/flys/importer/ImportMainValue.java: | |
1484 New. Helper models for import main values, | |
1485 | |
1486 * src/main/java/de/intevation/flys/model/MainValue.java, | |
1487 src/main/java/de/intevation/flys/model/NamedMainValue.java: | |
1488 Added convinience constructors. | |
1489 | |
1490 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
1491 Write main values to backend, too. | |
1492 | |
1493 * src/main/java/de/intevation/flys/importer/StaFileParser.java: | |
1494 Build importer models for main values. | |
1495 | |
1496 * src/main/java/de/intevation/flys/importer/ImportMainValueType.java: | |
1497 Data was called 'value'. Now it is 'name' to fit the | |
1498 schema. | |
1499 | |
1500 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1501 | |
1502 * doc/schema/postgresql.sql: Fixed wrong unique constraint. | |
1503 | |
1504 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1505 Added some logging when storing gauges. | |
1506 | |
1507 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1508 | |
1509 * src/main/java/de/intevation/flys/model/Gauge.java: | |
1510 Add forgotten column river_id. | |
1511 | |
1512 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
1513 Small HQL fix. | |
1514 | |
1515 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1516 | |
1517 * src/main/java/de/intevation/flys/model/Gauge.java: | |
1518 Added convinience contructor. | |
1519 | |
1520 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
1521 Fixed getPeer() method. | |
1522 | |
1523 * src/main/java/de/intevation/flys/importer/StaFileParser.java: | |
1524 Fixed parsing of STA files. | |
1525 | |
1526 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1527 | |
1528 * src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
1529 src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
1530 Propagate river into storing of gauges. | |
1531 | |
1532 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1533 | |
1534 * src/main/java/de/intevation/flys/importer/Importer.java: | |
1535 Added code to store rivers not only annotations. | |
1536 | |
1537 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1538 Added stub code to write gauges. | |
1539 | |
1540 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1541 | |
1542 First part of parsing main values. | |
1543 | |
1544 * src/main/java/de/intevation/flys/App.java: Commented out | |
1545 creation of dummy rivers. | |
1546 | |
1547 * src/main/java/de/intevation/flys/model/NamedMainValues.java: | |
1548 Moved to NamedMainValue. | |
1549 | |
1550 * src/main/java/de/intevation/flys/model/NamedMainValue.java: | |
1551 New. Formerly NamedMainValues. | |
1552 | |
1553 * src/main/java/de/intevation/flys/model/MainValue.java: | |
1554 New. Forgotten part of the model. | |
1555 | |
1556 * src/main/java/de/intevation/flys/model/MainValueType.java: | |
1557 Data is String not BigDecimal | |
1558 | |
1559 * src/main/java/de/intevation/flys/model/Range.java: Removed | |
1560 contructor with double arguments. Using BigDecimal now. | |
1561 | |
1562 * src/main/java/de/intevation/flys/importer/PegelGltParser.java: | |
1563 Propagate BigDecimal usage. | |
1564 | |
1565 * src/main/java/de/intevation/flys/importer/Importer.java: | |
1566 Removed needless import. Added TODO | |
1567 | |
1568 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1569 Parse the dependencies of the gauges, too. | |
1570 | |
1571 * src/main/java/de/intevation/flys/importer/StaFileParser.java: | |
1572 New. Parser for STA files. | |
1573 | |
1574 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
1575 Call STA file parser. | |
1576 | |
1577 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, | |
1578 src/main/java/de/intevation/flys/importer/ImportRange.java: | |
1579 Uses BigDecimal now. | |
1580 | |
1581 * src/main/java/de/intevation/flys/importer/ImportAttribute.java: | |
1582 Fixed wrong type cast in equals. | |
1583 | |
1584 * src/main/java/de/intevation/flys/importer/ImportMainValueType.java: | |
1585 New. Helper model for importing main value types. | |
1586 | |
1587 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1588 Register forgotten MainValue model. | |
1589 | |
1590 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1591 | |
1592 Store annotations in backend. | |
1593 | |
1594 * src/main/java/de/intevation/flys/model/Annotation.java: | |
1595 New convinience constructor. | |
1596 | |
1597 * src/main/java/de/intevation/flys/model/River.java: | |
1598 Added toString() method. | |
1599 | |
1600 * src/main/java/de/intevation/flys/model/Range.java: | |
1601 Fixed nasty mistake in @OneToOne annotatation. | |
1602 New convinience constructors. | |
1603 | |
1604 * src/main/java/de/intevation/flys/importer/ImportPosition.java | |
1605 src/main/java/de/intevation/flys/importer/ImportAnnotation.java, | |
1606 src/main/java/de/intevation/flys/importer/ImportRange.java | |
1607 src/main/java/de/intevation/flys/importer/ImportAttribute.java: | |
1608 Make storing to backend work. It's a bit too slow. :-/ | |
1609 | |
1610 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1611 Fetch peer from backend. Added method to store annotations. | |
1612 * src/main/java/de/intevation/flys/importer/Importer.java: | |
1613 Stored annotations into backend. More eloquent SQL exception | |
1614 handling. | |
1615 | |
1616 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1617 | |
1618 * src/main/java/de/intevation/flys/model/Attribute.java, | |
1619 src/main/java/de/intevation/flys/model/Position.java: | |
1620 Added convinience constructors. | |
1621 | |
1622 * src/main/java/de/intevation/flys/importer/ImportPosition.java, | |
1623 src/main/java/de/intevation/flys/importer/ImportAttribute.java: | |
1624 Bound them to there backend peers. | |
1625 | |
1626 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1627 | |
1628 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: | |
1629 New. Added parser to read *.KM files. | |
1630 | |
1631 * src/main/java/de/intevation/flys/importer/ImportPosition.java, | |
1632 src/main/java/de/intevation/flys/importer/PegelGltParser.java, | |
1633 src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
1634 src/main/java/de/intevation/flys/importer/ImportAnnotation.java, | |
1635 src/main/java/de/intevation/flys/importer/ImportRange.java, | |
1636 src/main/java/de/intevation/flys/importer/InfoGewParser.java, | |
1637 src/main/java/de/intevation/flys/importer/ImportAttribute.java: | |
1638 Adjusted to load the annotations from *.KM files. | |
1639 | |
1640 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1641 | |
1642 * src/main/java/de/intevation/flys/importer/ImportPosition.java, | |
1643 src/main/java/de/intevation/flys/importer/ImportRange.java, | |
1644 src/main/java/de/intevation/flys/importer/ImportAttribute.java, | |
1645 src/main/java/de/intevation/flys/importer/ImportAnnotation.java: | |
1646 New helper models for import. | |
1647 | |
1648 * src/main/java/de/intevation/flys/importer/PegelGltParser.java, | |
1649 src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
1650 Use new models. | |
1651 | |
1652 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1653 | |
1654 * src/main/java/de/intevation/flys/importer/PegelGltParser.java: | |
1655 New. Parser for PEGEL.GLT files. | |
1656 | |
1657 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
1658 New. Import model for gauges. | |
1659 | |
1660 * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: | |
1661 Removed needless imports. | |
1662 | |
1663 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1664 Added method to parse the gauges. | |
1665 | |
1666 * src/main/java/de/intevation/flys/importer/InfoGewParser.java: | |
1667 Trigger pegel glt file parsing. | |
1668 | |
1669 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1670 | |
1671 * src/main/java/de/intevation/flys/importer/Importer.java: | |
1672 Used thread local pattern to make sharing of session easier. | |
1673 | |
1674 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1675 | |
1676 * src/main/java/de/intevation/flys/importer/Importer.java: | |
1677 Fixed error in HQL statement. | |
1678 | |
1679 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1680 | |
1681 * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: | |
1682 Commented out a debug block because it leaks the db password. | |
1683 | |
1684 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1685 | |
1686 * src/main/java/de/intevation/flys/importer/InfoGewParser.java: | |
1687 Expose imported rivers. | |
1688 | |
1689 * src/main/java/de/intevation/flys/importer/InfoGewParser.java: | |
1690 Store imported rivers into database. Needs testing! | |
1691 | |
1692 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1693 | |
1694 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1695 Default connection parameters are now overwritable with | |
1696 system properties (defaults in brackets): | |
1697 - user name: flys.backend.user (flys) | |
1698 - user password: flys.backend.password (flys) | |
1699 - db dialect: flys.backend.dialect (org.hibernate.dialect.PostgreSQLDialect) | |
1700 - db driver: flys.backend.driver (org.postgresql.Driver) | |
1701 - db url: flys.backend.url (jdbc:postgresql://localhost:5432/flys) | |
1702 | |
1703 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1704 | |
1705 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1706 Expose createSessionFactory() as public to be usable without | |
1707 a artifact database running. | |
1708 | |
1709 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1710 | |
1711 * src/main/java/de/intevation/flys/utils/FileTools.java: | |
1712 Tools for handling with filenames. Currently there is | |
1713 a repair(File) method with repairs letter case errors | |
1714 which is useful when reading windows filenames on a | |
1715 un*x platform. | |
1716 | |
1717 * src/main/java/de/intevation/flys/importer/Importer.java: | |
1718 Standalone app to read data from the file system and | |
1719 store it in a database. Currently it does not store | |
1720 anything. It only loads info gew files. | |
1721 | |
1722 * src/main/java/de/intevation/flys/importer/InfoGewParser.java: | |
1723 Info gew parser. | |
1724 | |
1725 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1726 Helper model of a river used produced by parsing the | |
1727 info gew files. | |
1728 | |
1729 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1730 | |
1731 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1732 New. SessionFactoryProvider.getSessionFactory() provides a | |
1733 SessionFactory to use the Hibernate O/R mapper for the FLYS backend. | |
1734 | |
1735 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1736 | |
1737 * pom.xml: Added dependency to artifacts-commons to | |
1738 be able to use the global configuration of the artifact database. | |
1739 | |
1740 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1741 | |
1742 * src/main/java/de/intevation/flys/App.java: Wire all POJOs | |
1743 to corresponding factory. | |
1744 | |
1745 * src/main/java/de/intevation/flys/model/*.java: Generate | |
1746 all foreign key constraints. TODO: name them correctly | |
1747 because the machine generated names are ugly and do | |
1748 not fit the PostgreSQL names. | |
1749 | |
1750 * doc/schema/postgresql.sql: Small quantifier fix in descriptions | |
1751 of wst columns. | |
1752 | |
1753 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1754 | |
1755 * doc/schema/postgresql.sql: Fixed wrong spelled | |
1756 column references in foreign keys introduces with | |
1757 last change. | |
1758 | |
1759 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1760 | |
1761 * src/main/java/de/intevation/flys/model/*.java: Added | |
1762 column annotations for simple fields. TODO: foreign keys. | |
1763 | |
1764 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1765 | |
1766 * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: | |
1767 Fixed inconsistent table names. | |
1768 | |
1769 * src/main/java/de/intevation/flys/model/*.java: Added | |
1770 entity and id annotations. | |
1771 | |
1772 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1773 | |
1774 * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: | |
1775 Added missing sequences. | |
1776 | |
1777 * doc/schema/sqlite.sql: Deleted. Not longer supported. | |
1778 | |
1779 2011-03-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1780 | |
1781 * doc/schema/postgresql-cleanup.sql: Forgot to add. | |
1782 | |
1783 * src/main/java/de/intevation/flys/App.java: Use | |
1784 Apache Commons DBCP as Hibernate connection provide. | |
1785 | |
1786 * src/main/java/de/intevation/flys/model/River.java: | |
1787 Added a constructor with string argument. Set the | |
1788 sequence increment to 1 (eat up 100 at a time before). | |
1789 | |
1790 * pom.xml: Added PostgreSQL 8.4 driver as runtime dependency. | |
1791 | |
1792 2011-03-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1793 | |
1794 * doc/schema/postgresql-cleanup.sql: New. Tear down schema | |
1795 for a postgres database. | |
1796 | |
1797 * doc/schema/postgresql.sql: Added squence for | |
1798 auto generating ids in river table. Cleaned up schema. | |
1799 | |
1800 * src/main/java/de/intevation/flys/App.java: Simple | |
1801 test app to interact with hibernate. Needs to be removed | |
1802 because its only a toy. | |
1803 | |
1804 * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: | |
1805 New. Binds Apache Commons to Hibernate. | |
1806 | |
1807 * pom.xml: Added dependencies to log4j, commons dbcp, | |
1808 JPA of hibernate. | |
1809 | |
1810 * src/main/java/de/intevation/flys/model/River.java: Added | |
1811 JPA annotations. | |
1812 | |
1813 * src/main/java/de/intevation/flys/model/*.java: Replaced | |
1814 Long with Integer because column ids are only four bytes wide. | |
1815 | |
1816 2011-03-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1817 | |
1818 * doc/schema/sqlite.sql, doc/schema/postgresql.sql: Fixed | |
1819 smaller issues in ddl. | |
1820 | |
1821 * src/main/java/de/intevation/flys/model/*.java: Added POJOs | |
1822 of to be mapped. TODO: Map them! | |
1823 | |
1824 * pom.xml: Added plugin config for hibernate. | |
1825 | |
1826 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1827 | |
1828 * pom.xml: Added dependency (and corresponding repository) to | |
1829 Hibernate Core 3.6.1 Final | |
1830 | |
1831 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1832 | |
1833 * pom.xml, src/**: Created a new empty maven project: | |
1834 $ mvn archetype:create \ | |
1835 -DgroupId=de.intevation.flys \ | |
1836 -DartifactId=flys-backend | |
1837 | |
1838 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1839 | |
1840 * README: New. Some setup instructions. | |
1841 | |
1842 * doc/schema/postgresql.sql: New. Schema converted to PostgreSQL | |
1843 | |
1844 * doc/schema/sqlite.sql: Fixed defect foreign key constraints. | |
1845 | |
1846 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1847 | |
1848 * doc/schema/sqlite.sql: Factorized time intervals out into | |
1849 a separated table. | |
1850 | |
1851 2011-01-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1852 | |
1853 * contrib/import-kms.py, contrib/import-gew.py: Initial scripts | |
1854 to import data into SQLite database. They still need some work. | |
1855 | |
1856 2011-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de>: | |
1857 | |
1858 * doc/schema/sqlite.sql: Added initial schema for | |
1859 FLYS database. |