annotate flys-backend/ChangeLog @ 1236:324cb486db9f

Added relation and hibernate classes for DGMs. flys-backend/trunk@2613 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 31 Aug 2011 07:46:59 +0000
parents 47ce1fab8464
children 774dff3ee546
rev   line source
1236
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
1 2011-08-31 Ingo Weinzierl <ingo@intevation.de>
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
2
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
3 * doc/schema/postgresql-spatial.sql: Added a relation for DGMs. Note, that
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
4 no data of the DGM is stored in this relation, but only the file path to
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
5 the DGM file.
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
6
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
7 * src/main/java/de/intevation/flys/model/DGM.java: New. This class provides
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
8 information for a DGM (km range and file path).
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
9
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
10 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
11 Registered the DGM.
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
12
1235
47ce1fab8464 Added a static function that returns all CrossSectionTracks of a specific river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1234
diff changeset
13 2011-08-30 Ingo Weinzierl <ingo@intevation.de>
47ce1fab8464 Added a static function that returns all CrossSectionTracks of a specific river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1234
diff changeset
14
47ce1fab8464 Added a static function that returns all CrossSectionTracks of a specific river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1234
diff changeset
15 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java: New
47ce1fab8464 Added a static function that returns all CrossSectionTracks of a specific river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1234
diff changeset
16 static function to retrieve all CrossSectionTracks of a specific river.
47ce1fab8464 Added a static function that returns all CrossSectionTracks of a specific river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1234
diff changeset
17
1234
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
18 2011-08-25 Ingo Weinzierl <ingo@intevation.de>
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
19
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
20 * src/main/java/de/intevation/flys/utils/FileTools.java: Moved to
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
21 artifacts-common module.
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
22
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
23 * src/main/java/de/intevation/flys/importer/parsers/PegelGltParser.java,
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
24 src/main/java/de/intevation/flys/importer/parsers/PRFParser.java,
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
25 src/main/java/de/intevation/flys/importer/parsers/HYKParser.java,
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
26 src/main/java/de/intevation/flys/importer/parsers/AnnotationsParser.java,
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
27 src/main/java/de/intevation/flys/importer/parsers/InfoGewParser.java,
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
28 src/main/java/de/intevation/flys/importer/ImportRiver.java,
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
29 src/main/java/de/intevation/flys/importer/ImportGauge.java: Adjusted
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
30 imports of FileTools.
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
31
1233
5a3109b8475f Mapping and Accessors for MainValues of Gauge, by Sascha L. Teichmann.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 1232
diff changeset
32 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de>
5a3109b8475f Mapping and Accessors for MainValues of Gauge, by Sascha L. Teichmann.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 1232
diff changeset
33
5a3109b8475f Mapping and Accessors for MainValues of Gauge, by Sascha L. Teichmann.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 1232
diff changeset
34 * src/main/java/de/intevation/flys/model/Gauge.java (getMainValues)
5a3109b8475f Mapping and Accessors for MainValues of Gauge, by Sascha L. Teichmann.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 1232
diff changeset
35 (setMainValues):
5a3109b8475f Mapping and Accessors for MainValues of Gauge, by Sascha L. Teichmann.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 1232
diff changeset
36 New method and mapping to get/set MainValues of a Gauge. Essentially
5a3109b8475f Mapping and Accessors for MainValues of Gauge, by Sascha L. Teichmann.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 1232
diff changeset
37 developed by Sascha L. Teichmann.
5a3109b8475f Mapping and Accessors for MainValues of Gauge, by Sascha L. Teichmann.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 1232
diff changeset
38
1232
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
39 2011-08-22 Ingo Weinzierl <ingo@intevation.de>
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
40
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
41 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
42 Reverted the default db dialect to PostgreSQL - this has been changed to
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
43 PostGIS by accident.
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
44 Configure the dialect "org.hibernatespatial.postgis.PostgisDialect" to
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
45 use the PostGIS stuff.
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
46
1231
22eea1c9e907 Added a function in RiverAxis to retrieve the RiverAxis of a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1230
diff changeset
47 2011-08-22 Ingo Weinzierl <ingo@intevation.de>
22eea1c9e907 Added a function in RiverAxis to retrieve the RiverAxis of a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1230
diff changeset
48
22eea1c9e907 Added a function in RiverAxis to retrieve the RiverAxis of a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1230
diff changeset
49 * src/main/java/de/intevation/flys/model/RiverAxis.java: Added a function
22eea1c9e907 Added a function in RiverAxis to retrieve the RiverAxis of a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1230
diff changeset
50 that returns the RiverAxis for a given River.
22eea1c9e907 Added a function in RiverAxis to retrieve the RiverAxis of a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1230
diff changeset
51
22eea1c9e907 Added a function in RiverAxis to retrieve the RiverAxis of a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1230
diff changeset
52 * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Use the new
22eea1c9e907 Added a function in RiverAxis to retrieve the RiverAxis of a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1230
diff changeset
53 function of RiverAxis to retrieve the RiverAxis.
22eea1c9e907 Added a function in RiverAxis to retrieve the RiverAxis of a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1230
diff changeset
54
1230
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
55 2011-08-18 Ingo Weinzierl <ingo@intevation.de>
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
56
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
57 * doc/schema/postgresql-spatial.sql: The PostGIS database schema for
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
58 FLYS spatial data.
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
59
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
60 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java,
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
61 src/main/java/de/intevation/flys/model/RiverAxis.java,
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
62 src/main/java/de/intevation/flys/model/Line.java,
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
63 src/main/java/de/intevation/flys/model/Building.java,
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
64 src/main/java/de/intevation/flys/model/Fixpoint.java: Model classes that
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
65 represent FLYS spatial data.
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
66
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
67 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
68 Registered model classes.
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
69
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
70 * pom.xml: Added dependencies to HibernateSpatial and PostGIS.
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
71
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
72 * src/main/java/de/intevation/flys/backend/SpatialInfo.java,
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
73 contrib/spatial-info.sh: A small demo application that prints out some
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
74 information about spatial data of specific rivers. Modify the system
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
75 property -Dflys.backend.spatial.river to get information of a river of
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
76 your choice.
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
77
1229
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
78 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de>
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
79
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
80 Re-enabled Hibernate schema dumps.
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
81
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
82 * src/main/java/de/intevation/flys/App.java: Removed old code
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
83 and use new SessionFactoryProvider infrastructure.
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
84
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
85 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
86 Added methods to create db configurations without opening them.
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
87 Useful for introspection only purposes.
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
88
1228
a964636a0be3 Bumped Apache DBCP up to 1.4
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1227
diff changeset
89 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
90
a964636a0be3 Bumped Apache DBCP up to 1.4
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1227
diff changeset
91 * 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
92 as artifact database.
a964636a0be3 Bumped Apache DBCP up to 1.4
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1227
diff changeset
93
1227
cdb35d96ca09 Importer session: Make use of the LRU cache from artifacts common.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1226
diff changeset
94 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
95
cdb35d96ca09 Importer session: Make use of the LRU cache from artifacts common.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1226
diff changeset
96 * 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
97 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
98
1226
1dbafbba50ea Schema: added missing key contraint on hyks table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1225
diff changeset
99 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
100
1dbafbba50ea Schema: added missing key contraint on hyks table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1225
diff changeset
101 * 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
102 To update existing databases:
1dbafbba50ea Schema: added missing key contraint on hyks table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1225
diff changeset
103
1dbafbba50ea Schema: added missing key contraint on hyks table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1225
diff changeset
104 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
105
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
106 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
107
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
108 * 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
109 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
110
1224
ca7d461a53f1 HYK importer: Various small fixes and some extra logging.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1223
diff changeset
111 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
112
ca7d461a53f1 HYK importer: Various small fixes and some extra logging.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1223
diff changeset
113 * 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
114 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
115 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
116 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
117 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
118 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
119
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
120 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
121
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
122 * 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
123 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
124 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
125
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
126 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
127 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
128
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
129 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
130 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
131
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
132 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
133 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
134
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
135 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
136 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
137
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
138 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
139 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
140
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
141 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
142 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
143
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
144 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
145 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
146
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
147 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
148 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
149
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
150 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
151 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
152
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
153 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
154 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
155
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
156 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
157 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
158
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
159 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
160 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
161
1222
1f21f162bcf3 Fixed OrderBy clause in HYKEntry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1221
diff changeset
162 2011-07-18 Ingo Weinzierl <ingo@intevation.de>
1f21f162bcf3 Fixed OrderBy clause in HYKEntry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1221
diff changeset
163
1f21f162bcf3 Fixed OrderBy clause in HYKEntry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1221
diff changeset
164 * 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
165 clause.
1f21f162bcf3 Fixed OrderBy clause in HYKEntry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1221
diff changeset
166
1221
979ff070e368 Store HYK data structures to database. Needs testing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1220
diff changeset
167 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
168
979ff070e368 Store HYK data structures to database. Needs testing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1220
diff changeset
169 * 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
170 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
171 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
172 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
173 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
174 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
175
1220
3c860d3e79d9 Importer: Parse HYKs from importer.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1219
diff changeset
176 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
177
3c860d3e79d9 Importer: Parse HYKs from importer.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1219
diff changeset
178 * 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
179 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
180
1219
d80997bd94ce HYKParser: Create data structures while parsing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1218
diff changeset
181 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
182
d80997bd94ce HYKParser: Create data structures while parsing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1218
diff changeset
183 * 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
184 Create data structures while parsing.
d80997bd94ce HYKParser: Create data structures while parsing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1218
diff changeset
185
d80997bd94ce HYKParser: Create data structures while parsing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1218
diff changeset
186 * 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
187 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
188 getters/setters to ease model wiring.
d80997bd94ce HYKParser: Create data structures while parsing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1218
diff changeset
189
1218
00e37d22a589 Added importer models for HYKs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1217
diff changeset
190 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
191
00e37d22a589 Added importer models for HYKs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1217
diff changeset
192 * 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
193 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
194 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
195 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
196 Importer models for HYKs.
00e37d22a589 Added importer models for HYKs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1217
diff changeset
197
1217
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
198 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
199
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
200 * 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
201 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
202 To update existing databases:
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
203 BEGIN;
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
204 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
205 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
206 COMMIT;
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
207
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
208 * 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
209 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
210 Adjusted Hibernate models.
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
211
1216
f8b5c37f15e4 Fixes for the HYK parser
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1215
diff changeset
212 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
213
f8b5c37f15e4 Fixes for the HYK parser
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1215
diff changeset
214 * 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
215 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
216 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
217
f8b5c37f15e4 Fixes for the HYK parser
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1215
diff changeset
218 * 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
219 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
220
1215
8aef353e54fb Initial version of the HYK parser. Not ready, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1214
diff changeset
221 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
222
8aef353e54fb Initial version of the HYK parser. Not ready, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1214
diff changeset
223 * 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
224 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
225
8aef353e54fb Initial version of the HYK parser. Not ready, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1214
diff changeset
226 * 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
227 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
228
1214
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
229 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
230
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
231 * 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
232 wrong table.
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
233 To update existing databases:
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
234 BEGIN;
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
235 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
236 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
237 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
238 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
239 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
240 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
241 COMMIT;
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
242
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
243 * 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
244 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
245 Adjusted Hibernate models.
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
246
1213
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
247 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
248
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
249 * 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
250 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
251
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
252 * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java:
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
253 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
254
1212
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
255 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
256
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
257 * 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
258 To update existing databases:
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
259 BEGIN;
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
260 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
261 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
262 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
263 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
264 COMMIT;
1213
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
265
1212
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
266 * 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
267 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
268 Adjusted Hibernate models.
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
269
1211
f08fe480092c Moved file parsers to separate package.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1210
diff changeset
270 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
271
f08fe480092c Moved file parsers to separate package.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1210
diff changeset
272 * 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
273 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
274 into this package.
f08fe480092c Moved file parsers to separate package.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1210
diff changeset
275
f08fe480092c Moved file parsers to separate package.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1210
diff changeset
276 * 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
277
1210
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
278 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
279
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
280 * 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
281 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
282 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
283 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
284 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
285 for the HYK structures.
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
286
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
287 * 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
288 Registered new models.
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
289
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
290 * 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
291 '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
292
1209
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
293 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
294
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
295 * 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
296 To update existing databases:
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
297
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
298 BEGIN;
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
299 CREATE SEQUENCE HYKS_ID_SEQ;
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
300 CREATE TABLE hyks (
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
301 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
302 river_id int NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
303 description VARCHAR(256) NOT NULL
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
304 );
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
305
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
306 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
307 CREATE TABLE hyk_entries (
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
308 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
309 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
310 km NUMERIC NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
311 UNIQUE (hyk_id, km)
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
312 );
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
313
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
314 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
315 CREATE TABLE hyk_formations (
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
316 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
317 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
318 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
319 top NUMERIC NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
320 bottom NUMERIC NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
321 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
322 );
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
323
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
324 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
325 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
326 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
327 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
328 description VARCHAR(256)
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
329 );
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
330
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
331 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
332 CREATE TABLE hyk_flow_zones (
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
333 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
334 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
335 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
336 a NUMERIC NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
337 b NUMERIC NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
338 CHECK (a <= b)
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
339 );
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
340 COMMIT;
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
341
1208
2b57edd94735 Bumped Hibernate up to 3.6.5
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1207
diff changeset
342 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
343
2b57edd94735 Bumped Hibernate up to 3.6.5
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1207
diff changeset
344 * 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
345
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
346 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
347
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
348 * 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
349 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
350 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
351
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
352 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
353
c7370734b872 Prevent parsing and storing PRF duplicates.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1205
diff changeset
354 * 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
355 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
356 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
357 "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
358 detect file duplicates.
c7370734b872 Prevent parsing and storing PRF duplicates.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1205
diff changeset
359
c7370734b872 Prevent parsing and storing PRF duplicates.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1205
diff changeset
360 * 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
361 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
362 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
363
c7370734b872 Prevent parsing and storing PRF duplicates.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1205
diff changeset
364 * 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
365 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
366 parsing of PRF duplicates.
c7370734b872 Prevent parsing and storing PRF duplicates.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1205
diff changeset
367
1205
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
368 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
369
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
370 * doc/schema/postgresql.sql: Misspelled sequence.
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
371 To update existing databases:
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
372
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
373 DROP SEQUENCE CROSS_SECTION_LINES_SEQ;
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
374 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
375
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
376 * 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
377 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
378
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
379 * 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
380 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
381
1204
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
382 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
383
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
384 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
385 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
386
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
387 * 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
388 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
389 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
390
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
391 * 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
392 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
393
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
394 * 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
395 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
396
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
397 * 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
398 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
399 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
400 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
401 Added convinience constructors.
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
402
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
403 * 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
404 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
405
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
406 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
407
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
408 * 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
409 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
410
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
411 * 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
412 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
413
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
414 * 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
415 '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
416
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
417 * 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
418 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
419
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
420 * 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
421 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
422
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
423 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
424 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
425 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
426 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
427 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
428 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
429 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
430 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
431 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
432 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
433 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
434 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
435 );
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
436 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
437 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
438 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
439 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
440 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
441 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
442 );
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
443 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
444 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
445 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
446 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
447 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
448 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
449 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
450 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
451 );
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
452 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
453
1202
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
454 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
455
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
456 * 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
457 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
458 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
459 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
460 human readable.
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
461
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
462 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
463
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
464 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
465 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
466
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
467 * 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
468 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
469
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
470 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
471
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
472 * 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
473 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
474 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
475
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
476 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
477
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
478 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
479
1200
7c88650ff548 PRFParser: Added a callback to be called from parsePRFs() if
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1199
diff changeset
480 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
481
7c88650ff548 PRFParser: Added a callback to be called from parsePRFs() if
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1199
diff changeset
482 * 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
483 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
484 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
485 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
486
1199
cc8f770796cb PRFParser: Extract the year of sounding and description from file names.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1198
diff changeset
487 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
488
cc8f770796cb PRFParser: Extract the year of sounding and description from file names.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1198
diff changeset
489 * 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
490 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
491 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
492 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
493
1198
661a9304f2f5 PRFParser: Extracted the data. All BfG PRFs are parsed correctly, now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1197
diff changeset
494 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
495
661a9304f2f5 PRFParser: Extracted the data. All BfG PRFs are parsed correctly, now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1197
diff changeset
496 * 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
497 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
498
1197
ce3dacc6ea92 PRFParser: extract km from lines. TODO: extract data.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1196
diff changeset
499 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
500
ce3dacc6ea92 PRFParser: extract km from lines. TODO: extract data.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1196
diff changeset
501 * 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
502 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
503
1196
46127af605ba Added parser for PRF files. TODO: Extract data and km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1195
diff changeset
504 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
505
46127af605ba Added parser for PRF files. TODO: Extract data and km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1195
diff changeset
506 * 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
507 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
508
1195
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
509 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
510
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
511 * 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
512 Not needed (braindead).
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
513
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
514 * 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
515 Directly store the x/y values now.
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
516
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
517 * 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
518 Removed registration of Point3d.
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
519
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
520 To update existing databases:
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
521
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
522 BEGIN;
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
523 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
524 DROP SEQUENCE POINTS3D_ID_SEQ;
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
525 DROP TABLE points3d;
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
526 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
527 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
528 ALTER TABLE cross_section_points ADD CONSTRAINT
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
529 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
530 COMMIT;
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
531
1194
491892931761 Added Hibernate models for cross-sections and their points.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1193
diff changeset
532 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
533
491892931761 Added Hibernate models for cross-sections and their points.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1193
diff changeset
534 * 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
535 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
536 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
537
491892931761 Added Hibernate models for cross-sections and their points.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1193
diff changeset
538 * 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
539 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
540
1193
1e3979e07b9e Added hibernate point3d model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1192
diff changeset
541 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
542
1e3979e07b9e Added hibernate point3d model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1192
diff changeset
543 * 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
544 * 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
545 Registered point3d model.
1e3979e07b9e Added hibernate point3d model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1192
diff changeset
546
1192
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
547 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
548
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
549 * 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
550 To update existing databases:
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
551 BEGIN;
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
552
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
553 CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ;
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
554 CREATE TABLE cross_sections (
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
555 id int PRIMARY KEY NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
556 km NUMERIC NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
557 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
558 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
559 UNIQUE (km, river_id)
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
560 );
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
561
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
562 CREATE SEQUENCE POINTS3D_ID_SEQ;
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
563 CREATE TABLE points3d (
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
564 id int PRIMARY KEY NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
565 x NUMERIC NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
566 y NUMERIC NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
567 z NUMERIC NOT NULL
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
568 );
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
569
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
570 CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ;
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
571 CREATE TABLE cross_section_points (
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
572 id int PRIMARY KEY NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
573 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
574 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
575 col_pos int NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
576 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
577 UNIQUE (cross_section_id, col_pos)
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
578 );
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
579
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
580 COMMIT;
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
581
1191
1557cccb88f6 Tagged RELEASE 2.4 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 772
diff changeset
582 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
583
1557cccb88f6 Tagged RELEASE 2.4 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 772
diff changeset
584 Tagged RELEASE 2.4
1557cccb88f6 Tagged RELEASE 2.4 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 772
diff changeset
585
772
c523266c3399 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 771
diff changeset
586 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
587
c523266c3399 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 771
diff changeset
588 * Changes: Prepared changes for the upcoming release.
c523266c3399 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 771
diff changeset
589
771
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
590 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
591
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
592 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java,
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
593 src/main/java/de/intevation/flys/importer/AnnotationClassifier.java,
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
594 src/main/java/de/intevation/flys/importer/AtFileParser.java,
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
595 src/main/java/de/intevation/flys/importer/ValueKey.java,
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
596 src/main/java/de/intevation/flys/importer/WstParser.java:
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
597 Removed trailing whitespace.
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
598
770
33a79496ba9e Removed superfluous imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 769
diff changeset
599 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
600
33a79496ba9e Removed superfluous imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 769
diff changeset
601 * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java:
33a79496ba9e Removed superfluous imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 769
diff changeset
602 Removed superfluous imports.
33a79496ba9e Removed superfluous imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 769
diff changeset
603
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
604 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
605
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
606 * 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
607 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
608 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
609 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
610
768
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 767
diff changeset
611 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de>
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 767
diff changeset
612
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 767
diff changeset
613 * src/main/java/de/intevation/flys/model/River.java: When
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 767
diff changeset
614 looking up a gauge by km containment use precision of 1e-6.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 767
diff changeset
615
767
5572d051347e River: Added method to find gauge by its name.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 766
diff changeset
616 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
617
5572d051347e River: Added method to find gauge by its name.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 766
diff changeset
618 * 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
619 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
620
766
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
621 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
622
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
623 * 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
624
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
625 * 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
626 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
627 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
628 Call the right constructors now.
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
629
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
630 * 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
631 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
632
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
633 * 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
634 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
635
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
636 * 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
637 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
638 correctly.
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
639
765
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
640 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
641
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
642 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
643
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
644 * 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
645 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
646
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
647 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
648 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
649 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
650 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
651
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
652 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
653
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
654 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
655 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
656 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
657 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
658 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
659 as the default type.
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
660
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
661 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
662 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
663 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
664 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
665 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
666 the file default see 1.
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
667
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
668 * 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
669 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
670 the system property
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
671
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
672 'flys.backend.importer.annotation.types'
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
673
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
674 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
675 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
676 is done.
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
677
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
678 * 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
679 New. Implements the classification.
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
680
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
681 * 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
682 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
683 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
684 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
685
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
686 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
687
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
688 * 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
689 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
690
763
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
691 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
692
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
693 First part of flys/issue18
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
694
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
695 * 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
696 To update existing databases:
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
697 BEGIN;
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
698 CREATE SEQUENCE ANNOTATION_TYPES_ID_SEQ;
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
699 CREATE TABLE annotation_types (
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
700 id int PRIMARY KEY NOT NULL,
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
701 name VARCHAR(256) NOT NULL UNIQUE
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
702 );
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
703 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
704 COMMIT;
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
705
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
706 * 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
707
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
708 * 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
709 New. Hibernate model to access the type.
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
710
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
711 * 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
712 Register the new backend type.
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
713
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
714 * 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
715 References the annotation type.
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
716
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
717 * 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
718 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
719
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
720 * 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
721 Uses the import type.
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
722
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
723 * 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
724 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
725
762
23fe9ac1c3b4 Fix for flys/issue110: Start index was shifted by one.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 761
diff changeset
726 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
727
23fe9ac1c3b4 Fix for flys/issue110: Start index was shifted by one.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 761
diff changeset
728 * 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
729 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
730
761
3170fe2e7661 Forgot to store reference to edge.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 760
diff changeset
731 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
732
3170fe2e7661 Forgot to store reference to edge.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 760
diff changeset
733 * 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
734 Forgot to store reference to edge.
3170fe2e7661 Forgot to store reference to edge.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 760
diff changeset
735
760
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
736 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
737
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
738 * 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
739 Register backend model.
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
740
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
741 * 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
742 for importing the edges.
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
743
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
744 * 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
745 Parses the edges of an annotation, too.
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
746
758
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
747 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
748
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
749 * 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
750 To update existing databases:
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
751 BEGIN;
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
752 CREATE SEQUENCE EDGES_ID_SEQ;
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
753 CREATE TABLE edges (
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
754 id int PRIMARY KEY NOT NULL,
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
755 top NUMERIC,
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
756 bottom NUMERIC);
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
757 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
758 COMMIT;
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
759
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
760 * 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
761 * 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
762 edges.
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
763
757
c19d4c643526 River: add method to find gauge by its station position.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 756
diff changeset
764 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
765
c19d4c643526 River: add method to find gauge by its station position.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 756
diff changeset
766 * 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
767 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
768
756
ca13926b8871 River: Make search for gauges independent of from/to order.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 755
diff changeset
769 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
770
ca13926b8871 River: Make search for gauges independent of from/to order.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 755
diff changeset
771 * 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
772 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
773
755
a29fd0916803 Added a new view to select qs of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 754
diff changeset
774 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
775
a29fd0916803 Added a new view to select qs of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 754
diff changeset
776 * 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
777 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
778
a29fd0916803 Added a new view to select qs of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 754
diff changeset
779 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
780 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
781 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
782 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
783 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
784 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
785 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
786 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
787 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
788 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
789 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
790
754
5bcf338eadb9 Added a new view to select ws of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 753
diff changeset
791 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
792
5bcf338eadb9 Added a new view to select ws of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 753
diff changeset
793 * 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
794 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
795
5bcf338eadb9 Added a new view to select ws of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 753
diff changeset
796 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
797 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
798 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
799 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
800 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
801 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
802 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
803 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
804 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
805
753
677a6fceea6e flys/issue76: Close gaps between q ranges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 752
diff changeset
806 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
807
677a6fceea6e flys/issue76: Close gaps between q ranges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 752
diff changeset
808 flys/issue76
677a6fceea6e flys/issue76: Close gaps between q ranges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 752
diff changeset
809
677a6fceea6e flys/issue76: Close gaps between q ranges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 752
diff changeset
810 * 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
811 Close gaps between q ranges.
677a6fceea6e flys/issue76: Close gaps between q ranges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 752
diff changeset
812
752
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
813 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
814
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
815 Tagged RELEASE 2.3.1
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
816
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
817 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
818
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
819 Tagged RELEASE 2.3
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
820
506
e451b08343d3 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 505
diff changeset
821 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
822
e451b08343d3 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 505
diff changeset
823 * 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
824 the version numbers of this software.
e451b08343d3 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 505
diff changeset
825
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
826 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
827
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
828 * 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
829 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
830 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
831
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
832 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
833
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
834 * 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
835 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
836
504
ee693b8fbb55 Fixed flys/issue11 and flys51.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 503
diff changeset
837 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
838
ee693b8fbb55 Fixed flys/issue11 and flys51.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 503
diff changeset
839 * 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
840 Fixed flys/issue11 and flys51.
ee693b8fbb55 Fixed flys/issue11 and flys51.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 503
diff changeset
841
503
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
842 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
843
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
844 * 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
845 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
846 numerical problems.
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
847
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
848 * 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
849 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
850
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
851 * 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
852 Use unsharp lookup.
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
853
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
854 * 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
855 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
856 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
857 problems?!
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
858
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
859 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
860
c6889097f81f Importer: Fix silly bug and set Hibernate session flushing back to auto.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 501
diff changeset
861 * 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
862 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
863 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
864
501
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
865 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
866
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
867 * 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
868 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
869 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
870 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
871 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
872
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
873 * 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
874 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
875 column values.
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
876
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
877 * 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
878 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
879
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
880 * 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
881 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
882
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
883 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
884
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
885 * 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
886 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
887 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
888 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
889
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
890 * 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
891 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
892 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
893
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
894 * 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
895 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
896
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
897 * 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
898 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
899
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
900 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
901
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
902 * 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
903 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
904 '-' 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
905 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
906 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
907
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
908 * 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
909 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
910 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
911
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
912 * 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
913 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
914 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
915 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
916 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
917 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
918
498
8ab04de0b879 Importer: Cache the discharge table values, too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 497
diff changeset
919 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
920
8ab04de0b879 Importer: Cache the discharge table values, too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 497
diff changeset
921 * 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
922 * 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
923 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
924
8ab04de0b879 Importer: Cache the discharge table values, too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 497
diff changeset
925 * 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
926 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
927
8ab04de0b879 Importer: Cache the discharge table values, too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 497
diff changeset
928 * 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
929 Use the global cache.
8ab04de0b879 Importer: Cache the discharge table values, too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 497
diff changeset
930
497
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
931 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
932
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
933 * src/main/java/de/intevation/flys/importer/ImporterSession.java:
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
934 New. Centralized caching in the thread local context. Importing
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
935 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
936 WST files where loaded separately for every file.
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
937
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
938 * src/main/java/de/intevation/flys/importer/ImportPosition.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
939 src/main/java/de/intevation/flys/importer/Importer.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
940 src/main/java/de/intevation/flys/importer/ImportAnnotation.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
941 src/main/java/de/intevation/flys/importer/ImportWstQRange.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
942 src/main/java/de/intevation/flys/importer/ImportWst.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
943 src/main/java/de/intevation/flys/importer/ImportMainValue.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
944 src/main/java/de/intevation/flys/importer/ImportMainValueType.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
945 src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
946 src/main/java/de/intevation/flys/importer/ImportRiver.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
947 src/main/java/de/intevation/flys/importer/ImportGauge.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
948 src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
949 src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
950 src/main/java/de/intevation/flys/importer/ImportWstColumn.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
951 src/main/java/de/intevation/flys/importer/ImportRange.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
952 src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
953 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
954 src/main/java/de/intevation/flys/importer/ImportAttribute.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
955 src/main/java/de/intevation/flys/importer/ImportTimeInterval.java:
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
956 Adjusted to use the new global context.
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
957
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
958 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
959
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
960 * 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
961 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
962 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
963
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
964 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
965 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
966 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
967 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
968
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
969 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
970
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
971 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
972
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
973 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
974
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
975 * 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
976 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
977 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
978
493
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
979 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
980
494
88d5b02ff0c1 Importer: Import the "HW-Schutzanlagen", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 493
diff changeset
981 * 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
982 Import the "HW-Schutzanlagen", too.
88d5b02ff0c1 Importer: Import the "HW-Schutzanlagen", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 493
diff changeset
983
88d5b02ff0c1 Importer: Import the "HW-Schutzanlagen", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 493
diff changeset
984 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
985
88d5b02ff0c1 Importer: Import the "HW-Schutzanlagen", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 493
diff changeset
986 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
987
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
988 * 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
989
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
990 !!! 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
991
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
992 * 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
993 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
994 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
995
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
996 * 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
997 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
998
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
999 * 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
1000 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
1001 with "Histor.Abflusstafeln".
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1002
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1003 * 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
1004 Fixed silly programming error.
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1005
492
14de9246b356 Importer: parse historical discharge tables, too. TODO: store them in database.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 491
diff changeset
1006 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
1007
14de9246b356 Importer: parse historical discharge tables, too. TODO: store them in database.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 491
diff changeset
1008 * 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
1009 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
1010
14de9246b356 Importer: parse historical discharge tables, too. TODO: store them in database.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 491
diff changeset
1011 * 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
1012 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
1013 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
1014
14de9246b356 Importer: parse historical discharge tables, too. TODO: store them in database.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 491
diff changeset
1015 * 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
1016 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
1017 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
1018
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
1019 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
1020
738140fe56fe Importer: Prefix "Zusätzliche Längsschnitte" with "Zus.Längsschnitte" in description.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 490
diff changeset
1021 * 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
1022 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
1023 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
1024
490
13af9318a4a2 Import "Hochwasser-Marken", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 489
diff changeset
1025 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
1026
13af9318a4a2 Import "Hochwasser-Marken", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 489
diff changeset
1027 * 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
1028 Import 'Hochwasser-Marken', too.
13af9318a4a2 Import "Hochwasser-Marken", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 489
diff changeset
1029
13af9318a4a2 Import "Hochwasser-Marken", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 489
diff changeset
1030 * 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
1031 Removed superfluous import.
13af9318a4a2 Import "Hochwasser-Marken", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 489
diff changeset
1032
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
1033 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
1034
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
1035 * 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
1036 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
1037 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
1038
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
1039 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
1040
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
1041 * 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
1042 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
1043 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
1044
487
cf513cbe88c3 Importer: forgot to fetch time interval peer
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 486
diff changeset
1045 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
1046
cf513cbe88c3 Importer: forgot to fetch time interval peer
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 486
diff changeset
1047 * 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
1048 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
1049
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
1050 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
1051
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
1052 * 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
1053 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
1054
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
1055 * 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
1056 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
1057
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
1058 * 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
1059 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
1060
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
1061 * 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
1062 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
1063 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
1064
485
6b231041dc18 Importer: Try to extract time ranges from at files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 484
diff changeset
1065 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
1066
6b231041dc18 Importer: Try to extract time ranges from at files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 484
diff changeset
1067 * 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
1068 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
1069
484
a9e9a8a44d19 Parse and store "amtliche Linien" wst files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 483
diff changeset
1070 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
1071
a9e9a8a44d19 Parse and store "amtliche Linien" wst files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 483
diff changeset
1072 * 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
1073 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
1074
483
f1fd9cab6a07 Importer: parse and store fixation wst files as well
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 482
diff changeset
1075 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
1076
f1fd9cab6a07 Importer: parse and store fixation wst files as well
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 482
diff changeset
1077 * 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
1078 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
1079
482
3a99d0295006 Importer: Support parsing "zusaetzliche Laengsschnitte".
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 481
diff changeset
1080 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
1081
3a99d0295006 Importer: Support parsing "zusaetzliche Laengsschnitte".
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 481
diff changeset
1082 * 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
1083 Parse the "zusaetzliche Laengsschnitte", too.
3a99d0295006 Importer: Support parsing "zusaetzliche Laengsschnitte".
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 481
diff changeset
1084
3a99d0295006 Importer: Support parsing "zusaetzliche Laengsschnitte".
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 481
diff changeset
1085 * 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
1086 Add getter/setter for column 'kind'.
3a99d0295006 Importer: Support parsing "zusaetzliche Laengsschnitte".
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 481
diff changeset
1087
481
73052199f9f6 Fixed flys/issue19
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 480
diff changeset
1088 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
1089
73052199f9f6 Fixed flys/issue19
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 480
diff changeset
1090 * src/main/java/de/intevation/flys/importer/WstParser.java:
73052199f9f6 Fixed flys/issue19
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 480
diff changeset
1091 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
1092
480
46bb2b9e0bdc Introduced a 'scale' parameter in Gauge.determineMinMaxW().
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 479
diff changeset
1093 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
1094
46bb2b9e0bdc Introduced a 'scale' parameter in Gauge.determineMinMaxW().
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 479
diff changeset
1095 * 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
1096 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
1097
479
f9653fc8ef7b Removed superfluous import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 478
diff changeset
1098 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
1099
f9653fc8ef7b Removed superfluous import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 478
diff changeset
1100 * src/main/java/de/intevation/flys/importer/WstParser.java:
f9653fc8ef7b Removed superfluous import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 478
diff changeset
1101 Removed superfluous import.
f9653fc8ef7b Removed superfluous import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 478
diff changeset
1102
478
db430bd9e0e0 Implemented a WstColumnValue cache to speed up inserting WST files into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 477
diff changeset
1103 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
1104
db430bd9e0e0 Implemented a WstColumnValue cache to speed up inserting WST files into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 477
diff changeset
1105 * 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
1106 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
1107 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
1108
db430bd9e0e0 Implemented a WstColumnValue cache to speed up inserting WST files into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 477
diff changeset
1109 * 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
1110 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
1111 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
1112
db430bd9e0e0 Implemented a WstColumnValue cache to speed up inserting WST files into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 477
diff changeset
1113 * 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
1114 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
1115 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
1116
db430bd9e0e0 Implemented a WstColumnValue cache to speed up inserting WST files into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 477
diff changeset
1117 * 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
1118 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
1119 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
1120 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
1121 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
1122
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
1123 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
1124
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
1125 * 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
1126 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
1127 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
1128
477
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1129 To update existing databases:
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1130
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1131 BEGIN;
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1132 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
1133 SELECT wcv.position AS position,
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1134 w,
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1135 (SELECT q
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1136 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
1137 JOIN wst_q_ranges wqr
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1138 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
1139 JOIN ranges r
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1140 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
1141 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
1142 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
1143 wc.position AS column_pos,
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1144 w.id AS wst_id
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1145 FROM wst_column_values wcv
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1146 JOIN wst_columns wc
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1147 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
1148 JOIN wsts w
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1149 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
1150 ORDER BY wcv.position ASC,
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1151 wc.position DESC;
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1152 COMMIT;
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1153
475
9aa0eddc5221 Add forgotten one to many relation Wst -> WstColumn.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 474
diff changeset
1154 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
1155
9aa0eddc5221 Add forgotten one to many relation Wst -> WstColumn.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 474
diff changeset
1156 * 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
1157 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
1158
474
5d920695a7f0 Import of q ranges of wst files was totally broken.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 473
diff changeset
1159 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
1160
5d920695a7f0 Import of q ranges of wst files was totally broken.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 473
diff changeset
1161 * 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
1162 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
1163 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
1164 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
1165
473
70de916d3e3a Importer: Forgot kind parameter in peer fetching query.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 472
diff changeset
1166 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
1167
70de916d3e3a Importer: Forgot kind parameter in peer fetching query.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 472
diff changeset
1168 * 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
1169 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
1170
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
1171 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
1172
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
1173 * 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
1174 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
1175 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
1176
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
1177 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
1178
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
1179 * 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
1180 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
1181 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
1182
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
1183 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
1184
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
1185 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
1186 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
1187 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
1188 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
1189 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
1190 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
1191 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
1192
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
1193 * 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
1194 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
1195 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
1196
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
1197 * 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
1198 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
1199 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
1200
470
f4afea9b7537 Forget ',' in schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 469
diff changeset
1201 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
1202
f4afea9b7537 Forget ',' in schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 469
diff changeset
1203 * doc/schema/postgresql.sql: Forget ',' in schema.
f4afea9b7537 Forget ',' in schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 469
diff changeset
1204
469
b5ca22aae092 Fixed index problem when an empty list is returned.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 468
diff changeset
1205 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
1206
b5ca22aae092 Fixed index problem when an empty list is returned.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 468
diff changeset
1207 * 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
1208 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
1209
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
1210 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
1211
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
1212 * 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
1213 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
1214
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
1215 * 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
1216 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
1217
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
1218 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
1219
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
1220 * 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
1221 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
1222 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
1223 '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
1224
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
1225 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
1226 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
1227 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
1228 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
1229 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
1230
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
1231 * 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
1232 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
1233 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
1234 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
1235 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
1236
466
8bd50b41dea6 Moved the SessionHolder from flys-artifacts to flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 465
diff changeset
1237 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
1238
8bd50b41dea6 Moved the SessionHolder from flys-artifacts to flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 465
diff changeset
1239 * 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
1240 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
1241 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
1242
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
1243 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
1244
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
1245 * 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
1246 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
1247
464
d37ccb04ab5d Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 463
diff changeset
1248 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
1249
d37ccb04ab5d Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 463
diff changeset
1250 * src/**/*.java: Removed trailing whitespace.
d37ccb04ab5d Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 463
diff changeset
1251
463
24e356cf9f6c Tagged RELEASE 0.1 of FLYS backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 205
diff changeset
1252 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
1253
24e356cf9f6c Tagged RELEASE 0.1 of FLYS backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 205
diff changeset
1254 Tagged RELEASE 0.1
24e356cf9f6c Tagged RELEASE 0.1 of FLYS backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 205
diff changeset
1255
205
697d1faa8217 Forgot to save the last change before commit.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 204
diff changeset
1256 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
1257
697d1faa8217 Forgot to save the last change before commit.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 204
diff changeset
1258 * 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
1259 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
1260
204
764835268e2b Added methods to find out if two ranges intersects.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 203
diff changeset
1261 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
1262
764835268e2b Added methods to find out if two ranges intersects.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 203
diff changeset
1263 * 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
1264 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
1265
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
1266 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
1267
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
1268 * 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
1269 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
1270
202
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1271 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
1272
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1273 Finished import of WSTs.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1274
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1275 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
1276 minutes only for the data of the Saar.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1277 TODO 2: Double precision floating point representations produced
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1278 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
1279 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
1280 only working on freshly initialized data bases.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1281 More consequent working with BigDecimal and some
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1282 rounding may be of help here.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1283
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1284 * 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
1285 Added convinience constructors.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1286
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1287 * 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
1288 Added getPeer() method.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1289
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1290 * 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
1291 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
1292
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1293 * 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
1294 the (km, w) values to the ImportWstColumns.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1295
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
1296 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
1297
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
1298 * 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
1299 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
1300 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
1301
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
1302 * 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
1303 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
1304 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
1305 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
1306 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
1307 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
1308
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
1309 * 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
1310 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
1311 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
1312 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
1313 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
1314 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
1315 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
1316
200
88048d4f6e4d Add a hack to repair the units in WST files extraction.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 199
diff changeset
1317 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
1318
88048d4f6e4d Add a hack to repair the units in WST files extraction.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 199
diff changeset
1319 * 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
1320 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
1321 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
1322 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
1323
199
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
1324 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
1325
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
1326 * 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
1327 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
1328 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
1329
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
1330 * 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
1331 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
1332 in WST parser.
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
1333
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
1334 * 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
1335 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
1336 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
1337 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
1338
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
1339 * 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
1340 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
1341 Removed needless imports.
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
1342
198
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
1343 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
1344
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
1345 * 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
1346 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
1347 constructors.
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
1348
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
1349 * 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
1350 parser is used to '*.at' files.
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
1351
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
1352 * 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
1353 import discharge tables.
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
1354
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
1355 * 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
1356 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
1357 Helper models for import discharge tables.
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
1358
197
c0dcc2357106 Added stub for WST parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 196
diff changeset
1359 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
1360
c0dcc2357106 Added stub for WST parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 196
diff changeset
1361 * 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
1362 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
1363 Added stub for WST parser.
c0dcc2357106 Added stub for WST parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 196
diff changeset
1364
196
a33c065b95eb Added importer helper model stubs for WST imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 195
diff changeset
1365 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
1366
a33c065b95eb Added importer helper model stubs for WST imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 195
diff changeset
1367 * 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
1368 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
1369 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
1370 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
1371 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
1372 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
1373
195
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
1374 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
1375
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
1376 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
1377
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
1378 * 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
1379 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
1380 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
1381
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
1382 * 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
1383 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
1384 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
1385
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
1386 * 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
1387 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
1388
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
1389 * 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
1390 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
1391
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
1392 * 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
1393 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
1394 schema.
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
1395
194
0f0b98ef9b04 Fixed wrong unique constraint.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 193
diff changeset
1396 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
1397
0f0b98ef9b04 Fixed wrong unique constraint.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 193
diff changeset
1398 * doc/schema/postgresql.sql: Fixed wrong unique constraint.
0f0b98ef9b04 Fixed wrong unique constraint.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 193
diff changeset
1399
0f0b98ef9b04 Fixed wrong unique constraint.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 193
diff changeset
1400 * 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
1401 Added some logging when storing gauges.
0f0b98ef9b04 Fixed wrong unique constraint.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 193
diff changeset
1402
193
31c48d54f09d Add forgotten column river_id in Gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 192
diff changeset
1403 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
1404
31c48d54f09d Add forgotten column river_id in Gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 192
diff changeset
1405 * 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
1406 Add forgotten column river_id.
31c48d54f09d Add forgotten column river_id in Gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 192
diff changeset
1407
31c48d54f09d Add forgotten column river_id in Gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 192
diff changeset
1408 * 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
1409 Small HQL fix.
31c48d54f09d Add forgotten column river_id in Gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 192
diff changeset
1410
192
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
1411 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
1412
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
1413 * 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
1414 Added convinience contructor.
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
1415
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
1416 * 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
1417 Fixed getPeer() method.
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
1418
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
1419 * 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
1420 Fixed parsing of STA files.
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
1421
191
c4fb5141ce11 Propagate river into storing of gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
1422 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
1423
c4fb5141ce11 Propagate river into storing of gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
1424 * 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
1425 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
1426 Propagate river into storing of gauges.
c4fb5141ce11 Propagate river into storing of gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
1427
c4fb5141ce11 Propagate river into storing of gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
1428 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
1429
d40da430d2fe Added stub code to write gauges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 189
diff changeset
1430 * 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
1431 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
1432
d40da430d2fe Added stub code to write gauges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 189
diff changeset
1433 * 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
1434 Added stub code to write gauges.
d40da430d2fe Added stub code to write gauges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 189
diff changeset
1435
189
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1436 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
1437
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1438 First part of parsing main values.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1439
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1440 * 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
1441 creation of dummy rivers.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1442
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1443 * 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
1444 Moved to NamedMainValue.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1445
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1446 * 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
1447 New. Formerly NamedMainValues.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1448
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1449 * 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
1450 New. Forgotten part of the model.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1451
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1452 * 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
1453 Data is String not BigDecimal
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1454
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1455 * 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
1456 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
1457
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1458 * 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
1459 Propagate BigDecimal usage.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1460
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1461 * 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
1462 Removed needless import. Added TODO
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1463
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1464 * 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
1465 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
1466
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1467 * 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
1468 New. Parser for STA files.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1469
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1470 * 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
1471 Call STA file parser.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1472
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1473 * 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
1474 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
1475 Uses BigDecimal now.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1476
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1477 * 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
1478 Fixed wrong type cast in equals.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1479
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1480 * 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
1481 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
1482
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1483 * 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
1484 Register forgotten MainValue model.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
1485
188
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1486 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
1487
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1488 Store annotations in backend.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1489
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1490 * 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
1491 New convinience constructor.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1492
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1493 * 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
1494 Added toString() method.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1495
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1496 * 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
1497 Fixed nasty mistake in @OneToOne annotatation.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1498 New convinience constructors.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1499
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1500 * 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
1501 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
1502 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
1503 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
1504 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
1505
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1506 * 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
1507 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
1508 * 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
1509 Stored annotations into backend. More eloquent SQL exception
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1510 handling.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
1511
187
ecf90018563b Importer: Bound Attributes and Positions to there backend peers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 186
diff changeset
1512 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
1513
ecf90018563b Importer: Bound Attributes and Positions to there backend peers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 186
diff changeset
1514 * 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
1515 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
1516 Added convinience constructors.
ecf90018563b Importer: Bound Attributes and Positions to there backend peers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 186
diff changeset
1517
ecf90018563b Importer: Bound Attributes and Positions to there backend peers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 186
diff changeset
1518 * 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
1519 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
1520 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
1521
186
cf8cbcb6a10d Added parser to read *.KM files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 185
diff changeset
1522 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
1523
cf8cbcb6a10d Added parser to read *.KM files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 185
diff changeset
1524 * 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
1525 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
1526
cf8cbcb6a10d Added parser to read *.KM files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 185
diff changeset
1527 * 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
1528 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
1529 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
1530 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
1531 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
1532 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
1533 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
1534 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
1535
185
a60edcfe5f53 Added new helper models for import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 184
diff changeset
1536 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
1537
a60edcfe5f53 Added new helper models for import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 184
diff changeset
1538 * 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
1539 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
1540 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
1541 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
1542 New helper models for import.
a60edcfe5f53 Added new helper models for import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 184
diff changeset
1543
a60edcfe5f53 Added new helper models for import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 184
diff changeset
1544 * 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
1545 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
1546 Use new models.
a60edcfe5f53 Added new helper models for import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 184
diff changeset
1547
184
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
1548 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
1549
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
1550 * 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
1551 New. Parser for PEGEL.GLT files.
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
1552
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
1553 * 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
1554 New. Import model for gauges.
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
1555
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
1556 * 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
1557 Removed needless imports.
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
1558
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
1559 * 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
1560 Added method to parse the gauges.
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
1561
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
1562 * 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
1563 Trigger pegel glt file parsing.
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
1564
183
222f4db3430a Importer: Used thread local pattern to make sharing of session easier.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 182
diff changeset
1565 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
1566
222f4db3430a Importer: Used thread local pattern to make sharing of session easier.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 182
diff changeset
1567 * 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
1568 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
1569
182
1c0afb01bc93 Importer: Fixed error in HQL statement.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 181
diff changeset
1570 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
1571
1c0afb01bc93 Importer: Fixed error in HQL statement.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 181
diff changeset
1572 * 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
1573 Fixed error in HQL statement.
1c0afb01bc93 Importer: Fixed error in HQL statement.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 181
diff changeset
1574
181
4d9984411b3f Commented out a debug block because it leaks the db password.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 180
diff changeset
1575 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
1576
4d9984411b3f Commented out a debug block because it leaks the db password.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 180
diff changeset
1577 * 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
1578 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
1579
180
3908bfb2aa43 Store imported rivers into database. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 179
diff changeset
1580 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
1581
3908bfb2aa43 Store imported rivers into database. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 179
diff changeset
1582 * 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
1583 Expose imported rivers.
3908bfb2aa43 Store imported rivers into database. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 179
diff changeset
1584
3908bfb2aa43 Store imported rivers into database. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 179
diff changeset
1585 * 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
1586 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
1587
179
aaac9c291067 Default connection parameters are now overwritable with system properties.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 178
diff changeset
1588 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
1589
aaac9c291067 Default connection parameters are now overwritable with system properties.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 178
diff changeset
1590 * 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
1591 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
1592 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
1593 - 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
1594 - 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
1595 - 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
1596 - 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
1597 - 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
1598
178
82bc55666a97 Expose the creation of the SessionFactory to the public to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 177
diff changeset
1599 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
1600
82bc55666a97 Expose the creation of the SessionFactory to the public to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 177
diff changeset
1601 * 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
1602 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
1603 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
1604
177
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
1605 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
1606
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
1607 * 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
1608 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
1609 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
1610 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
1611 un*x platform.
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
1612
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
1613 * 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
1614 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
1615 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
1616 anything. It only loads info gew files.
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
1617
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
1618 * 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
1619 Info gew parser.
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
1620
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
1621 * 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
1622 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
1623 info gew files.
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
1624
176
3035d861a576 SessionFactoryProvider for access to the backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 175
diff changeset
1625 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
1626
3035d861a576 SessionFactoryProvider for access to the backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 175
diff changeset
1627 * 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
1628 New. SessionFactoryProvider.getSessionFactory() provides a
3035d861a576 SessionFactoryProvider for access to the backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 175
diff changeset
1629 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
1630
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
1631 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
1632
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
1633 * 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
1634 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
1635
174
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
1636 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
1637
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
1638 * 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
1639 to corresponding factory.
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
1640
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
1641 * 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
1642 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
1643 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
1644 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
1645
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
1646 * 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
1647 of wst columns.
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
1648
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
1649 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
1650
8e2f2ddc507f Fixed wrong spelled column references in foreign keys introduces with last change.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 172
diff changeset
1651 * 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
1652 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
1653 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
1654
172
605320b7df94 Added column annotations for simple fields. TODO: foreign keys.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 171
diff changeset
1655 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
1656
605320b7df94 Added column annotations for simple fields. TODO: foreign keys.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 171
diff changeset
1657 * 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
1658 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
1659
171
4a83e14f40f9 Added entity and id annotations.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 170
diff changeset
1660 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
1661
4a83e14f40f9 Added entity and id annotations.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 170
diff changeset
1662 * 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
1663 Fixed inconsistent table names.
4a83e14f40f9 Added entity and id annotations.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 170
diff changeset
1664
4a83e14f40f9 Added entity and id annotations.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 170
diff changeset
1665 * 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
1666 entity and id annotations.
4a83e14f40f9 Added entity and id annotations.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 170
diff changeset
1667
170
88c14d5d45be Added missing sequences. Deleted unsupported sqlite schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 169
diff changeset
1668 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
1669
88c14d5d45be Added missing sequences. Deleted unsupported sqlite schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 169
diff changeset
1670 * 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
1671 Added missing sequences.
88c14d5d45be Added missing sequences. Deleted unsupported sqlite schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 169
diff changeset
1672
88c14d5d45be Added missing sequences. Deleted unsupported sqlite schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 169
diff changeset
1673 * 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
1674
169
7929f4144d2f Bound Apache Commons DBCP with Hibernate.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 168
diff changeset
1675 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
1676
7929f4144d2f Bound Apache Commons DBCP with Hibernate.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 168
diff changeset
1677 * 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
1678
7929f4144d2f Bound Apache Commons DBCP with Hibernate.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 168
diff changeset
1679 * 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
1680 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
1681
7929f4144d2f Bound Apache Commons DBCP with Hibernate.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 168
diff changeset
1682 * 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
1683 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
1684 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
1685
7929f4144d2f Bound Apache Commons DBCP with Hibernate.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 168
diff changeset
1686 * 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
1687
168
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1688 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
1689
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1690 * 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
1691 for a postgres database.
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1692
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1693 * doc/schema/postgresql.sql: Added squence for
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1694 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
1695
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1696 * 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
1697 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
1698 because its only a toy.
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1699
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1700 * 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
1701 New. Binds Apache Commons to Hibernate.
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1702
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1703 * pom.xml: Added dependencies to log4j, commons dbcp,
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1704 JPA of hibernate.
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1705
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1706 * 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
1707 JPA annotations.
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1708
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
1709 * 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
1710 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
1711
167
15d515fe15f5 Added POJOs to be mapped to schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 166
diff changeset
1712 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
1713
15d515fe15f5 Added POJOs to be mapped to schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 166
diff changeset
1714 * 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
1715 smaller issues in ddl.
15d515fe15f5 Added POJOs to be mapped to schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 166
diff changeset
1716
15d515fe15f5 Added POJOs to be mapped to schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 166
diff changeset
1717 * 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
1718 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
1719
15d515fe15f5 Added POJOs to be mapped to schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 166
diff changeset
1720 * 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
1721
166
56eb8f1b42cf Added dependency Hibernate Core 3.6.1 Final
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 165
diff changeset
1722 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
1723
56eb8f1b42cf Added dependency Hibernate Core 3.6.1 Final
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 165
diff changeset
1724 * 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
1725 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
1726
165
a69b8494fcac Created a new empty maven project
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 164
diff changeset
1727 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
1728
a69b8494fcac Created a new empty maven project
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 164
diff changeset
1729 * 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
1730 $ mvn archetype:create \
a69b8494fcac Created a new empty maven project
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 164
diff changeset
1731 -DgroupId=de.intevation.flys \
a69b8494fcac Created a new empty maven project
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 164
diff changeset
1732 -DartifactId=flys-backend
a69b8494fcac Created a new empty maven project
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 164
diff changeset
1733
164
324e12ab7a05 Converted schema to be PostgreSQL compatible.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 163
diff changeset
1734 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
1735
324e12ab7a05 Converted schema to be PostgreSQL compatible.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 163
diff changeset
1736 * README: New. Some setup instructions.
324e12ab7a05 Converted schema to be PostgreSQL compatible.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 163
diff changeset
1737
324e12ab7a05 Converted schema to be PostgreSQL compatible.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 163
diff changeset
1738 * 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
1739
324e12ab7a05 Converted schema to be PostgreSQL compatible.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 163
diff changeset
1740 * 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
1741
163
4a3b2912a0cd Factorized time intervals out into a separated table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 162
diff changeset
1742 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
1743
4a3b2912a0cd Factorized time intervals out into a separated table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 162
diff changeset
1744 * 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
1745 a separated table.
4a3b2912a0cd Factorized time intervals out into a separated table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 162
diff changeset
1746
162
80669241956c Initial database import scripts. Not finished, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 161
diff changeset
1747 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
1748
80669241956c Initial database import scripts. Not finished, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 161
diff changeset
1749 * 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
1750 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
1751
80669241956c Initial database import scripts. Not finished, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 161
diff changeset
1752 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
1753
119048655872 Initial check in of the FLYS database backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
1754 * 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
1755 FLYS database.

http://dive4elements.wald.intevation.org