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