annotate flys-backend/ChangeLog @ 2810:04eeb45df27b

Implemented model classes and importer classes for bed height epochs. flys-backend/trunk@4222 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Thu, 12 Apr 2012 12:50:49 +0000
parents f283212966e8
children 8926571e47fb
rev   line source
2810
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
1 2012-04-12 Ingo Weinzierl <ingo@intevation.de>
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
2
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
3 * doc/schema/oracle-minfo.sql: Added a link to the river to bed_height_epoch
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
4 table.
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
5
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
6 * src/main/java/de/intevation/flys/model/BedHeightEpochValue.java,
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
7 src/main/java/de/intevation/flys/model/BedHeightEpoch.java: New model
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
8 classes for MINFO bed height epochs.
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
9
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
10 * src/main/java/de/intevation/flys/importer/Config.java: Splitted up the
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
11 config option to skip parsing bed heights. Now, we are able to skip single
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
12 and epoch bed heights using the following options:
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
13
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
14 -Dflys.backend.importer.skip.bed.height.single=true (skip singles)
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
15 -Dflys.backend.importer.skip.bed.height.epoch=true (skip epochs)
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
16
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
17 * src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java,
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
18 src/main/java/de/intevation/flys/importer/ImportBedHeightEpochValue.java,
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
19 src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
20 the whole stuff to parse those data.
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
21
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
22 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
23 Registered the new model classes.
04eeb45df27b Implemented model classes and importer classes for bed height epochs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2809
diff changeset
24
2809
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
25 2012-04-12 Ingo Weinzierl <ingo@intevation.de>
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
26
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
27 * doc/schema/oracle-minfo.sql,
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
28 doc/schema/oracle-drop-minfo.sql: Schema adaptions specific to MINFO bed
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
29 heights.
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
30
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
31 * src/main/java/de/intevation/flys/model/BedHeightSingleValue.java,
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
32 src/main/java/de/intevation/flys/model/BedHeightType.java,
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
33 src/main/java/de/intevation/flys/model/ElevationModel.java,
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
34 src/main/java/de/intevation/flys/model/LocationSystem.java,
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
35 src/main/java/de/intevation/flys/model/BedHeightSingle.java: New model
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
36 classes for MINFO bed heights.
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
37
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
38 * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java:
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
39 Some logging adjustments and a little bugfix: add BedHeightSingle objects
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
40 after they were parsed; otherwise they are not saved to database.
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
41
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
42 * src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java,
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
43 src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java,
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
44 src/main/java/de/intevation/flys/importer/ImportElevationModel.java,
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
45 src/main/java/de/intevation/flys/importer/ImportLocationSystem.java,
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
46 src/main/java/de/intevation/flys/importer/ImportBedHeightType.java,
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
47 src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
48 storeDependencies() and getPeer().
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
49
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
50 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
51 Registered model classes.
f283212966e8 Finished work on MINFO bed heights (single).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2808
diff changeset
52
2808
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
53 2012-04-11 Ingo Weinzierl <ingo@intevation.de>
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
54
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
55 * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java:
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
56 Finished work on parsing meta information and data specific to single bed
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
57 heights.
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
58
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
59 * src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java,
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
60 src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java,
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
61 src/main/java/de/intevation/flys/importer/ImportElevationModel.java,
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
62 src/main/java/de/intevation/flys/importer/ImportLocationSystem.java,
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
63 src/main/java/de/intevation/flys/importer/ImportBedHeightType.java: Some
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
64 new and modified temp storages used during MINFO import.
b57c95094b68 Finished work on parsing meta information and data specific to single bed heights files in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2807
diff changeset
65
2807
5ac1db5156be Some oracle db schema adaptions specific to bed heights in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2806
diff changeset
66 2012-04-11 Ingo Weinzierl <ingo@intevation.de>
5ac1db5156be Some oracle db schema adaptions specific to bed heights in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2806
diff changeset
67
5ac1db5156be Some oracle db schema adaptions specific to bed heights in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2806
diff changeset
68 * doc/schema/oracle-minfo.sql,
5ac1db5156be Some oracle db schema adaptions specific to bed heights in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2806
diff changeset
69 doc/schema/oracle-drop-minfo.sql: Some schema adaptions specific to bed
5ac1db5156be Some oracle db schema adaptions specific to bed heights in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2806
diff changeset
70 heights in MINFO.
5ac1db5156be Some oracle db schema adaptions specific to bed heights in MINFO.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2806
diff changeset
71
2806
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
72 2012-04-11 Ingo Weinzierl <ingo@intevation.de>
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
73
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
74 * src/main/java/de/intevation/flys/importer/Config.java: Added new command
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
75 line option to skip parsing bed heights (german "Sohlhoehen").
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
76 Set "-Dflys.backend.importer.skip.bed.height=true" to skip parsing this
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
77 file type.
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
78
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
79 * src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java,
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
80 src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java:
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
81 Initial checkin of parsers for bed heights (single and epoch).
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
82
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
83 * src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java,
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
84 src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java: Temp
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
85 storage for bed heights data used during the import.
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
86
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
87 * src/main/java/de/intevation/flys/importer/Importer.java: Added an INFO
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
88 statement that signals the start of parsing rivers.
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
89
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
90 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Collect and
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
91 trigger parsing of bed heights files (placed in 'Morphologie/Sohlhoehen').
33f40b23edd8 Initial checkin for parsing MINFO bed heights.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2805
diff changeset
92
2805
a55b7b35cc3a First things for MINFO specific database schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2804
diff changeset
93 2012-04-11 Ingo Weinzierl <ingo@intevation.de>
a55b7b35cc3a First things for MINFO specific database schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2804
diff changeset
94
a55b7b35cc3a First things for MINFO specific database schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2804
diff changeset
95 * doc/schema/oracle-minfo.sql,
a55b7b35cc3a First things for MINFO specific database schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2804
diff changeset
96 doc/schema/oracle-drop-minfo.sql: MINFO specific DB schema and sql statements
a55b7b35cc3a First things for MINFO specific database schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2804
diff changeset
97 to drop MINFO specific stuff.
a55b7b35cc3a First things for MINFO specific database schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2804
diff changeset
98
2804
68d1661a57cf Added a new config option to specify a INFO.gew file by system property.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2803
diff changeset
99 2012-03-29 Ingo Weinzierl <ingo@intevation.de>
68d1661a57cf Added a new config option to specify a INFO.gew file by system property.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2803
diff changeset
100
68d1661a57cf Added a new config option to specify a INFO.gew file by system property.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2803
diff changeset
101 * src/main/java/de/intevation/flys/importer/Config.java: Added a config
68d1661a57cf Added a new config option to specify a INFO.gew file by system property.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2803
diff changeset
102 option "flys.backend.importer.infogew.file" to set the path of an
68d1661a57cf Added a new config option to specify a INFO.gew file by system property.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2803
diff changeset
103 INFO.gew file.
68d1661a57cf Added a new config option to specify a INFO.gew file by system property.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2803
diff changeset
104
68d1661a57cf Added a new config option to specify a INFO.gew file by system property.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2803
diff changeset
105 * src/main/java/de/intevation/flys/importer/Importer.java: Read the path
68d1661a57cf Added a new config option to specify a INFO.gew file by system property.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2803
diff changeset
106 to the INFO.gew from the new config option and try to parse it.
68d1661a57cf Added a new config option to specify a INFO.gew file by system property.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2803
diff changeset
107
2803
cdc084071c14 Adapted the column type of relation 'dem' in oracle-spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2802
diff changeset
108 2012-03-19 Ingo Weinzierl <ingo@intevation.de>
cdc084071c14 Adapted the column type of relation 'dem' in oracle-spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2802
diff changeset
109
cdc084071c14 Adapted the column type of relation 'dem' in oracle-spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2802
diff changeset
110 * doc/schema/oracle-spatial.sql: Set the type of 'lower' and 'upper' column
cdc084071c14 Adapted the column type of relation 'dem' in oracle-spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2802
diff changeset
111 of relation 'dem' to NUMBER(19,5).
cdc084071c14 Adapted the column type of relation 'dem' in oracle-spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2802
diff changeset
112
cdc084071c14 Adapted the column type of relation 'dem' in oracle-spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2802
diff changeset
113 2012-03-19 Ingo Weinzierl <ingo@intevation.de>
2802
3fdac7b43dac Registered missing Floodmaps and set its Geometry type to Geometry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2801
diff changeset
114
3fdac7b43dac Registered missing Floodmaps and set its Geometry type to Geometry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2801
diff changeset
115 * src/main/java/de/intevation/flys/model/Floodmaps.java: Set geometry type
3fdac7b43dac Registered missing Floodmaps and set its Geometry type to Geometry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2801
diff changeset
116 to 'Geometry', because Oracle can save POLYGONS and MULTIPOLYGONS in the
3fdac7b43dac Registered missing Floodmaps and set its Geometry type to Geometry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2801
diff changeset
117 same relation; Hibernate seems unable to load both types.
3fdac7b43dac Registered missing Floodmaps and set its Geometry type to Geometry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2801
diff changeset
118
3fdac7b43dac Registered missing Floodmaps and set its Geometry type to Geometry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2801
diff changeset
119 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
3fdac7b43dac Registered missing Floodmaps and set its Geometry type to Geometry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2801
diff changeset
120 Registered missing Floodmaps.
3fdac7b43dac Registered missing Floodmaps and set its Geometry type to Geometry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2801
diff changeset
121
2801
970dc0ad9dc6 Tagged module 'flys-backend' as 'pre2.7-2012-03-16'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2800
diff changeset
122 2012-03-16 Ingo Weinzierl <ingo@intevation.de>
970dc0ad9dc6 Tagged module 'flys-backend' as 'pre2.7-2012-03-16'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2800
diff changeset
123
970dc0ad9dc6 Tagged module 'flys-backend' as 'pre2.7-2012-03-16'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2800
diff changeset
124 * Tagged module as 'pre2.7-2012-03-16'.
970dc0ad9dc6 Tagged module 'flys-backend' as 'pre2.7-2012-03-16'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2800
diff changeset
125
2800
efb10ed2af96 Modified the oracle db schema (relation 'floodmaps').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2799
diff changeset
126 2012-03-16 Ingo Weinzierl <ingo@intevation.de>
efb10ed2af96 Modified the oracle db schema (relation 'floodmaps').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2799
diff changeset
127
efb10ed2af96 Modified the oracle db schema (relation 'floodmaps').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2799
diff changeset
128 * doc/schema/oracle-spatial.sql: Repaired broken oracle db schema for
efb10ed2af96 Modified the oracle db schema (relation 'floodmaps').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2799
diff changeset
129 relation 'floodmaps'.
efb10ed2af96 Modified the oracle db schema (relation 'floodmaps').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2799
diff changeset
130
2799
501f00e355eb Added model class for 'floodmaps'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2798
diff changeset
131 2012-03-08 Ingo Weinzierl <ingo@intevation.de>
501f00e355eb Added model class for 'floodmaps'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2798
diff changeset
132
501f00e355eb Added model class for 'floodmaps'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2798
diff changeset
133 * src/main/java/de/intevation/flys/model/Floodmaps.java: New model class for
501f00e355eb Added model class for 'floodmaps'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2798
diff changeset
134 'floodmaps'.
501f00e355eb Added model class for 'floodmaps'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2798
diff changeset
135
501f00e355eb Added model class for 'floodmaps'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2798
diff changeset
136 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
501f00e355eb Added model class for 'floodmaps'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2798
diff changeset
137 Registered the Floodmaps model class.
501f00e355eb Added model class for 'floodmaps'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2798
diff changeset
138
2798
5a654f2e35bc Added a python tool to import shapefiles into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2797
diff changeset
139 2012-03-07 Ingo Weinzierl <ingo@intevation.de>
5a654f2e35bc Added a python tool to import shapefiles into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2797
diff changeset
140
5a654f2e35bc Added a python tool to import shapefiles into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2797
diff changeset
141 * contrib/shpimporter/shpimporter.py,
5a654f2e35bc Added a python tool to import shapefiles into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2797
diff changeset
142 contrib/shpimporter/utils.py,
5a654f2e35bc Added a python tool to import shapefiles into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2797
diff changeset
143 contrib/shpimporter/uesg.py: A python based tool for importing
5a654f2e35bc Added a python tool to import shapefiles into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2797
diff changeset
144 shapefiles into a database. This tool is based on python because it
5a654f2e35bc Added a python tool to import shapefiles into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2797
diff changeset
145 makes use of GDAL OGR to read shapefiles and write features into
5a654f2e35bc Added a python tool to import shapefiles into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2797
diff changeset
146 database.
5a654f2e35bc Added a python tool to import shapefiles into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2797
diff changeset
147
5a654f2e35bc Added a python tool to import shapefiles into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2797
diff changeset
148 2012-03-07 Ingo Weinzierl <ingo@intevation.de>
2797
e41d03bf9807 Adapted the PostgreSQL schema for floodmaps.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2796
diff changeset
149
e41d03bf9807 Adapted the PostgreSQL schema for floodmaps.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2796
diff changeset
150 * doc/schema/postgresql-spatial.sql: Adapted the PostgreSQL schema for
e41d03bf9807 Adapted the PostgreSQL schema for floodmaps.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2796
diff changeset
151 floodmaps.
e41d03bf9807 Adapted the PostgreSQL schema for floodmaps.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2796
diff changeset
152
2796
f3b4e32b5db6 Improved the db schema for storing existing floodmaps.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2795
diff changeset
153 2012-03-06 Ingo Weinzierl <ingo@intevation.de>
f3b4e32b5db6 Improved the db schema for storing existing floodmaps.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2795
diff changeset
154
f3b4e32b5db6 Improved the db schema for storing existing floodmaps.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2795
diff changeset
155 * doc/schema/postgresql-spatial.sql,
f3b4e32b5db6 Improved the db schema for storing existing floodmaps.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2795
diff changeset
156 doc/schema/oracle-spatial.sql: Added new relations for existing
f3b4e32b5db6 Improved the db schema for storing existing floodmaps.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2795
diff changeset
157 floodmaps (currently tested for PostgreSQL only!).
f3b4e32b5db6 Improved the db schema for storing existing floodmaps.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2795
diff changeset
158
2795
c41bb1293acb Adapted wrong method call of Log4J logger.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2794
diff changeset
159 2012-03-06 Ingo Weinzierl <ingo@intevation.de>
c41bb1293acb Adapted wrong method call of Log4J logger.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2794
diff changeset
160
c41bb1293acb Adapted wrong method call of Log4J logger.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2794
diff changeset
161 * src/main/java/de/intevation/flys/model/Wst.java: Adapted method call of
c41bb1293acb Adapted wrong method call of Log4J logger.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2794
diff changeset
162 Log4J logger 'warning()' -> 'warn()'.
c41bb1293acb Adapted wrong method call of Log4J logger.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2794
diff changeset
163
2794
3c26e16ae6c2 Fix or workaround flys/issue632, avoid NPE.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2425
diff changeset
164 2012-03-02 Felix Wolfsteller <felix.wolfsteller@intevation.de>
3c26e16ae6c2 Fix or workaround flys/issue632, avoid NPE.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2425
diff changeset
165
3c26e16ae6c2 Fix or workaround flys/issue632, avoid NPE.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2425
diff changeset
166 Fix or workaround flys/issue632 .
3c26e16ae6c2 Fix or workaround flys/issue632, avoid NPE.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2425
diff changeset
167
3c26e16ae6c2 Fix or workaround flys/issue632, avoid NPE.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2425
diff changeset
168 * src/main/java/de/intevation/flys/model/Wst.java: Avoid NPE when
3c26e16ae6c2 Fix or workaround flys/issue632, avoid NPE.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2425
diff changeset
169 trying to get min/max q values.
3c26e16ae6c2 Fix or workaround flys/issue632, avoid NPE.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2425
diff changeset
170
2425
67f362883fe4 flys/issue499: Sort the values of the discharge table by Q.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2385
diff changeset
171 2012-02-14 Sascha L. Teichmann <sascha.teichmann@intevation.de>
67f362883fe4 flys/issue499: Sort the values of the discharge table by Q.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2385
diff changeset
172
67f362883fe4 flys/issue499: Sort the values of the discharge table by Q.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2385
diff changeset
173 * src/main/java/de/intevation/flys/model/DischargeTable.java:
67f362883fe4 flys/issue499: Sort the values of the discharge table by Q.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2385
diff changeset
174 The list of DischargeTableValue is now sorted by Q.
67f362883fe4 flys/issue499: Sort the values of the discharge table by Q.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2385
diff changeset
175
2385
83abe19d4f40 Added a method Gauge.fetchMasterDischargeTable() to retrieve the discharge table with kind = 0.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2384
diff changeset
176 2012-02-09 Ingo Weinzierl <ingo@intevation.de>
83abe19d4f40 Added a method Gauge.fetchMasterDischargeTable() to retrieve the discharge table with kind = 0.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2384
diff changeset
177
83abe19d4f40 Added a method Gauge.fetchMasterDischargeTable() to retrieve the discharge table with kind = 0.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2384
diff changeset
178 * src/main/java/de/intevation/flys/model/Gauge.java: Added a method
83abe19d4f40 Added a method Gauge.fetchMasterDischargeTable() to retrieve the discharge table with kind = 0.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2384
diff changeset
179 getMasterDischargeTable() to retrieve the discharge table with kind 0.
83abe19d4f40 Added a method Gauge.fetchMasterDischargeTable() to retrieve the discharge table with kind = 0.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2384
diff changeset
180
2384
385170ff7b34 River: (fix) Renamed function which is not a getter.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2383
diff changeset
181 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de>
385170ff7b34 River: (fix) Renamed function which is not a getter.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2383
diff changeset
182
385170ff7b34 River: (fix) Renamed function which is not a getter.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2383
diff changeset
183 * src/main/java/de/intevation/flys/model/River.java
385170ff7b34 River: (fix) Renamed function which is not a getter.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2383
diff changeset
184 (getGaugeDatumsKMs,queryGaugeDatumsKMs): renamed to avoid hibernate
385170ff7b34 River: (fix) Renamed function which is not a getter.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2383
diff changeset
185 running into trouble finding db-mapping for type Map for
385170ff7b34 River: (fix) Renamed function which is not a getter.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2383
diff changeset
186 what looks like a 'getter' of GaugeDatumsKMs.
385170ff7b34 River: (fix) Renamed function which is not a getter.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2383
diff changeset
187
385170ff7b34 River: (fix) Renamed function which is not a getter.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2383
diff changeset
188 2012-02-03 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2383
6605dcd6745f Added a method to build a map from gauge stations to the datums of the gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2382
diff changeset
189
6605dcd6745f Added a method to build a map from gauge stations to the datums of the gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2382
diff changeset
190 * src/main/java/de/intevation/flys/model/River.java(getGaugeDatumsKMs):
6605dcd6745f Added a method to build a map from gauge stations to the datums of the gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2382
diff changeset
191 New method to build a map of gauge stattion km to
6605dcd6745f Added a method to build a map from gauge stations to the datums of the gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2382
diff changeset
192 the datums (PNP) of the gauge. Useful look if a km
6605dcd6745f Added a method to build a map from gauge stations to the datums of the gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2382
diff changeset
193 is a gauge station.
6605dcd6745f Added a method to build a map from gauge stations to the datums of the gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2382
diff changeset
194
2382
c5791de0c495 Added meachnism to backend to fetch all annotation related data in one go.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2381
diff changeset
195 2012-01-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
c5791de0c495 Added meachnism to backend to fetch all annotation related data in one go.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2381
diff changeset
196
c5791de0c495 Added meachnism to backend to fetch all annotation related data in one go.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2381
diff changeset
197 * src/main/java/de/intevation/flys/model/FastAnnotations.java:
c5791de0c495 Added meachnism to backend to fetch all annotation related data in one go.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2381
diff changeset
198 New. Fetches all informations of annotations in one go for
c5791de0c495 Added meachnism to backend to fetch all annotation related data in one go.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2381
diff changeset
199 a river. Useful to speed up annotation handling.
c5791de0c495 Added meachnism to backend to fetch all annotation related data in one go.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2381
diff changeset
200
2381
aa777d1aba38 Added a function Gauge.getGaugeByOfficialNumber() that returns a Gauge based on its official number.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2380
diff changeset
201 2012-01-18 Ingo Weinzierl <ingo@intevation.de>
aa777d1aba38 Added a function Gauge.getGaugeByOfficialNumber() that returns a Gauge based on its official number.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2380
diff changeset
202
aa777d1aba38 Added a function Gauge.getGaugeByOfficialNumber() that returns a Gauge based on its official number.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2380
diff changeset
203 * src/main/java/de/intevation/flys/model/Gauge.java: Added a function that
aa777d1aba38 Added a function Gauge.getGaugeByOfficialNumber() that returns a Gauge based on its official number.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2380
diff changeset
204 returns a Gauge based on its official number.
aa777d1aba38 Added a function Gauge.getGaugeByOfficialNumber() that returns a Gauge based on its official number.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2380
diff changeset
205
2380
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
206 2012-01-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
207
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
208 * src/main/java/de/intevation/flys/model/FastCrossSectionLine.java:
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
209 New. Cacheable representation of the cross section line.
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
210
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
211 * src/main/java/de/intevation/flys/model/CrossSectionLine.java:
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
212 Add a new isValid() method.
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
213
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
214 * src/main/java/de/intevation/flys/model/CrossSection.java:
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
215 Added method getFastLines() to fetch the lines (FastCrossSectionLines)
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
216 directly with a single SQL statement and without expensive
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
217 intermediate representations.
e237a08acf6e Create fast cross section lines in the backend now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2379
diff changeset
218
2379
8be27b950dbe CrossSection: Added method to extract the lines of a given km range.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2378
diff changeset
219 2012-01-16 Sascha L. Teichmann <sascha.teichmann@intevation.de>
8be27b950dbe CrossSection: Added method to extract the lines of a given km range.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2378
diff changeset
220
8be27b950dbe CrossSection: Added method to extract the lines of a given km range.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2378
diff changeset
221 * src/main/java/de/intevation/flys/model/CrossSection.java(getLines):
8be27b950dbe CrossSection: Added method to extract the lines of a given km range.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2378
diff changeset
222 Added method to fetch the lines of a cross section in a given interval.
8be27b950dbe CrossSection: Added method to extract the lines of a given km range.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2378
diff changeset
223 Useful to have chunked access to the lines.
8be27b950dbe CrossSection: Added method to extract the lines of a given km range.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2378
diff changeset
224
2378
c5d83366d0b1 CrossSectionLine: Simplified creation of Point2Ds.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2377
diff changeset
225 2012-01-16 Sascha L. Teichmann <sascha.teichmann@intevation.de>
c5d83366d0b1 CrossSectionLine: Simplified creation of Point2Ds.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2377
diff changeset
226
c5d83366d0b1 CrossSectionLine: Simplified creation of Point2Ds.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2377
diff changeset
227 * src/main/java/de/intevation/flys/model/CrossSectionLine.java
c5d83366d0b1 CrossSectionLine: Simplified creation of Point2Ds.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2377
diff changeset
228 (fetchCrossSectionLinesPoints): Simplified and prevent reallocations.
c5d83366d0b1 CrossSectionLine: Simplified creation of Point2Ds.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2377
diff changeset
229
2377
d183ae164cfc Make parsing of official numbers out of STA files being enabled with new system property.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2376
diff changeset
230 2012-01-10 Sascha L. Teichmann <sascha.teichmann@intevation.de>
d183ae164cfc Make parsing of official numbers out of STA files being enabled with new system property.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2376
diff changeset
231
d183ae164cfc Make parsing of official numbers out of STA files being enabled with new system property.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2376
diff changeset
232 * src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java:
d183ae164cfc Make parsing of official numbers out of STA files being enabled with new system property.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2376
diff changeset
233 Introduced boolean system property 'flys.backend.sta.parse.gauge.numbers'
d183ae164cfc Make parsing of official numbers out of STA files being enabled with new system property.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2376
diff changeset
234 default: false. If set the official number is parsed out of
d183ae164cfc Make parsing of official numbers out of STA files being enabled with new system property.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2376
diff changeset
235 the first line of the STA files. This leads to problems with the
d183ae164cfc Make parsing of official numbers out of STA files being enabled with new system property.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2376
diff changeset
236 data of the Elbe river.
d183ae164cfc Make parsing of official numbers out of STA files being enabled with new system property.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2376
diff changeset
237
d183ae164cfc Make parsing of official numbers out of STA files being enabled with new system property.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2376
diff changeset
238 * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Removed
d183ae164cfc Make parsing of official numbers out of STA files being enabled with new system property.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2376
diff changeset
239 superfluous import.
d183ae164cfc Make parsing of official numbers out of STA files being enabled with new system property.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2376
diff changeset
240
2376
918877ee70e7 backend: Fixed spatial table hws.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2375
diff changeset
241 2012-01-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>
918877ee70e7 backend: Fixed spatial table hws.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2375
diff changeset
242
918877ee70e7 backend: Fixed spatial table hws.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2375
diff changeset
243 * doc/schema/postgresql-spatial.sql: Fixed table hws.
918877ee70e7 backend: Fixed spatial table hws.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2375
diff changeset
244
2375
61cb16549eb1 Modified the signature of RiverAxis.getRiverAxis() which now returns a list of RiverAxis objects instead of a single instance.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2374
diff changeset
245 2012-01-05 Ingo Weinzierl <ingo@intevation.de>
61cb16549eb1 Modified the signature of RiverAxis.getRiverAxis() which now returns a list of RiverAxis objects instead of a single instance.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2374
diff changeset
246
61cb16549eb1 Modified the signature of RiverAxis.getRiverAxis() which now returns a list of RiverAxis objects instead of a single instance.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2374
diff changeset
247 * src/main/java/de/intevation/flys/model/RiverAxis.java: The method
61cb16549eb1 Modified the signature of RiverAxis.getRiverAxis() which now returns a list of RiverAxis objects instead of a single instance.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2374
diff changeset
248 getRiverAxis() now returns a list of RiverAxis objects. There is a
61cb16549eb1 Modified the signature of RiverAxis.getRiverAxis() which now returns a list of RiverAxis objects instead of a single instance.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2374
diff changeset
249 modeling problem (see comment in the header of the class) which should
61cb16549eb1 Modified the signature of RiverAxis.getRiverAxis() which now returns a list of RiverAxis objects instead of a single instance.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2374
diff changeset
250 be fixed!
61cb16549eb1 Modified the signature of RiverAxis.getRiverAxis() which now returns a list of RiverAxis objects instead of a single instance.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2374
diff changeset
251
61cb16549eb1 Modified the signature of RiverAxis.getRiverAxis() which now returns a list of RiverAxis objects instead of a single instance.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2374
diff changeset
252 * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Adapted the
61cb16549eb1 Modified the signature of RiverAxis.getRiverAxis() which now returns a list of RiverAxis objects instead of a single instance.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2374
diff changeset
253 code based on the modified signature in RiverAxis.
61cb16549eb1 Modified the signature of RiverAxis.getRiverAxis() which now returns a list of RiverAxis objects instead of a single instance.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2374
diff changeset
254
2374
ab1e642e7c85 Added a new method Wst.determineMinMaxQFree() to determine the min/max Qs at a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2373
diff changeset
255 2012-01-03 Ingo Weinzierl <ingo@intevation.de>
ab1e642e7c85 Added a new method Wst.determineMinMaxQFree() to determine the min/max Qs at a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2373
diff changeset
256
ab1e642e7c85 Added a new method Wst.determineMinMaxQFree() to determine the min/max Qs at a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2373
diff changeset
257 * src/main/java/de/intevation/flys/model/Wst.java: Added a method
ab1e642e7c85 Added a new method Wst.determineMinMaxQFree() to determine the min/max Qs at a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2373
diff changeset
258 determineMinMaxQFree() that determines the min/max Qs at a given
ab1e642e7c85 Added a new method Wst.determineMinMaxQFree() to determine the min/max Qs at a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2373
diff changeset
259 kilometer.
ab1e642e7c85 Added a new method Wst.determineMinMaxQFree() to determine the min/max Qs at a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2373
diff changeset
260
2373
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
261 2012-01-02 Sascha L. Teichmann <sascha.teichmann@intevation.de>
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
262
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
263 * doc/schema/postgresql.sql: Remove 'NOT NULL' constraint from
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
264 gauges.range_id because there are gauges which don't have
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
265 a 'Gueltigkeitsbereich'
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
266
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
267 To adjust existing PostgreSQL databases use:
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
268
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
269 ALTER TABLE gauges ALTER COLUMN range_id DROP NOT NULL;
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
270
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
271 * src/main/java/de/intevation/flys/model/River.java: Handle
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
272 null references to 'Gueltigkeitsbereiche'.
056b3a5aa181 Removed "NOT NULL" constraint from gauges.range_id because there are gauges which dont have a Gueltigkeitsbereich.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2372
diff changeset
273
2372
027736510a30 Added a new method Wst.determineMinMaxQ(double,double).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2371
diff changeset
274 2011-12-28 Ingo Weinzierl <ingo@intevation.de>
027736510a30 Added a new method Wst.determineMinMaxQ(double,double).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2371
diff changeset
275
027736510a30 Added a new method Wst.determineMinMaxQ(double,double).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2371
diff changeset
276 * src/main/java/de/intevation/flys/model/Wst.java: Added a method
027736510a30 Added a new method Wst.determineMinMaxQ(double,double).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2371
diff changeset
277 determineMinMaxQ(double double) to be able to determine the Q range of a
027736510a30 Added a new method Wst.determineMinMaxQ(double,double).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2371
diff changeset
278 WST without having a Range object.
027736510a30 Added a new method Wst.determineMinMaxQ(double,double).
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2371
diff changeset
279
2371
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
280 2011-12-19 Sascha L. Teichmann <sascha.teichmann@intevation.de>:
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
281
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
282 * src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java:
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
283 Parse the official 'Pegelnummer' out of the STA files, too.
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
284
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
285 * src/main/java/de/intevation/flys/importer/ImportGauge.java:
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
286 Adjusted import model.
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
287
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
288 * src/main/java/de/intevation/flys/model/Gauge.java: Make the
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
289 official gauge number accessible via Hibernate.
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
290
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
291 * doc/schema/postgresql.sql, doc/schema/oracle.sql: Added
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
292 an official_number to the gauges table.
fe89d6cf55fb Added support for official gauge numbers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2370
diff changeset
293
2370
7d378970d764 doc/schema/oracle-spatial.sql: Adjust extent of germany to EPSG:31467 (GK3) coordinates.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2369
diff changeset
294 2011-11-30 Bjoern Schilberg <bjoern.schilberg@intevation.de>:
7d378970d764 doc/schema/oracle-spatial.sql: Adjust extent of germany to EPSG:31467 (GK3) coordinates.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2369
diff changeset
295
7d378970d764 doc/schema/oracle-spatial.sql: Adjust extent of germany to EPSG:31467 (GK3) coordinates.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2369
diff changeset
296 * doc/schema/oracle-spatial.sql: Adjust extent of germany to EPSG:31467
7d378970d764 doc/schema/oracle-spatial.sql: Adjust extent of germany to EPSG:31467 (GK3) coordinates.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2369
diff changeset
297 (GK3) coordinates.
7d378970d764 doc/schema/oracle-spatial.sql: Adjust extent of germany to EPSG:31467 (GK3) coordinates.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2369
diff changeset
298
2369
a3c02addd1fa doc/schema/oracle-spatial.sql: Adjusted extent to the extent of germany and srs to 31467 in USER_SDO_GEOM_METADATA.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2368
diff changeset
299 2011-11-30 Bjoern Schilberg <bjoern.schilberg@intevation.de>:
a3c02addd1fa doc/schema/oracle-spatial.sql: Adjusted extent to the extent of germany and srs to 31467 in USER_SDO_GEOM_METADATA.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2368
diff changeset
300
a3c02addd1fa doc/schema/oracle-spatial.sql: Adjusted extent to the extent of germany and srs to 31467 in USER_SDO_GEOM_METADATA.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2368
diff changeset
301 * doc/schema/oracle-spatial.sql: Adjust extent to the extent of germany
a3c02addd1fa doc/schema/oracle-spatial.sql: Adjusted extent to the extent of germany and srs to 31467 in USER_SDO_GEOM_METADATA.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2368
diff changeset
302 and srs to 31467 in USER_SDO_GEOM_METADATA.
a3c02addd1fa doc/schema/oracle-spatial.sql: Adjusted extent to the extent of germany and srs to 31467 in USER_SDO_GEOM_METADATA.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2368
diff changeset
303
2368
ce4c7045afc1 Fixed oracle_create_user.sql script: Fixed notation of the table in the alter statement.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2367
diff changeset
304 2011-11-29 Bjoern Schilberg <bjoern.schilberg@intevation.de>:
ce4c7045afc1 Fixed oracle_create_user.sql script: Fixed notation of the table in the alter statement.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2367
diff changeset
305
ce4c7045afc1 Fixed oracle_create_user.sql script: Fixed notation of the table in the alter statement.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2367
diff changeset
306 * doc/schema/oracle_create_user.sql: Fixed notation of the table in the
ce4c7045afc1 Fixed oracle_create_user.sql script: Fixed notation of the table in the alter statement.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2367
diff changeset
307 alter statement.
ce4c7045afc1 Fixed oracle_create_user.sql script: Fixed notation of the table in the alter statement.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2367
diff changeset
308
2367
418a0918863b Fixed flys/issue415: Increased precision of a and b in ranges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2366
diff changeset
309 2011-11-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>:
418a0918863b Fixed flys/issue415: Increased precision of a and b in ranges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2366
diff changeset
310
418a0918863b Fixed flys/issue415: Increased precision of a and b in ranges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2366
diff changeset
311 Fixed flys/issue415
418a0918863b Fixed flys/issue415: Increased precision of a and b in ranges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2366
diff changeset
312
418a0918863b Fixed flys/issue415: Increased precision of a and b in ranges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2366
diff changeset
313 * doc/schema/oracle.sql: Increased precision of a and b in ranges.
418a0918863b Fixed flys/issue415: Increased precision of a and b in ranges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2366
diff changeset
314
2366
2246348ff90e Added functions that return lists of Buildings/Fixpoints to according classes.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2365
diff changeset
315 2011-11-10 Ingo Weinzierl <ingo@intevation.de>
2246348ff90e Added functions that return lists of Buildings/Fixpoints to according classes.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2365
diff changeset
316
2246348ff90e Added functions that return lists of Buildings/Fixpoints to according classes.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2365
diff changeset
317 * src/main/java/de/intevation/flys/model/Building.java,
2246348ff90e Added functions that return lists of Buildings/Fixpoints to according classes.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2365
diff changeset
318 src/main/java/de/intevation/flys/model/Fixpoint.java: Added functions
2246348ff90e Added functions that return lists of Buildings/Fixpoints to according classes.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2365
diff changeset
319 that return a list of Buildings/Fixpoints for a given river.
2246348ff90e Added functions that return lists of Buildings/Fixpoints to according classes.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2365
diff changeset
320
2365
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
321 2011-11-10 Ingo Weinzierl <ingo@intevation.de>
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
322
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
323 * doc/schema/oracle-spatial.sql,
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
324 doc/schema/postgresql-spatial.sql: Adapted the "kind" field of "lines"
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
325 relation (Int -> Varchar).
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
326
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
327 * doc/schema/oracle-spatial_idx.sql: Added missing spatial index for
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
328 "lines" relation.
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
329
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
330 * src/main/java/de/intevation/flys/model/Line.java: Added a function that
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
331 returns all lines of a given river.
60532f75396b Adapted 'lines' relation and made lines queryable for a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2364
diff changeset
332
2364
efe19e669092 Added and registered a model Catchment for 'catchment' relation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2363
diff changeset
333 2011-11-09 Ingo Weinzierl <ingo@intevation.de>
efe19e669092 Added and registered a model Catchment for 'catchment' relation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2363
diff changeset
334
efe19e669092 Added and registered a model Catchment for 'catchment' relation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2363
diff changeset
335 * src/main/java/de/intevation/flys/model/Catchment.java: New. A model for
efe19e669092 Added and registered a model Catchment for 'catchment' relation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2363
diff changeset
336 the 'catchment' relation.
efe19e669092 Added and registered a model Catchment for 'catchment' relation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2363
diff changeset
337
efe19e669092 Added and registered a model Catchment for 'catchment' relation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2363
diff changeset
338 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
efe19e669092 Added and registered a model Catchment for 'catchment' relation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2363
diff changeset
339 Registered the Catchment model.
efe19e669092 Added and registered a model Catchment for 'catchment' relation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2363
diff changeset
340
2363
a8f408fdf58c Added model for 'hws' relation and synced postgis with oracle spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2362
diff changeset
341 2011-11-09 Ingo Weinzierl <ingo@intevation.de>
a8f408fdf58c Added model for 'hws' relation and synced postgis with oracle spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2362
diff changeset
342
a8f408fdf58c Added model for 'hws' relation and synced postgis with oracle spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2362
diff changeset
343 * doc/schema/postgresql-spatial.sql: Synced "hws" relation with oracle
a8f408fdf58c Added model for 'hws' relation and synced postgis with oracle spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2362
diff changeset
344 schema.
a8f408fdf58c Added model for 'hws' relation and synced postgis with oracle spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2362
diff changeset
345
a8f408fdf58c Added model for 'hws' relation and synced postgis with oracle spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2362
diff changeset
346 * src/main/java/de/intevation/flys/model/Hws.java: New. A model for the
a8f408fdf58c Added model for 'hws' relation and synced postgis with oracle spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2362
diff changeset
347 "hws" relation.
a8f408fdf58c Added model for 'hws' relation and synced postgis with oracle spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2362
diff changeset
348
a8f408fdf58c Added model for 'hws' relation and synced postgis with oracle spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2362
diff changeset
349 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
a8f408fdf58c Added model for 'hws' relation and synced postgis with oracle spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2362
diff changeset
350 Registered the Hws model.
a8f408fdf58c Added model for 'hws' relation and synced postgis with oracle spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2362
diff changeset
351
2362
2649151c9500 Added some functions that return information about the db connection used by the current database session.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2361
diff changeset
352 2011-11-09 Ingo Weinzierl <ingo@intevation.de>
2649151c9500 Added some functions that return information about the db connection used by the current database session.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2361
diff changeset
353
2649151c9500 Added some functions that return information about the db connection used by the current database session.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2361
diff changeset
354 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
2649151c9500 Added some functions that return information about the db connection used by the current database session.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2361
diff changeset
355 Added methods that return information about the database connection used
2649151c9500 Added some functions that return information about the db connection used by the current database session.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2361
diff changeset
356 by a concrete SessionFactoryImpl.
2649151c9500 Added some functions that return information about the db connection used by the current database session.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2361
diff changeset
357
2361
e9b0fd1de89d Made flys-backend compatible with oracle spatial.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2360
diff changeset
358 2011-11-09 Ingo Weinzierl <ingo@intevation.de>
e9b0fd1de89d Made flys-backend compatible with oracle spatial.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2360
diff changeset
359
e9b0fd1de89d Made flys-backend compatible with oracle spatial.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2360
diff changeset
360 * src/main/java/de/intevation/flys/model/Floodplain.java: Changed the
e9b0fd1de89d Made flys-backend compatible with oracle spatial.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2360
diff changeset
361 geometry type from MultiPolygon to Polygon.
e9b0fd1de89d Made flys-backend compatible with oracle spatial.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2360
diff changeset
362
e9b0fd1de89d Made flys-backend compatible with oracle spatial.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2360
diff changeset
363 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
e9b0fd1de89d Made flys-backend compatible with oracle spatial.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2360
diff changeset
364 Added a function that returns the db driver of a given
e9b0fd1de89d Made flys-backend compatible with oracle spatial.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2360
diff changeset
365 SessionFactoryImpl instance.
e9b0fd1de89d Made flys-backend compatible with oracle spatial.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2360
diff changeset
366
2360
9df06b88c079 Added model class for relation 'river_axes_km'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2359
diff changeset
367 2011-11-01 Ingo Weinzierl <ingo@intevation.de>
9df06b88c079 Added model class for relation 'river_axes_km'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2359
diff changeset
368
9df06b88c079 Added model class for relation 'river_axes_km'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2359
diff changeset
369 * src/main/java/de/intevation/flys/model/RiverAxisKm.java: New. Model class
9df06b88c079 Added model class for relation 'river_axes_km'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2359
diff changeset
370 for 'river_axes_km' relation.
9df06b88c079 Added model class for relation 'river_axes_km'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2359
diff changeset
371
9df06b88c079 Added model class for relation 'river_axes_km'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2359
diff changeset
372 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
9df06b88c079 Added model class for relation 'river_axes_km'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2359
diff changeset
373 Added mapping for RiverAxisKm.
9df06b88c079 Added model class for relation 'river_axes_km'.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2359
diff changeset
374
2359
33062484cc56 Added explizit TABLESPACE definition for the user.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2358
diff changeset
375 2011-10-25 Bjoern Schilberg <bjoern.schilberg@intevation.de>
33062484cc56 Added explizit TABLESPACE definition for the user.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2358
diff changeset
376
33062484cc56 Added explizit TABLESPACE definition for the user.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2358
diff changeset
377 * doc/schema/oracle_create_user.sql:
33062484cc56 Added explizit TABLESPACE definition for the user.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2358
diff changeset
378 Added explizit TABLESPACE definition for the user.
33062484cc56 Added explizit TABLESPACE definition for the user.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2358
diff changeset
379
2358
441028ca9a28 Adjusted oracle_create_user.sql script. Added USER SQL snippet to change tablespace to users.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2357
diff changeset
380 2011-10-25 Bjoern Schilberg <bjoern.schilberg@intevation.de>
441028ca9a28 Adjusted oracle_create_user.sql script. Added USER SQL snippet to change tablespace to users.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2357
diff changeset
381
441028ca9a28 Adjusted oracle_create_user.sql script. Added USER SQL snippet to change tablespace to users.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2357
diff changeset
382 * doc/schema/oracle_create_user.sql:
441028ca9a28 Adjusted oracle_create_user.sql script. Added USER SQL snippet to change tablespace to users.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2357
diff changeset
383 Adjusted oracle_create_user.sql script. Added USER SQL snippet to change
441028ca9a28 Adjusted oracle_create_user.sql script. Added USER SQL snippet to change tablespace to users.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2357
diff changeset
384 tablespace to users.
441028ca9a28 Adjusted oracle_create_user.sql script. Added USER SQL snippet to change tablespace to users.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2357
diff changeset
385
2357
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
386 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>:
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
387
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
388 * src/main/java/de/intevation/flys/utils/DateGuesser.java:
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
389 New. Date guesser from desktop FLYS.
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
390
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
391 * src/main/java/de/intevation/flys/importer/parsers/WstParser.java:
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
392 Try to parse the name of a WST column as a date and store
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
393 the date into the database
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
394
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
395 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java:
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
396 Added code to store the date of the column in the database.
2e18e12fac11 Added date guesser for WST columns.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2356
diff changeset
397
2356
b8e01307c138 Adjusted geometry type for floodplain and hws in AddGeometryColumn.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2355
diff changeset
398 2011-10-24 Bjoern Schilberg <bjoern.schilberg@intevation.de>
b8e01307c138 Adjusted geometry type for floodplain and hws in AddGeometryColumn.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2355
diff changeset
399
b8e01307c138 Adjusted geometry type for floodplain and hws in AddGeometryColumn.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2355
diff changeset
400 * doc/schema/postgresql-spatial.sql:
b8e01307c138 Adjusted geometry type for floodplain and hws in AddGeometryColumn.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2355
diff changeset
401 Adjusted geometry type for floodplain and hws in AddGeometryColumn.
b8e01307c138 Adjusted geometry type for floodplain and hws in AddGeometryColumn.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2355
diff changeset
402
2355
cf8dcfaeb756 Added missing views (wst_value_table,wst_w_values,wst_q_values).
Bjoern Schilberg <bjoern@intevation.de>
parents: 2354
diff changeset
403 2011-10-19 Bjoern Schilberg <bjoern.schilberg@intevation.de>
cf8dcfaeb756 Added missing views (wst_value_table,wst_w_values,wst_q_values).
Bjoern Schilberg <bjoern@intevation.de>
parents: 2354
diff changeset
404
cf8dcfaeb756 Added missing views (wst_value_table,wst_w_values,wst_q_values).
Bjoern Schilberg <bjoern@intevation.de>
parents: 2354
diff changeset
405 * doc/schema/oracle.sql:
cf8dcfaeb756 Added missing views (wst_value_table,wst_w_values,wst_q_values).
Bjoern Schilberg <bjoern@intevation.de>
parents: 2354
diff changeset
406 Added missing views (wst_value_table,wst_w_values,wst_q_values).
cf8dcfaeb756 Added missing views (wst_value_table,wst_w_values,wst_q_values).
Bjoern Schilberg <bjoern@intevation.de>
parents: 2354
diff changeset
407
2354
40093215061b Removed all CREATE OR REPLACE TRIGGER statements.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2353
diff changeset
408 2011-10-18 Bjoern Schilberg <bjoern.schilberg@intevation.de>
40093215061b Removed all CREATE OR REPLACE TRIGGER statements.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2353
diff changeset
409
40093215061b Removed all CREATE OR REPLACE TRIGGER statements.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2353
diff changeset
410 * doc/schema/oracle.sql:
40093215061b Removed all CREATE OR REPLACE TRIGGER statements.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2353
diff changeset
411 Removed all CREATE OR REPLACE TRIGGER statements.
40093215061b Removed all CREATE OR REPLACE TRIGGER statements.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2353
diff changeset
412
2353
67e0371f6f40 Adjusted NUMBER format for units, positions and cross_section_points tables.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2352
diff changeset
413 2011-10-17 Bjoern Schilberg <bjoern.schilberg@intevation.de>
67e0371f6f40 Adjusted NUMBER format for units, positions and cross_section_points tables.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2352
diff changeset
414
67e0371f6f40 Adjusted NUMBER format for units, positions and cross_section_points tables.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2352
diff changeset
415 * doc/schema/oracle.sql:
67e0371f6f40 Adjusted NUMBER format for units, positions and cross_section_points tables.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2352
diff changeset
416 Adjusted NUMBER format for units, positions and cross_section_points tables.
67e0371f6f40 Adjusted NUMBER format for units, positions and cross_section_points tables.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2352
diff changeset
417
2352
8126ccb58f28 Fixed errors.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2351
diff changeset
418 2011-10-10 Bjoern Schilberg <bjoern.schilberg@intevation.de>
8126ccb58f28 Fixed errors.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2351
diff changeset
419
8126ccb58f28 Fixed errors.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2351
diff changeset
420 * doc/schema/oracle.sql:
8126ccb58f28 Fixed errors.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2351
diff changeset
421 Fix errors.
8126ccb58f28 Fixed errors.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2351
diff changeset
422
2351
f993b735db71 Adjust oracle schema [I382]
Bjoern Schilberg <bjoern@intevation.de>
parents: 2350
diff changeset
423 2011-10-10 Bjoern Schilberg <bjoern.schilberg@intevation.de>
f993b735db71 Adjust oracle schema [I382]
Bjoern Schilberg <bjoern@intevation.de>
parents: 2350
diff changeset
424
f993b735db71 Adjust oracle schema [I382]
Bjoern Schilberg <bjoern@intevation.de>
parents: 2350
diff changeset
425 * doc/schema/oracle.sql:
f993b735db71 Adjust oracle schema [I382]
Bjoern Schilberg <bjoern@intevation.de>
parents: 2350
diff changeset
426 Adjust oracle schema [I382].
f993b735db71 Adjust oracle schema [I382]
Bjoern Schilberg <bjoern@intevation.de>
parents: 2350
diff changeset
427
2350
3eb520b7a70e Removed obsolete imports.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2349
diff changeset
428 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de>
3eb520b7a70e Removed obsolete imports.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2349
diff changeset
429
3eb520b7a70e Removed obsolete imports.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2349
diff changeset
430 * src/main/java/de/intevation/flys/importer/ImportWst.java,
3eb520b7a70e Removed obsolete imports.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2349
diff changeset
431 src/main/java/de/intevation/flys/importer/ImportUnit.java:
3eb520b7a70e Removed obsolete imports.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2349
diff changeset
432 Removed obsolete imports.
3eb520b7a70e Removed obsolete imports.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2349
diff changeset
433
2349
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
434 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>:
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
435
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
436 * ChangeLog: Added database update statements.
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
437
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
438 To update existing databases:
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
439
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
440 BEGIN;
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
441 CREATE SEQUENCE UNITS_ID_SEQ;
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
442 CREATE TABLE units (
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
443 id int PRIMARY KEY NOT NULL,
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
444 name VARCHAR(32) NOT NULL UNIQUE
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
445 );
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
446 ALTER TABLE rivers ADD COLUMN wst_unit_id int REFERENCES units(id);
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
447 INSERT INTO units (id, name) VALUES (nextval('UNITS_ID_SEQ'), 'NN + m');
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
448 INSERT INTO units (id, name) VALUES (nextval('UNITS_ID_SEQ'), 'NHN + m');
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
449 UPDATE rivers SET wst_unit_id = (SELECT id FROM units WHERE name = 'NHN + m') WHERE name = 'Elbe';
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
450 UPDATE rivers SET wst_unit_id = (SELECT id FROM units WHERE name = 'NN + m') WHERE name <> 'Elbe';
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
451 ALTER TABLE rivers ALTER COLUMN wst_unit_id SET NOT NULL;
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
452 COMMIT;
775e316f255b units table: Added update statements for existing databases
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2348
diff changeset
453
2348
8477965674ce Added a schema dump shell script.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2347
diff changeset
454 2011-10-05 Ingo Weinzierl <ingo@intevation.de>
8477965674ce Added a schema dump shell script.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2347
diff changeset
455
8477965674ce Added a schema dump shell script.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2347
diff changeset
456 * contrib/dump-schema.sh: New. A small shell script that dumps the
8477965674ce Added a schema dump shell script.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2347
diff changeset
457 database schema of a given database to SQL.
8477965674ce Added a schema dump shell script.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2347
diff changeset
458
8477965674ce Added a schema dump shell script.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2347
diff changeset
459 * pom.xml: Added dependency for hibernate-spatial-oracle stuff.
8477965674ce Added a schema dump shell script.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2347
diff changeset
460
2347
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
461 2011-10-04 Ingo Weinzierl <ingo@intevation.de>
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
462
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
463 * doc/schema/postgresql.sql: Removed unit column from wsts; added a
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
464 wst_unit_id column to rivers. We decided to support a single elevation
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
465 model for the whole river.
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
466
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
467 * src/main/java/de/intevation/flys/model/River.java: Added a WstUnit
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
468 column.
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
469
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
470 * src/main/java/de/intevation/flys/model/Wst.java: Removed the Unit
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
471 column.
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
472
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
473 * src/main/java/de/intevation/flys/importer/ImportWst.java: Provide a
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
474 getUnit() method that allows querying the elevation unit for this wst.
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
475
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
476 * src/main/java/de/intevation/flys/importer/ImportUnit.java: Removed
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
477 storeDependencies().
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
478
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
479 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Save the
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
480 Unit of the wst file or a default one into database before all other
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
481 dependencies as well as the river itself is saved to database.
0acf28a3d28a Removed the Unit from Wsts - added a WstUnit column to rivers.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2346
diff changeset
482
2346
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
483 2011-10-04 Ingo Weinzierl <ingo@intevation.de>
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
484
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
485 * doc/schema/postgresql.sql: Added a "units" table.
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
486
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
487 * src/main/java/de/intevation/flys/model/Unit.java: New. Model class that
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
488 represents a unit.
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
489
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
490 * src/main/java/de/intevation/flys/importer/ImportUnit.java: New. Model
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
491 class that is used to import units.
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
492
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
493 * src/main/java/de/intevation/flys/model/Wst.java: A Wst stores a Unit
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
494 which references "units" table now.
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
495
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
496 * src/main/java/de/intevation/flys/importer/parsers/WstParser.java: Set
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
497 units which have already been parsed on Wsts.
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
498
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
499 * src/main/java/de/intevation/flys/importer/ImportWst.java: Added setter
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
500 method for Units and call storeDependencies() for ImportUnits.
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
501
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
502 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
503 Registered new model class Unit.
f834b411ca57 Added db table, model class and importer stuff for units.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2345
diff changeset
504
2345
c3ea91aee989 Bugfix: #333 Improved determination of reference gauge based on start km.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2344
diff changeset
505 2011-10-04 Ingo Weinzierl <ingo@intevation.de>
c3ea91aee989 Bugfix: #333 Improved determination of reference gauge based on start km.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2344
diff changeset
506
c3ea91aee989 Bugfix: #333 Improved determination of reference gauge based on start km.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2344
diff changeset
507 flys/issue333 (W-INFO / Berechnung Wasserspiegellage, Zuordnung Bezugspegel)
c3ea91aee989 Bugfix: #333 Improved determination of reference gauge based on start km.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2344
diff changeset
508
c3ea91aee989 Bugfix: #333 Improved determination of reference gauge based on start km.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2344
diff changeset
509 * src/main/java/de/intevation/flys/model/River.java: Modified
c3ea91aee989 Bugfix: #333 Improved determination of reference gauge based on start km.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2344
diff changeset
510 determination of gauge based on a km range. River.determineGauge(double,
c3ea91aee989 Bugfix: #333 Improved determination of reference gauge based on start km.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2344
diff changeset
511 double) will now return the gauge which matches the start km.
c3ea91aee989 Bugfix: #333 Improved determination of reference gauge based on start km.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2344
diff changeset
512
2344
ec0ffc842573 Extracted StringUtil.wWrap method from WaterlevelSelectState .
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2343
diff changeset
513 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de>
ec0ffc842573 Extracted StringUtil.wWrap method from WaterlevelSelectState .
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2343
diff changeset
514
ec0ffc842573 Extracted StringUtil.wWrap method from WaterlevelSelectState .
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2343
diff changeset
515 * src/main/java/de/intevation/flys/utils/StringUtil.java:
ec0ffc842573 Extracted StringUtil.wWrap method from WaterlevelSelectState .
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2343
diff changeset
516 (wWrap): New method (extracted from WaterlevelSelectState).
ec0ffc842573 Extracted StringUtil.wWrap method from WaterlevelSelectState .
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2343
diff changeset
517
2343
6662b0ea20c1 Added 'unbracket' StringUtil method (extracted from WaterlevelSelectState).
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2342
diff changeset
518 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de>
6662b0ea20c1 Added 'unbracket' StringUtil method (extracted from WaterlevelSelectState).
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2342
diff changeset
519
6662b0ea20c1 Added 'unbracket' StringUtil method (extracted from WaterlevelSelectState).
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2342
diff changeset
520 * src/main/java/de/intevation/flys/utils/StringUtil.java:
6662b0ea20c1 Added 'unbracket' StringUtil method (extracted from WaterlevelSelectState).
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2342
diff changeset
521 (unbracket): New method (extracted from WaterlevelSelectState).
6662b0ea20c1 Added 'unbracket' StringUtil method (extracted from WaterlevelSelectState).
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 2342
diff changeset
522
2342
3efc3942b765 CrossSectionLine: Moved some logic from cross section demo app to this model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2341
diff changeset
523 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de>
3efc3942b765 CrossSectionLine: Moved some logic from cross section demo app to this model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2341
diff changeset
524
3efc3942b765 CrossSectionLine: Moved some logic from cross section demo app to this model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2341
diff changeset
525 * src/main/java/de/intevation/flys/model/CrossSectionLine.java:
3efc3942b765 CrossSectionLine: Moved some logic from cross section demo app to this model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2341
diff changeset
526 Moved some logic from cross section demo app to this model.
3efc3942b765 CrossSectionLine: Moved some logic from cross section demo app to this model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 2341
diff changeset
527
2341
8e2fe935ddf1 Added function to retrieve nearest CrossSectionTrack to a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2340
diff changeset
528 2011-09-26 Ingo Weinzierl <ingo@intevation.de>
8e2fe935ddf1 Added function to retrieve nearest CrossSectionTrack to a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2340
diff changeset
529
8e2fe935ddf1 Added function to retrieve nearest CrossSectionTrack to a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2340
diff changeset
530 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java:
8e2fe935ddf1 Added function to retrieve nearest CrossSectionTrack to a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2340
diff changeset
531 Added new function that the nearest CrossSectionTrack of a river to a
8e2fe935ddf1 Added function to retrieve nearest CrossSectionTrack to a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2340
diff changeset
532 given kilometer.
8e2fe935ddf1 Added function to retrieve nearest CrossSectionTrack to a given kilometer.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2340
diff changeset
533
2340
c4f090a00178 Added missing schemas.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2339
diff changeset
534 2011-09-23 Bjoern Schilberg <bjoern@intevation.de>
c4f090a00178 Added missing schemas.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2339
diff changeset
535
c4f090a00178 Added missing schemas.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2339
diff changeset
536 * doc/schema/postgresql-spatial.sql:
c4f090a00178 Added missing schemas.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2339
diff changeset
537 Added missing river_axes_km schema.
c4f090a00178 Added missing schemas.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2339
diff changeset
538 * doc/schema/oracle-spatial.sql:
c4f090a00178 Added missing schemas.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2339
diff changeset
539 Added missing dem and lines schema.
c4f090a00178 Added missing schemas.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2339
diff changeset
540
2339
b28ab244a77d Harmonized oracle and postgresql spatial schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2338
diff changeset
541 2011-09-22 Bjoern Schilberg <bjoern@intevation.de>
b28ab244a77d Harmonized oracle and postgresql spatial schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2338
diff changeset
542
b28ab244a77d Harmonized oracle and postgresql spatial schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2338
diff changeset
543 * doc/schema/postgresql-spatial.sql, doc/schema/oracle-spatial.sql:
b28ab244a77d Harmonized oracle and postgresql spatial schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2338
diff changeset
544 Harmonized oracle and postgresql spatial schema.
b28ab244a77d Harmonized oracle and postgresql spatial schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2338
diff changeset
545
2338
e69ef36290ae Harmonized Extent for Saar and Mosel. Some cleanups.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2337
diff changeset
546 2011-09-22 Bjoern Schilberg <bjoern@intevation.de>
e69ef36290ae Harmonized Extent for Saar and Mosel. Some cleanups.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2337
diff changeset
547
e69ef36290ae Harmonized Extent for Saar and Mosel. Some cleanups.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2337
diff changeset
548 * doc/schema/oracle-spatial.sql: Harmonized Extent for Saar and Mosel. Some cleanups.
e69ef36290ae Harmonized Extent for Saar and Mosel. Some cleanups.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2337
diff changeset
549
2337
52d712cd2384 Added code and a system property 'flys.backend.enablejmx=true' to enable JMX support for hibernate.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2336
diff changeset
550 2011-09-22 Ingo Weinzierl <ingo@intevation.de>
52d712cd2384 Added code and a system property 'flys.backend.enablejmx=true' to enable JMX support for hibernate.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2336
diff changeset
551
52d712cd2384 Added code and a system property 'flys.backend.enablejmx=true' to enable JMX support for hibernate.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2336
diff changeset
552 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
52d712cd2384 Added code and a system property 'flys.backend.enablejmx=true' to enable JMX support for hibernate.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2336
diff changeset
553 Added the possibility to enable JMX (/MBean) support for hibernate. By
52d712cd2384 Added code and a system property 'flys.backend.enablejmx=true' to enable JMX support for hibernate.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2336
diff changeset
554 default, this support is NOT enabled. To enable JMX support for
52d712cd2384 Added code and a system property 'flys.backend.enablejmx=true' to enable JMX support for hibernate.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2336
diff changeset
555 hibernate, set the system property "flys.backend.enablejmx=true".
52d712cd2384 Added code and a system property 'flys.backend.enablejmx=true' to enable JMX support for hibernate.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 2336
diff changeset
556
2336
60c722dc0304 Added right to create views.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2335
diff changeset
557 2011-09-20 Bjoern Schilberg <bjoern@intevation.de>
60c722dc0304 Added right to create views.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2335
diff changeset
558
60c722dc0304 Added right to create views.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2335
diff changeset
559 * doc/schema/oracle_create_user.sql: Added right to create views.
60c722dc0304 Added right to create views.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2335
diff changeset
560
2335
e1fb4a1e0b4a Generalized oracle spatial schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2334
diff changeset
561 2011-09-20 Bjoern Schilberg <bjoern@intevation.de>
e1fb4a1e0b4a Generalized oracle spatial schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2334
diff changeset
562
e1fb4a1e0b4a Generalized oracle spatial schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2334
diff changeset
563 * doc/schema/oracle-spatial.sql: Generalized oracle spatial schema.
e1fb4a1e0b4a Generalized oracle spatial schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 2334
diff changeset
564
2334
8a3dbb705ebf Tagged RELEASE 2.5 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1257
diff changeset
565 2011-09-19 Ingo Weinzierl <ingo@intevation.de>
8a3dbb705ebf Tagged RELEASE 2.5 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1257
diff changeset
566
8a3dbb705ebf Tagged RELEASE 2.5 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1257
diff changeset
567 Tagged RELEASE 2.5
8a3dbb705ebf Tagged RELEASE 2.5 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1257
diff changeset
568
8a3dbb705ebf Tagged RELEASE 2.5 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1257
diff changeset
569 * Changes: Prepared changes for release.
8a3dbb705ebf Tagged RELEASE 2.5 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1257
diff changeset
570
1257
85bcf8f34abb Added a function to query a DGM by Id.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1256
diff changeset
571 2011-09-16 Ingo Weinzierl <ingo@intevation.de>
85bcf8f34abb Added a function to query a DGM by Id.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1256
diff changeset
572
85bcf8f34abb Added a function to query a DGM by Id.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1256
diff changeset
573 * src/main/java/de/intevation/flys/model/DGM.java: Added function to query
85bcf8f34abb Added a function to query a DGM by Id.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1256
diff changeset
574 a DGM by Id.
85bcf8f34abb Added a function to query a DGM by Id.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1256
diff changeset
575
1256
7141ff5540c9 Removed oracle dependency.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1255
diff changeset
576 2011-09-15 Bjoern Schilberg <bjoern@intevation.de>
7141ff5540c9 Removed oracle dependency.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1255
diff changeset
577
7141ff5540c9 Removed oracle dependency.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1255
diff changeset
578 * pom.xml: Removed oracle dependency.
7141ff5540c9 Removed oracle dependency.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1255
diff changeset
579
1255
0e63222d80bc Added inital oracle schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1254
diff changeset
580 2011-09-15 Bjoern Schilberg <bjoern@intevation.de>
0e63222d80bc Added inital oracle schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1254
diff changeset
581
0e63222d80bc Added inital oracle schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1254
diff changeset
582 * doc/schema/oracle.sql: Added inital oracle schema.
0e63222d80bc Added inital oracle schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1254
diff changeset
583
1254
3d4eb1abe23e Added inital oracle-spatial_idx.sql script.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1253
diff changeset
584 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
3d4eb1abe23e Added inital oracle-spatial_idx.sql script.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1253
diff changeset
585
3d4eb1abe23e Added inital oracle-spatial_idx.sql script.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1253
diff changeset
586 * doc/schema/oracle-spatial_idx.sql: Added inital oracle-spatial_idx.sql
3d4eb1abe23e Added inital oracle-spatial_idx.sql script.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1253
diff changeset
587 script.
3d4eb1abe23e Added inital oracle-spatial_idx.sql script.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1253
diff changeset
588
1253
a75e7d922942 Deactivated spatial indexes.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1252
diff changeset
589 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
a75e7d922942 Deactivated spatial indexes.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1252
diff changeset
590
a75e7d922942 Deactivated spatial indexes.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1252
diff changeset
591 * doc/schema/oracle-spatial.sql: Deactivated spatial indexes.
a75e7d922942 Deactivated spatial indexes.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1252
diff changeset
592
1252
d00a50c69a67 Added inital oracle_create_user.sql script.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1251
diff changeset
593 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
d00a50c69a67 Added inital oracle_create_user.sql script.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1251
diff changeset
594
d00a50c69a67 Added inital oracle_create_user.sql script.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1251
diff changeset
595 * doc/schema/oracle_create_user.sql: Added inital oracle_create_user.sql
d00a50c69a67 Added inital oracle_create_user.sql script.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1251
diff changeset
596 script.
d00a50c69a67 Added inital oracle_create_user.sql script.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1251
diff changeset
597
1251
f124c99077b5 Added schema floodplain.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1250
diff changeset
598 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
f124c99077b5 Added schema floodplain.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1250
diff changeset
599
f124c99077b5 Added schema floodplain.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1250
diff changeset
600 * doc/schema/oracle-spatial.sql: Added schema floodplain.
f124c99077b5 Added schema floodplain.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1250
diff changeset
601
1250
660116539429 Added schema hws.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1249
diff changeset
602 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
660116539429 Added schema hws.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1249
diff changeset
603
660116539429 Added schema hws.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1249
diff changeset
604 * doc/schema/oracle-spatial.sql: Added schema hws.
660116539429 Added schema hws.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1249
diff changeset
605
1249
735717961e0b Added schema cross_section_tracks.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1248
diff changeset
606 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
735717961e0b Added schema cross_section_tracks.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1248
diff changeset
607
735717961e0b Added schema cross_section_tracks.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1248
diff changeset
608 * doc/schema/oracle-spatial.sql: Added schema cross_section_tracks.
735717961e0b Added schema cross_section_tracks.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1248
diff changeset
609
1248
f36ed659003c Added schema river_axes.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1247
diff changeset
610 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
f36ed659003c Added schema river_axes.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1247
diff changeset
611
f36ed659003c Added schema river_axes.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1247
diff changeset
612 * doc/schema/oracle-spatial.sql: Added schema river_axes.
f36ed659003c Added schema river_axes.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1247
diff changeset
613
1247
6c6c5500d72d Added schema fixpoints.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1246
diff changeset
614 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
6c6c5500d72d Added schema fixpoints.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1246
diff changeset
615
6c6c5500d72d Added schema fixpoints.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1246
diff changeset
616 * doc/schema/oracle-spatial.sql: Added schema fixpoints.
6c6c5500d72d Added schema fixpoints.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1246
diff changeset
617
1246
e334314e8eb2 Added schema buildings.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1245
diff changeset
618 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
e334314e8eb2 Added schema buildings.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1245
diff changeset
619
e334314e8eb2 Added schema buildings.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1245
diff changeset
620 * doc/schema/oracle-spatial.sql: Added schema buildings.
e334314e8eb2 Added schema buildings.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1245
diff changeset
621
1245
0414181b0859 Fixed table river_axes_km.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1244
diff changeset
622 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
0414181b0859 Fixed table river_axes_km.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1244
diff changeset
623
0414181b0859 Fixed table river_axes_km.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1244
diff changeset
624 * doc/schema/oracle-spatial.sql: Fixed table river_axes_km.
0414181b0859 Fixed table river_axes_km.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1244
diff changeset
625
1244
281f38fc6c3e Initial oracle schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1241
diff changeset
626 2011-09-13 Bjoern Schilberg <bjoern@intevation.de>
281f38fc6c3e Initial oracle schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1241
diff changeset
627
281f38fc6c3e Initial oracle schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1241
diff changeset
628 * doc/schema/oracle-spatial.sql: Added initial oracle schemas.
281f38fc6c3e Initial oracle schema.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1241
diff changeset
629
1241
f68a0504dfb6 Postgresql spatial scheme extended.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1240
diff changeset
630 2011-09-12 Bjoern Schilberg <bjoern@intevation.de>
f68a0504dfb6 Postgresql spatial scheme extended.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1240
diff changeset
631
f68a0504dfb6 Postgresql spatial scheme extended.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1240
diff changeset
632 * doc/schema/postgresql-spatial.sql: Added initial schemas for
f68a0504dfb6 Postgresql spatial scheme extended.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1240
diff changeset
633 Hydrologie/Einzugsgebiete, Hydrologie/HW-Schutzanlagen, Hydrologie/Hydr.
f68a0504dfb6 Postgresql spatial scheme extended.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1240
diff changeset
634 Grenzen/Linien, BfG/hauptoeff_*.shp, BfG/MNQ-*.shp,
f68a0504dfb6 Postgresql spatial scheme extended.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1240
diff changeset
635 BfG/modellgrenze*.shp, BfG/uferlinie.shp, BfG/vorland_*.shp,
f68a0504dfb6 Postgresql spatial scheme extended.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1240
diff changeset
636 Hydrologie/Streckendaten, Hydrologie/UeSG/Berechnung,
f68a0504dfb6 Postgresql spatial scheme extended.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1240
diff changeset
637 Hydrologie/UeSG/Messung
f68a0504dfb6 Postgresql spatial scheme extended.
Bjoern Schilberg <bjoern@intevation.de>
parents: 1240
diff changeset
638
1240
2ef8b67bd68a Replaced SERIALs with SEQUENCES in PostgreSQL spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1239
diff changeset
639 2011-09-02 Ingo Weinzierl <ingo@intevation.de>
2ef8b67bd68a Replaced SERIALs with SEQUENCES in PostgreSQL spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1239
diff changeset
640
2ef8b67bd68a Replaced SERIALs with SEQUENCES in PostgreSQL spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1239
diff changeset
641 * doc/schema/postgresql-spatial.sql: Removed SERIALs from schema.
2ef8b67bd68a Replaced SERIALs with SEQUENCES in PostgreSQL spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1239
diff changeset
642 Auto-Increment is realized through SERIALs now.
2ef8b67bd68a Replaced SERIALs with SEQUENCES in PostgreSQL spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1239
diff changeset
643
2ef8b67bd68a Replaced SERIALs with SEQUENCES in PostgreSQL spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1239
diff changeset
644 * src/main/java/de/intevation/flys/model/DGM.java: The table for dem has
2ef8b67bd68a Replaced SERIALs with SEQUENCES in PostgreSQL spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1239
diff changeset
645 been renamed to 'dem' (before 'dgm').
2ef8b67bd68a Replaced SERIALs with SEQUENCES in PostgreSQL spatial schema.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1239
diff changeset
646
1239
07882568cef8 Hint for unifying table names: dgm -> dem
Hans Plum <hans.plum@intevation.de>
parents: 1238
diff changeset
647 2011-09-01 Hans Plum <hans@intevation.de>
07882568cef8 Hint for unifying table names: dgm -> dem
Hans Plum <hans.plum@intevation.de>
parents: 1238
diff changeset
648
07882568cef8 Hint for unifying table names: dgm -> dem
Hans Plum <hans.plum@intevation.de>
parents: 1238
diff changeset
649 * doc/schema/postgresql-spatial.sql:
07882568cef8 Hint for unifying table names: dgm -> dem
Hans Plum <hans.plum@intevation.de>
parents: 1238
diff changeset
650 Hint for unifying table names: dgm -> dem
07882568cef8 Hint for unifying table names: dgm -> dem
Hans Plum <hans.plum@intevation.de>
parents: 1238
diff changeset
651
1238
35740d675866 Added mappings to existing data in file system (based on river Saar); added TODOs for missing tables/mappings
Hans Plum <hans.plum@intevation.de>
parents: 1237
diff changeset
652 2011-09-01 Hans Plum <hans@intevation.de>
35740d675866 Added mappings to existing data in file system (based on river Saar); added TODOs for missing tables/mappings
Hans Plum <hans.plum@intevation.de>
parents: 1237
diff changeset
653
35740d675866 Added mappings to existing data in file system (based on river Saar); added TODOs for missing tables/mappings
Hans Plum <hans.plum@intevation.de>
parents: 1237
diff changeset
654 * doc/schema/postgresql-spatial.sql:
35740d675866 Added mappings to existing data in file system (based on river Saar); added TODOs for missing tables/mappings
Hans Plum <hans.plum@intevation.de>
parents: 1237
diff changeset
655 Added mappings to existing data in file system (based on
35740d675866 Added mappings to existing data in file system (based on river Saar); added TODOs for missing tables/mappings
Hans Plum <hans.plum@intevation.de>
parents: 1237
diff changeset
656 river Saar); added TODOs for missing tables/mappings
35740d675866 Added mappings to existing data in file system (based on river Saar); added TODOs for missing tables/mappings
Hans Plum <hans.plum@intevation.de>
parents: 1237
diff changeset
657
1237
774dff3ee546 Added relation and hibernate classes for floodplains (german 'Talaue').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1236
diff changeset
658 2011-08-31 Ingo Weinzierl <ingo@intevation.de>
774dff3ee546 Added relation and hibernate classes for floodplains (german 'Talaue').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1236
diff changeset
659
774dff3ee546 Added relation and hibernate classes for floodplains (german 'Talaue').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1236
diff changeset
660 * doc/schema/postgresql-spatial.sql: New relation for floodplains (german
774dff3ee546 Added relation and hibernate classes for floodplains (german 'Talaue').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1236
diff changeset
661 "Talaue").
774dff3ee546 Added relation and hibernate classes for floodplains (german 'Talaue').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1236
diff changeset
662
774dff3ee546 Added relation and hibernate classes for floodplains (german 'Talaue').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1236
diff changeset
663 * src/main/java/de/intevation/flys/model/Floodplain.java: New. Model class
774dff3ee546 Added relation and hibernate classes for floodplains (german 'Talaue').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1236
diff changeset
664 that represents a floodplain.
774dff3ee546 Added relation and hibernate classes for floodplains (german 'Talaue').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1236
diff changeset
665
774dff3ee546 Added relation and hibernate classes for floodplains (german 'Talaue').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1236
diff changeset
666 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
774dff3ee546 Added relation and hibernate classes for floodplains (german 'Talaue').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1236
diff changeset
667 Registered the Floodplain mapping.
774dff3ee546 Added relation and hibernate classes for floodplains (german 'Talaue').
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1236
diff changeset
668
1236
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
669 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
670
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
671 * 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
672 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
673 the DGM file.
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
674
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
675 * 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
676 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
677
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
678 * 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
679 Registered the DGM.
324cb486db9f Added relation and hibernate classes for DGMs.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1235
diff changeset
680
1235
47ce1fab8464 Added a static function that returns all CrossSectionTracks of a specific river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1234
diff changeset
681 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
682
47ce1fab8464 Added a static function that returns all CrossSectionTracks of a specific river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1234
diff changeset
683 * 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
684 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
685
1234
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
686 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
687
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
688 * 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
689 artifacts-common module.
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
690
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
691 * 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
692 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
693 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
694 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
695 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
696 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
697 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
698 imports of FileTools.
c5c48f52dc7b Removed FileTools that has been moved to artifacts-common module.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1233
diff changeset
699
1233
5a3109b8475f Mapping and Accessors for MainValues of Gauge, by Sascha L. Teichmann.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 1232
diff changeset
700 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
701
5a3109b8475f Mapping and Accessors for MainValues of Gauge, by Sascha L. Teichmann.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 1232
diff changeset
702 * 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
703 (setMainValues):
5a3109b8475f Mapping and Accessors for MainValues of Gauge, by Sascha L. Teichmann.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents: 1232
diff changeset
704 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
705 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
706
1232
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
707 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
708
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
709 * 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
710 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
711 PostGIS by accident.
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
712 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
713 use the PostGIS stuff.
3383e042a655 Reverted the default db dialect back PostgreSQL.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1231
diff changeset
714
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
715 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
716
22eea1c9e907 Added a function in RiverAxis to retrieve the RiverAxis of a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1230
diff changeset
717 * 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
718 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
719
22eea1c9e907 Added a function in RiverAxis to retrieve the RiverAxis of a given river.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1230
diff changeset
720 * 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
721 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
722
1230
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
723 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
724
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
725 * 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
726 FLYS spatial data.
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
727
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
728 * 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
729 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
730 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
731 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
732 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
733 represent FLYS spatial data.
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
734
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
735 * 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
736 Registered model classes.
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
737
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
738 * 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
739
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
740 * 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
741 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
742 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
743 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
744 your choice.
e2deda3b77a7 Introduced support for FLYS spatial data.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1229
diff changeset
745
1229
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
746 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
747
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
748 Re-enabled Hibernate schema dumps.
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
749
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
750 * 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
751 and use new SessionFactoryProvider infrastructure.
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
752
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
753 * 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
754 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
755 Useful for introspection only purposes.
8b12b338a3f6 Re-enabled Hibernate schema dumps.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1228
diff changeset
756
1228
a964636a0be3 Bumped Apache DBCP up to 1.4
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1227
diff changeset
757 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
758
a964636a0be3 Bumped Apache DBCP up to 1.4
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1227
diff changeset
759 * 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
760 as artifact database.
a964636a0be3 Bumped Apache DBCP up to 1.4
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1227
diff changeset
761
1227
cdb35d96ca09 Importer session: Make use of the LRU cache from artifacts common.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1226
diff changeset
762 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
763
cdb35d96ca09 Importer session: Make use of the LRU cache from artifacts common.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1226
diff changeset
764 * 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
765 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
766
1226
1dbafbba50ea Schema: added missing key contraint on hyks table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1225
diff changeset
767 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
768
1dbafbba50ea Schema: added missing key contraint on hyks table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1225
diff changeset
769 * 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
770 To update existing databases:
1dbafbba50ea Schema: added missing key contraint on hyks table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1225
diff changeset
771
1dbafbba50ea Schema: added missing key contraint on hyks table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1225
diff changeset
772 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
773
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
774 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
775
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
776 * 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
777 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
778
1224
ca7d461a53f1 HYK importer: Various small fixes and some extra logging.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1223
diff changeset
779 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
780
ca7d461a53f1 HYK importer: Various small fixes and some extra logging.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1223
diff changeset
781 * 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
782 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
783 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
784 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
785 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
786 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
787
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
788 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
789
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
790 * 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
791 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
792 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
793
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
794 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
795 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
796
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
797 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
798 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
799
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
800 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
801 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
802
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
803 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
804 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
805
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
806 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
807 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
808
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
809 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
810 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
811
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
812 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
813 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
814
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
815 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
816 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
817
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
818 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
819 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
820
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
821 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
822 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
823
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
824 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
825 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
826
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
827 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
828 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
829
1222
1f21f162bcf3 Fixed OrderBy clause in HYKEntry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1221
diff changeset
830 2011-07-18 Ingo Weinzierl <ingo@intevation.de>
1f21f162bcf3 Fixed OrderBy clause in HYKEntry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1221
diff changeset
831
1f21f162bcf3 Fixed OrderBy clause in HYKEntry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1221
diff changeset
832 * 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
833 clause.
1f21f162bcf3 Fixed OrderBy clause in HYKEntry.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 1221
diff changeset
834
1221
979ff070e368 Store HYK data structures to database. Needs testing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1220
diff changeset
835 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
836
979ff070e368 Store HYK data structures to database. Needs testing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1220
diff changeset
837 * 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
838 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
839 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
840 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
841 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
842 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
843
1220
3c860d3e79d9 Importer: Parse HYKs from importer.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1219
diff changeset
844 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
845
3c860d3e79d9 Importer: Parse HYKs from importer.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1219
diff changeset
846 * 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
847 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
848
1219
d80997bd94ce HYKParser: Create data structures while parsing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1218
diff changeset
849 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
850
d80997bd94ce HYKParser: Create data structures while parsing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1218
diff changeset
851 * 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
852 Create data structures while parsing.
d80997bd94ce HYKParser: Create data structures while parsing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1218
diff changeset
853
d80997bd94ce HYKParser: Create data structures while parsing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1218
diff changeset
854 * 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
855 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
856 getters/setters to ease model wiring.
d80997bd94ce HYKParser: Create data structures while parsing.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1218
diff changeset
857
1218
00e37d22a589 Added importer models for HYKs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1217
diff changeset
858 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
859
00e37d22a589 Added importer models for HYKs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1217
diff changeset
860 * 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
861 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
862 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
863 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
864 Importer models for HYKs.
00e37d22a589 Added importer models for HYKs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1217
diff changeset
865
1217
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
866 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
867
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
868 * 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
869 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
870 To update existing databases:
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
871 BEGIN;
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
872 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
873 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
874 COMMIT;
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
875
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
876 * 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
877 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
878 Adjusted Hibernate models.
d5e39c16fd2a Schema: Fixed location of 'Peilungsjahre' in HYKs
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1216
diff changeset
879
1216
f8b5c37f15e4 Fixes for the HYK parser
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1215
diff changeset
880 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
881
f8b5c37f15e4 Fixes for the HYK parser
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1215
diff changeset
882 * 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
883 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
884 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
885
f8b5c37f15e4 Fixes for the HYK parser
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1215
diff changeset
886 * 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
887 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
888
1215
8aef353e54fb Initial version of the HYK parser. Not ready, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1214
diff changeset
889 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
890
8aef353e54fb Initial version of the HYK parser. Not ready, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1214
diff changeset
891 * 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
892 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
893
8aef353e54fb Initial version of the HYK parser. Not ready, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1214
diff changeset
894 * 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
895 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
896
1214
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
897 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
898
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
899 * 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
900 wrong table.
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
901 To update existing databases:
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
902 BEGIN;
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
903 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
904 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
905 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
906 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
907 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
908 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
909 COMMIT;
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
910
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
911 * 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
912 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
913 Adjusted Hibernate models.
32ee9babe42c Schema: Argh! Added distance_{vl|hf|vr} to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1213
diff changeset
914
1213
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
915 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
916
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
917 * 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
918 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
919
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
920 * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java:
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
921 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
922
1212
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
923 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
924
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
925 * 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
926 To update existing databases:
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
927 BEGIN;
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
928 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
929 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
930 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
931 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
932 COMMIT;
1213
cc88db4a5b34 Added method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1212
diff changeset
933
1212
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
934 * 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
935 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
936 Adjusted Hibernate models.
dd948530fd57 Schema: Added missing columns in HYK tables.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1211
diff changeset
937
1211
f08fe480092c Moved file parsers to separate package.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1210
diff changeset
938 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
939
f08fe480092c Moved file parsers to separate package.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1210
diff changeset
940 * 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
941 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
942 into this package.
f08fe480092c Moved file parsers to separate package.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1210
diff changeset
943
f08fe480092c Moved file parsers to separate package.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1210
diff changeset
944 * 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
945
1210
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
946 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
947
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
948 * 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
949 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
950 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
951 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
952 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
953 for the HYK structures.
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
954
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
955 * 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
956 Registered new models.
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
957
31d8638760b1 New. The hibernate models
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1209
diff changeset
958 * 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
959 '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
960
1209
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
961 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
962
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
963 * 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
964 To update existing databases:
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
965
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
966 BEGIN;
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
967 CREATE SEQUENCE HYKS_ID_SEQ;
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
968 CREATE TABLE hyks (
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
969 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
970 river_id int NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
971 description VARCHAR(256) NOT NULL
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
972 );
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
973
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
974 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
975 CREATE TABLE hyk_entries (
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
976 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
977 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
978 km NUMERIC NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
979 UNIQUE (hyk_id, km)
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
980 );
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
981
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
982 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
983 CREATE TABLE hyk_formations (
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
984 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
985 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
986 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
987 top NUMERIC NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
988 bottom NUMERIC NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
989 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
990 );
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
991
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
992 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
993 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
994 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
995 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
996 description VARCHAR(256)
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
997 );
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
998
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
999 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
1000 CREATE TABLE hyk_flow_zones (
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
1001 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
1002 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
1003 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
1004 a NUMERIC NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
1005 b NUMERIC NOT NULL,
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
1006 CHECK (a <= b)
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
1007 );
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
1008 COMMIT;
c12b5fbd33e8 schema: Added structures for HYKs "Hydraulische Kenngroessen"
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1208
diff changeset
1009
1208
2b57edd94735 Bumped Hibernate up to 3.6.5
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1207
diff changeset
1010 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
1011
2b57edd94735 Bumped Hibernate up to 3.6.5
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1207
diff changeset
1012 * 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
1013
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
1014 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
1015
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
1016 * 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
1017 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
1018 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
1019
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
1020 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
1021
c7370734b872 Prevent parsing and storing PRF duplicates.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1205
diff changeset
1022 * 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
1023 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
1024 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
1025 "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
1026 detect file duplicates.
c7370734b872 Prevent parsing and storing PRF duplicates.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1205
diff changeset
1027
c7370734b872 Prevent parsing and storing PRF duplicates.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1205
diff changeset
1028 * 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
1029 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
1030 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
1031
c7370734b872 Prevent parsing and storing PRF duplicates.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1205
diff changeset
1032 * 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
1033 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
1034 parsing of PRF duplicates.
c7370734b872 Prevent parsing and storing PRF duplicates.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1205
diff changeset
1035
1205
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
1036 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
1037
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
1038 * doc/schema/postgresql.sql: Misspelled sequence.
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
1039 To update existing databases:
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
1040
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
1041 DROP SEQUENCE CROSS_SECTION_LINES_SEQ;
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
1042 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
1043
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
1044 * 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
1045 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
1046
5f1506fc7636 Made import of cross sections work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1204
diff changeset
1047 * 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
1048 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
1049
1204
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
1050 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
1051
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
1052 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
1053 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
1054
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
1055 * 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
1056 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
1057 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
1058
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
1059 * 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
1060 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
1061
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
1062 * 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
1063 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
1064
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
1065 * 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
1066 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
1067 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
1068 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
1069 Added convinience constructors.
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
1070
22858e7cca79 Integrated PRF parsing into importer. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1203
diff changeset
1071 * 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
1072 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
1073
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
1074 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
1075
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
1076 * 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
1077 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
1078
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
1079 * 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
1080 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
1081
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
1082 * 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
1083 '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
1084
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
1085 * 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
1086 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
1087
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
1088 * 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
1089 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
1090
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
1091 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
1092 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
1093 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
1094 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
1095 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
1096 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
1097 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
1098 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
1099 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
1100 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
1101 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
1102 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
1103 );
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
1104 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
1105 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
1106 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
1107 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
1108 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
1109 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
1110 );
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
1111 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
1112 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
1113 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
1114 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
1115 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
1116 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
1117 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
1118 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
1119 );
3c01bef43a98 Querprofile: Added a table to map the points to a given km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1202
diff changeset
1120 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
1121
1202
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
1122 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
1123
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
1124 * 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
1125 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
1126 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
1127 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
1128 human readable.
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
1129
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
1130 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
1131
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
1132 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
1133 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
1134
44581b40b968 Schema: Added description column to the cross section table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1201
diff changeset
1135 * 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
1136 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
1137
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
1138 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
1139
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
1140 * 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
1141 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
1142 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
1143
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
1144 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
1145
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
1146 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
1147
1200
7c88650ff548 PRFParser: Added a callback to be called from parsePRFs() if
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1199
diff changeset
1148 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
1149
7c88650ff548 PRFParser: Added a callback to be called from parsePRFs() if
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1199
diff changeset
1150 * 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
1151 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
1152 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
1153 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
1154
1199
cc8f770796cb PRFParser: Extract the year of sounding and description from file names.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1198
diff changeset
1155 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
1156
cc8f770796cb PRFParser: Extract the year of sounding and description from file names.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1198
diff changeset
1157 * 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
1158 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
1159 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
1160 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
1161
1198
661a9304f2f5 PRFParser: Extracted the data. All BfG PRFs are parsed correctly, now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1197
diff changeset
1162 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
1163
661a9304f2f5 PRFParser: Extracted the data. All BfG PRFs are parsed correctly, now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1197
diff changeset
1164 * 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
1165 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
1166
1197
ce3dacc6ea92 PRFParser: extract km from lines. TODO: extract data.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1196
diff changeset
1167 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
1168
ce3dacc6ea92 PRFParser: extract km from lines. TODO: extract data.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1196
diff changeset
1169 * 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
1170 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
1171
1196
46127af605ba Added parser for PRF files. TODO: Extract data and km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1195
diff changeset
1172 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
1173
46127af605ba Added parser for PRF files. TODO: Extract data and km.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1195
diff changeset
1174 * 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
1175 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
1176
1195
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1177 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
1178
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1179 * 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
1180 Not needed (braindead).
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1181
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1182 * 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
1183 Directly store the x/y values now.
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1184
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1185 * 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
1186 Removed registration of Point3d.
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1187
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1188 To update existing databases:
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1189
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1190 BEGIN;
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1191 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
1192 DROP SEQUENCE POINTS3D_ID_SEQ;
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1193 DROP TABLE points3d;
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1194 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
1195 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
1196 ALTER TABLE cross_section_points ADD CONSTRAINT
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1197 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
1198 COMMIT;
2b4de678e29a Removed braindead points3d table
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1194
diff changeset
1199
1194
491892931761 Added Hibernate models for cross-sections and their points.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1193
diff changeset
1200 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
1201
491892931761 Added Hibernate models for cross-sections and their points.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1193
diff changeset
1202 * 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
1203 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
1204 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
1205
491892931761 Added Hibernate models for cross-sections and their points.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1193
diff changeset
1206 * 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
1207 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
1208
1193
1e3979e07b9e Added hibernate point3d model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1192
diff changeset
1209 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
1210
1e3979e07b9e Added hibernate point3d model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1192
diff changeset
1211 * 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
1212 * 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
1213 Registered point3d model.
1e3979e07b9e Added hibernate point3d model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1192
diff changeset
1214
1192
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1215 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
1216
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1217 * 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
1218 To update existing databases:
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1219 BEGIN;
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1220
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1221 CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ;
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1222 CREATE TABLE cross_sections (
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1223 id int PRIMARY KEY NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1224 km NUMERIC NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1225 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
1226 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
1227 UNIQUE (km, river_id)
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1228 );
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1229
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1230 CREATE SEQUENCE POINTS3D_ID_SEQ;
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1231 CREATE TABLE points3d (
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1232 id int PRIMARY KEY NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1233 x NUMERIC NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1234 y NUMERIC NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1235 z NUMERIC NOT NULL
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1236 );
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1237
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1238 CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ;
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1239 CREATE TABLE cross_section_points (
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1240 id int PRIMARY KEY NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1241 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
1242 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
1243 col_pos int NOT NULL,
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1244 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
1245 UNIQUE (cross_section_id, col_pos)
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1246 );
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1247
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1248 COMMIT;
5f8444df19e4 Add relations for cross sections.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 1191
diff changeset
1249
1191
1557cccb88f6 Tagged RELEASE 2.4 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 772
diff changeset
1250 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
1251
1557cccb88f6 Tagged RELEASE 2.4 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 772
diff changeset
1252 Tagged RELEASE 2.4
1557cccb88f6 Tagged RELEASE 2.4 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 772
diff changeset
1253
772
c523266c3399 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 771
diff changeset
1254 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
1255
c523266c3399 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 771
diff changeset
1256 * Changes: Prepared changes for the upcoming release.
c523266c3399 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 771
diff changeset
1257
771
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
1258 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
1259
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
1260 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java,
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
1261 src/main/java/de/intevation/flys/importer/AnnotationClassifier.java,
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
1262 src/main/java/de/intevation/flys/importer/AtFileParser.java,
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
1263 src/main/java/de/intevation/flys/importer/ValueKey.java,
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
1264 src/main/java/de/intevation/flys/importer/WstParser.java:
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
1265 Removed trailing whitespace.
6dc847194625 Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 770
diff changeset
1266
770
33a79496ba9e Removed superfluous imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 769
diff changeset
1267 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
1268
33a79496ba9e Removed superfluous imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 769
diff changeset
1269 * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java:
33a79496ba9e Removed superfluous imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 769
diff changeset
1270 Removed superfluous imports.
33a79496ba9e Removed superfluous imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 769
diff changeset
1271
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
1272 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
1273
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
1274 * 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
1275 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
1276 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
1277 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
1278
768
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 767
diff changeset
1279 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de>
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 767
diff changeset
1280
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 767
diff changeset
1281 * src/main/java/de/intevation/flys/model/River.java: When
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 767
diff changeset
1282 looking up a gauge by km containment use precision of 1e-6.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 767
diff changeset
1283
767
5572d051347e River: Added method to find gauge by its name.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 766
diff changeset
1284 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
1285
5572d051347e River: Added method to find gauge by its name.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 766
diff changeset
1286 * 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
1287 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
1288
766
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
1289 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
1290
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
1291 * 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
1292
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
1293 * 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
1294 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
1295 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
1296 Call the right constructors now.
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
1297
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
1298 * 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
1299 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
1300
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
1301 * 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
1302 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
1303
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
1304 * 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
1305 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
1306 correctly.
aa9e3da95c31 Importer: Fix import of annotation type classification.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 765
diff changeset
1307
765
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1308 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
1309
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1310 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
1311
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1312 * 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
1313 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
1314
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1315 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
1316 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
1317 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
1318 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
1319
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1320 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
1321
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1322 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
1323 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
1324 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
1325 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
1326 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
1327 as the default type.
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1328
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1329 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
1330 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
1331 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
1332 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
1333 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
1334 the file default see 1.
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1335
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1336 * 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
1337 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
1338 the system property
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1339
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1340 'flys.backend.importer.annotation.types'
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1341
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1342 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
1343 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
1344 is done.
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1345
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1346 * 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
1347 New. Implements the classification.
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1348
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1349 * 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
1350 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
1351 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
1352 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
1353
763c4137d6e1 Added classification of annotation types. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 764
diff changeset
1354 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
1355
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
1356 * 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
1357 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
1358
763
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1359 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
1360
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1361 First part of flys/issue18
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1362
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1363 * 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
1364 To update existing databases:
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1365 BEGIN;
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1366 CREATE SEQUENCE ANNOTATION_TYPES_ID_SEQ;
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1367 CREATE TABLE annotation_types (
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1368 id int PRIMARY KEY NOT NULL,
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1369 name VARCHAR(256) NOT NULL UNIQUE
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1370 );
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1371 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
1372 COMMIT;
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1373
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1374 * 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
1375
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1376 * 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
1377 New. Hibernate model to access the type.
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1378
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1379 * 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
1380 Register the new backend type.
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1381
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1382 * 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
1383 References the annotation type.
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1384
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1385 * 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
1386 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
1387
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1388 * 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
1389 Uses the import type.
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1390
8076f6a689d0 First part of flys/issue18
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 762
diff changeset
1391 * 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
1392 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
1393
762
23fe9ac1c3b4 Fix for flys/issue110: Start index was shifted by one.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 761
diff changeset
1394 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
1395
23fe9ac1c3b4 Fix for flys/issue110: Start index was shifted by one.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 761
diff changeset
1396 * 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
1397 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
1398
761
3170fe2e7661 Forgot to store reference to edge.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 760
diff changeset
1399 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
1400
3170fe2e7661 Forgot to store reference to edge.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 760
diff changeset
1401 * 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
1402 Forgot to store reference to edge.
3170fe2e7661 Forgot to store reference to edge.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 760
diff changeset
1403
760
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
1404 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
1405
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
1406 * 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
1407 Register backend model.
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
1408
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
1409 * 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
1410 for importing the edges.
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
1411
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
1412 * 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
1413 Parses the edges of an annotation, too.
c8a2fbc612be Register the backend model.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 758
diff changeset
1414
758
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1415 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
1416
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1417 * 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
1418 To update existing databases:
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1419 BEGIN;
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1420 CREATE SEQUENCE EDGES_ID_SEQ;
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1421 CREATE TABLE edges (
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1422 id int PRIMARY KEY NOT NULL,
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1423 top NUMERIC,
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1424 bottom NUMERIC);
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1425 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
1426 COMMIT;
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1427
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1428 * 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
1429 * 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
1430 edges.
bf16268629d9 Added 'Kanten' model
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 757
diff changeset
1431
757
c19d4c643526 River: add method to find gauge by its station position.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 756
diff changeset
1432 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
1433
c19d4c643526 River: add method to find gauge by its station position.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 756
diff changeset
1434 * 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
1435 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
1436
756
ca13926b8871 River: Make search for gauges independent of from/to order.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 755
diff changeset
1437 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
1438
ca13926b8871 River: Make search for gauges independent of from/to order.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 755
diff changeset
1439 * 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
1440 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
1441
755
a29fd0916803 Added a new view to select qs of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 754
diff changeset
1442 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
1443
a29fd0916803 Added a new view to select qs of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 754
diff changeset
1444 * 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
1445 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
1446
a29fd0916803 Added a new view to select qs of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 754
diff changeset
1447 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
1448 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
1449 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
1450 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
1451 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
1452 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
1453 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
1454 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
1455 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
1456 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
1457 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
1458
754
5bcf338eadb9 Added a new view to select ws of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 753
diff changeset
1459 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
1460
5bcf338eadb9 Added a new view to select ws of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 753
diff changeset
1461 * 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
1462 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
1463
5bcf338eadb9 Added a new view to select ws of a WST.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 753
diff changeset
1464 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
1465 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
1466 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
1467 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
1468 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
1469 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
1470 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
1471 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
1472 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
1473
753
677a6fceea6e flys/issue76: Close gaps between q ranges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 752
diff changeset
1474 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
1475
677a6fceea6e flys/issue76: Close gaps between q ranges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 752
diff changeset
1476 flys/issue76
677a6fceea6e flys/issue76: Close gaps between q ranges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 752
diff changeset
1477
677a6fceea6e flys/issue76: Close gaps between q ranges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 752
diff changeset
1478 * 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
1479 Close gaps between q ranges.
677a6fceea6e flys/issue76: Close gaps between q ranges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 752
diff changeset
1480
752
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
1481 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
1482
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
1483 Tagged RELEASE 2.3.1
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
1484
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
1485 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
1486
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
1487 Tagged RELEASE 2.3
06e8d0b8fad9 Tagged release 2.3.1 of flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 506
diff changeset
1488
506
e451b08343d3 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 505
diff changeset
1489 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
1490
e451b08343d3 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 505
diff changeset
1491 * 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
1492 the version numbers of this software.
e451b08343d3 Prepared Changes for the upcoming release.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 505
diff changeset
1493
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
1494 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
1495
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
1496 * 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
1497 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
1498 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
1499
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
1500 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
1501
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
1502 * 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
1503 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
1504
504
ee693b8fbb55 Fixed flys/issue11 and flys51.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 503
diff changeset
1505 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
1506
ee693b8fbb55 Fixed flys/issue11 and flys51.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 503
diff changeset
1507 * 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
1508 Fixed flys/issue11 and flys51.
ee693b8fbb55 Fixed flys/issue11 and flys51.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 503
diff changeset
1509
503
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
1510 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
1511
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
1512 * 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
1513 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
1514 numerical problems.
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
1515
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
1516 * 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
1517 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
1518
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
1519 * 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
1520 Use unsharp lookup.
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
1521
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
1522 * 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
1523 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
1524 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
1525 problems?!
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 502
diff changeset
1526
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
1527 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
1528
c6889097f81f Importer: Fix silly bug and set Hibernate session flushing back to auto.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 501
diff changeset
1529 * 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
1530 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
1531 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
1532
501
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
1533 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
1534
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
1535 * 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
1536 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
1537 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
1538 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
1539 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
1540
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
1541 * 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
1542 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
1543 column values.
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
1544
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
1545 * 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
1546 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
1547
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 500
diff changeset
1548 * 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
1549 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
1550
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
1551 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
1552
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
1553 * 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
1554 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
1555 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
1556 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
1557
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
1558 * 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
1559 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
1560 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
1561
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
1562 * 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
1563 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
1564
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
1565 * 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
1566 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
1567
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
1568 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
1569
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
1570 * 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
1571 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
1572 '-' 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
1573 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
1574 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
1575
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
1576 * 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
1577 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
1578 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
1579
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
1580 * 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
1581 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
1582 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
1583 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
1584 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
1585 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
1586
498
8ab04de0b879 Importer: Cache the discharge table values, too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 497
diff changeset
1587 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
1588
8ab04de0b879 Importer: Cache the discharge table values, too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 497
diff changeset
1589 * 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
1590 * 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
1591 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
1592
8ab04de0b879 Importer: Cache the discharge table values, too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 497
diff changeset
1593 * 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
1594 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
1595
8ab04de0b879 Importer: Cache the discharge table values, too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 497
diff changeset
1596 * 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
1597 Use the global cache.
8ab04de0b879 Importer: Cache the discharge table values, too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 497
diff changeset
1598
497
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1599 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
1600
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1601 * src/main/java/de/intevation/flys/importer/ImporterSession.java:
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1602 New. Centralized caching in the thread local context. Importing
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1603 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
1604 WST files where loaded separately for every file.
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1605
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1606 * src/main/java/de/intevation/flys/importer/ImportPosition.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1607 src/main/java/de/intevation/flys/importer/Importer.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1608 src/main/java/de/intevation/flys/importer/ImportAnnotation.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1609 src/main/java/de/intevation/flys/importer/ImportWstQRange.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1610 src/main/java/de/intevation/flys/importer/ImportWst.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1611 src/main/java/de/intevation/flys/importer/ImportMainValue.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1612 src/main/java/de/intevation/flys/importer/ImportMainValueType.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1613 src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1614 src/main/java/de/intevation/flys/importer/ImportRiver.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1615 src/main/java/de/intevation/flys/importer/ImportGauge.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1616 src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1617 src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1618 src/main/java/de/intevation/flys/importer/ImportWstColumn.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1619 src/main/java/de/intevation/flys/importer/ImportRange.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1620 src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1621 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1622 src/main/java/de/intevation/flys/importer/ImportAttribute.java,
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1623 src/main/java/de/intevation/flys/importer/ImportTimeInterval.java:
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1624 Adjusted to use the new global context.
67fd63e4ef66 Importer: centralized caching
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 496
diff changeset
1625
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
1626 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
1627
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
1628 * 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
1629 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
1630 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
1631
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
1632 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
1633 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
1634 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
1635 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
1636
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
1637 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
1638
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
1639 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
1640
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
1641 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
1642
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
1643 * 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
1644 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
1645 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
1646
493
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1647 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
1648
494
88d5b02ff0c1 Importer: Import the "HW-Schutzanlagen", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 493
diff changeset
1649 * 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
1650 Import the "HW-Schutzanlagen", too.
88d5b02ff0c1 Importer: Import the "HW-Schutzanlagen", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 493
diff changeset
1651
88d5b02ff0c1 Importer: Import the "HW-Schutzanlagen", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 493
diff changeset
1652 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
1653
88d5b02ff0c1 Importer: Import the "HW-Schutzanlagen", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 493
diff changeset
1654 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
1655
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1656 * 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
1657
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1658 !!! 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
1659
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1660 * 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
1661 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
1662 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
1663
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1664 * 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
1665 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
1666
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1667 * 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
1668 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
1669 with "Histor.Abflusstafeln".
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1670
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1671 * 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
1672 Fixed silly programming error.
b35c5dc0f8b7 Importer: Make import of historical discharge tables work.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 492
diff changeset
1673
492
14de9246b356 Importer: parse historical discharge tables, too. TODO: store them in database.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 491
diff changeset
1674 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
1675
14de9246b356 Importer: parse historical discharge tables, too. TODO: store them in database.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 491
diff changeset
1676 * 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
1677 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
1678
14de9246b356 Importer: parse historical discharge tables, too. TODO: store them in database.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 491
diff changeset
1679 * 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
1680 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
1681 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
1682
14de9246b356 Importer: parse historical discharge tables, too. TODO: store them in database.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 491
diff changeset
1683 * 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
1684 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
1685 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
1686
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
1687 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
1688
738140fe56fe Importer: Prefix "Zusätzliche Längsschnitte" with "Zus.Längsschnitte" in description.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 490
diff changeset
1689 * 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
1690 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
1691 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
1692
490
13af9318a4a2 Import "Hochwasser-Marken", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 489
diff changeset
1693 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
1694
13af9318a4a2 Import "Hochwasser-Marken", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 489
diff changeset
1695 * 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
1696 Import 'Hochwasser-Marken', too.
13af9318a4a2 Import "Hochwasser-Marken", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 489
diff changeset
1697
13af9318a4a2 Import "Hochwasser-Marken", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 489
diff changeset
1698 * 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
1699 Removed superfluous import.
13af9318a4a2 Import "Hochwasser-Marken", too.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 489
diff changeset
1700
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
1701 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
1702
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
1703 * 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
1704 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
1705 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
1706
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
1707 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
1708
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
1709 * 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
1710 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
1711 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
1712
487
cf513cbe88c3 Importer: forgot to fetch time interval peer
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 486
diff changeset
1713 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
1714
cf513cbe88c3 Importer: forgot to fetch time interval peer
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 486
diff changeset
1715 * 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
1716 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
1717
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
1718 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
1719
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
1720 * 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
1721 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
1722
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
1723 * 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
1724 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
1725
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
1726 * 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
1727 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
1728
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
1729 * 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
1730 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
1731 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
1732
485
6b231041dc18 Importer: Try to extract time ranges from at files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 484
diff changeset
1733 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
1734
6b231041dc18 Importer: Try to extract time ranges from at files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 484
diff changeset
1735 * 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
1736 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
1737
484
a9e9a8a44d19 Parse and store "amtliche Linien" wst files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 483
diff changeset
1738 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
1739
a9e9a8a44d19 Parse and store "amtliche Linien" wst files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 483
diff changeset
1740 * 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
1741 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
1742
483
f1fd9cab6a07 Importer: parse and store fixation wst files as well
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 482
diff changeset
1743 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
1744
f1fd9cab6a07 Importer: parse and store fixation wst files as well
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 482
diff changeset
1745 * 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
1746 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
1747
482
3a99d0295006 Importer: Support parsing "zusaetzliche Laengsschnitte".
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 481
diff changeset
1748 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
1749
3a99d0295006 Importer: Support parsing "zusaetzliche Laengsschnitte".
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 481
diff changeset
1750 * 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
1751 Parse the "zusaetzliche Laengsschnitte", too.
3a99d0295006 Importer: Support parsing "zusaetzliche Laengsschnitte".
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 481
diff changeset
1752
3a99d0295006 Importer: Support parsing "zusaetzliche Laengsschnitte".
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 481
diff changeset
1753 * 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
1754 Add getter/setter for column 'kind'.
3a99d0295006 Importer: Support parsing "zusaetzliche Laengsschnitte".
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 481
diff changeset
1755
481
73052199f9f6 Fixed flys/issue19
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 480
diff changeset
1756 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
1757
73052199f9f6 Fixed flys/issue19
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 480
diff changeset
1758 * src/main/java/de/intevation/flys/importer/WstParser.java:
73052199f9f6 Fixed flys/issue19
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 480
diff changeset
1759 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
1760
480
46bb2b9e0bdc Introduced a 'scale' parameter in Gauge.determineMinMaxW().
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 479
diff changeset
1761 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
1762
46bb2b9e0bdc Introduced a 'scale' parameter in Gauge.determineMinMaxW().
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 479
diff changeset
1763 * 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
1764 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
1765
479
f9653fc8ef7b Removed superfluous import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 478
diff changeset
1766 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
1767
f9653fc8ef7b Removed superfluous import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 478
diff changeset
1768 * src/main/java/de/intevation/flys/importer/WstParser.java:
f9653fc8ef7b Removed superfluous import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 478
diff changeset
1769 Removed superfluous import.
f9653fc8ef7b Removed superfluous import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 478
diff changeset
1770
478
db430bd9e0e0 Implemented a WstColumnValue cache to speed up inserting WST files into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 477
diff changeset
1771 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
1772
db430bd9e0e0 Implemented a WstColumnValue cache to speed up inserting WST files into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 477
diff changeset
1773 * 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
1774 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
1775 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
1776
db430bd9e0e0 Implemented a WstColumnValue cache to speed up inserting WST files into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 477
diff changeset
1777 * 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
1778 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
1779 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
1780
db430bd9e0e0 Implemented a WstColumnValue cache to speed up inserting WST files into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 477
diff changeset
1781 * 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
1782 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
1783 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
1784
db430bd9e0e0 Implemented a WstColumnValue cache to speed up inserting WST files into database.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 477
diff changeset
1785 * 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
1786 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
1787 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
1788 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
1789 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
1790
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
1791 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
1792
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
1793 * 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
1794 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
1795 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
1796
477
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1797 To update existing databases:
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1798
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1799 BEGIN;
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1800 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
1801 SELECT wcv.position AS position,
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1802 w,
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1803 (SELECT q
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1804 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
1805 JOIN wst_q_ranges wqr
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1806 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
1807 JOIN ranges r
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1808 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
1809 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
1810 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
1811 wc.position AS column_pos,
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1812 w.id AS wst_id
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1813 FROM wst_column_values wcv
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1814 JOIN wst_columns wc
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1815 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
1816 JOIN wsts w
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1817 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
1818 ORDER BY wcv.position ASC,
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1819 wc.position DESC;
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1820 COMMIT;
0addc2663a4d Forgot to add db update to changelog
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 476
diff changeset
1821
475
9aa0eddc5221 Add forgotten one to many relation Wst -> WstColumn.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 474
diff changeset
1822 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
1823
9aa0eddc5221 Add forgotten one to many relation Wst -> WstColumn.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 474
diff changeset
1824 * 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
1825 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
1826
474
5d920695a7f0 Import of q ranges of wst files was totally broken.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 473
diff changeset
1827 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
1828
5d920695a7f0 Import of q ranges of wst files was totally broken.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 473
diff changeset
1829 * 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
1830 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
1831 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
1832 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
1833
473
70de916d3e3a Importer: Forgot kind parameter in peer fetching query.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 472
diff changeset
1834 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
1835
70de916d3e3a Importer: Forgot kind parameter in peer fetching query.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 472
diff changeset
1836 * 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
1837 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
1838
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
1839 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
1840
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
1841 * 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
1842 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
1843 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
1844
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
1845 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
1846
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
1847 * 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
1848 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
1849 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
1850
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
1851 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
1852
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
1853 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
1854 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
1855 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
1856 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
1857 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
1858 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
1859 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
1860
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
1861 * 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
1862 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
1863 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
1864
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
1865 * 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
1866 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
1867 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
1868
470
f4afea9b7537 Forget ',' in schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 469
diff changeset
1869 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
1870
f4afea9b7537 Forget ',' in schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 469
diff changeset
1871 * doc/schema/postgresql.sql: Forget ',' in schema.
f4afea9b7537 Forget ',' in schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 469
diff changeset
1872
469
b5ca22aae092 Fixed index problem when an empty list is returned.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 468
diff changeset
1873 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
1874
b5ca22aae092 Fixed index problem when an empty list is returned.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 468
diff changeset
1875 * 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
1876 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
1877
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
1878 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
1879
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
1880 * 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
1881 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
1882
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
1883 * 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
1884 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
1885
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
1886 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
1887
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
1888 * 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
1889 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
1890 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
1891 '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
1892
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
1893 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
1894 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
1895 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
1896 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
1897 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
1898
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
1899 * 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
1900 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
1901 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
1902 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
1903 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
1904
466
8bd50b41dea6 Moved the SessionHolder from flys-artifacts to flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 465
diff changeset
1905 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
1906
8bd50b41dea6 Moved the SessionHolder from flys-artifacts to flys-backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 465
diff changeset
1907 * 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
1908 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
1909 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
1910
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
1911 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
1912
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
1913 * 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
1914 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
1915
464
d37ccb04ab5d Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 463
diff changeset
1916 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
1917
d37ccb04ab5d Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 463
diff changeset
1918 * src/**/*.java: Removed trailing whitespace.
d37ccb04ab5d Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 463
diff changeset
1919
463
24e356cf9f6c Tagged RELEASE 0.1 of FLYS backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 205
diff changeset
1920 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
1921
24e356cf9f6c Tagged RELEASE 0.1 of FLYS backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 205
diff changeset
1922 Tagged RELEASE 0.1
24e356cf9f6c Tagged RELEASE 0.1 of FLYS backend.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 205
diff changeset
1923
205
697d1faa8217 Forgot to save the last change before commit.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 204
diff changeset
1924 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
1925
697d1faa8217 Forgot to save the last change before commit.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 204
diff changeset
1926 * 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
1927 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
1928
204
764835268e2b Added methods to find out if two ranges intersects.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 203
diff changeset
1929 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
1930
764835268e2b Added methods to find out if two ranges intersects.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 203
diff changeset
1931 * 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
1932 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
1933
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
1934 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
1935
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
1936 * 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
1937 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
1938
202
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1939 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
1940
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1941 Finished import of WSTs.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1942
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1943 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
1944 minutes only for the data of the Saar.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1945 TODO 2: Double precision floating point representations produced
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1946 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
1947 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
1948 only working on freshly initialized data bases.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1949 More consequent working with BigDecimal and some
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1950 rounding may be of help here.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1951
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1952 * 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
1953 Added convinience constructors.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1954
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1955 * 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
1956 Added getPeer() method.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1957
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1958 * 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
1959 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
1960
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1961 * 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
1962 the (km, w) values to the ImportWstColumns.
29a408f80a89 Finished import of WSTs.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 201
diff changeset
1963
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
1964 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
1965
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
1966 * 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
1967 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
1968 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
1969
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
1970 * 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
1971 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
1972 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
1973 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
1974 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
1975 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
1976
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
1977 * 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
1978 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
1979 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
1980 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
1981 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
1982 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
1983 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
1984
200
88048d4f6e4d Add a hack to repair the units in WST files extraction.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 199
diff changeset
1985 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
1986
88048d4f6e4d Add a hack to repair the units in WST files extraction.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 199
diff changeset
1987 * 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
1988 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
1989 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
1990 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
1991
199
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
1992 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
1993
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
1994 * 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
1995 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
1996 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
1997
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
1998 * 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
1999 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
2000 in WST parser.
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
2001
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
2002 * 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
2003 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
2004 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
2005 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
2006
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
2007 * 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
2008 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
2009 Removed needless imports.
ed38839a6b08 Ported over some WST parsing stuff from desktop flys
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 198
diff changeset
2010
198
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
2011 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
2012
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
2013 * 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
2014 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
2015 constructors.
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
2016
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
2017 * 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
2018 parser is used to '*.at' files.
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
2019
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
2020 * 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
2021 import discharge tables.
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
2022
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
2023 * 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
2024 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
2025 Helper models for import discharge tables.
d980e545ccab Added import code for importing discharge tables.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents: 197
diff changeset
2026
197
c0dcc2357106 Added stub for WST parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 196
diff changeset
2027 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
2028
c0dcc2357106 Added stub for WST parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 196
diff changeset
2029 * 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
2030 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
2031 Added stub for WST parser.
c0dcc2357106 Added stub for WST parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 196
diff changeset
2032
196
a33c065b95eb Added importer helper model stubs for WST imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 195
diff changeset
2033 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
2034
a33c065b95eb Added importer helper model stubs for WST imports.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 195
diff changeset
2035 * 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
2036 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
2037 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
2038 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
2039 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
2040 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
2041
195
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
2042 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
2043
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
2044 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
2045
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
2046 * 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
2047 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
2048 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
2049
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
2050 * 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
2051 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
2052 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
2053
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
2054 * 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
2055 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
2056
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
2057 * 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
2058 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
2059
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
2060 * 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
2061 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
2062 schema.
8d3533a03e10 Second part of parsing/storing main values. Should be finished now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 194
diff changeset
2063
194
0f0b98ef9b04 Fixed wrong unique constraint.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 193
diff changeset
2064 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
2065
0f0b98ef9b04 Fixed wrong unique constraint.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 193
diff changeset
2066 * doc/schema/postgresql.sql: Fixed wrong unique constraint.
0f0b98ef9b04 Fixed wrong unique constraint.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 193
diff changeset
2067
0f0b98ef9b04 Fixed wrong unique constraint.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 193
diff changeset
2068 * 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
2069 Added some logging when storing gauges.
0f0b98ef9b04 Fixed wrong unique constraint.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 193
diff changeset
2070
193
31c48d54f09d Add forgotten column river_id in Gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 192
diff changeset
2071 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
2072
31c48d54f09d Add forgotten column river_id in Gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 192
diff changeset
2073 * 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
2074 Add forgotten column river_id.
31c48d54f09d Add forgotten column river_id in Gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 192
diff changeset
2075
31c48d54f09d Add forgotten column river_id in Gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 192
diff changeset
2076 * 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
2077 Small HQL fix.
31c48d54f09d Add forgotten column river_id in Gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 192
diff changeset
2078
192
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
2079 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
2080
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
2081 * 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
2082 Added convinience contructor.
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
2083
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
2084 * 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
2085 Fixed getPeer() method.
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
2086
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
2087 * 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
2088 Fixed parsing of STA files.
f1fce41347ea Added missing ImportGauge.getPeer() method
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 191
diff changeset
2089
191
c4fb5141ce11 Propagate river into storing of gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
2090 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
2091
c4fb5141ce11 Propagate river into storing of gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
2092 * 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
2093 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
2094 Propagate river into storing of gauges.
c4fb5141ce11 Propagate river into storing of gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
2095
c4fb5141ce11 Propagate river into storing of gauges.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
2096 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
2097
d40da430d2fe Added stub code to write gauges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 189
diff changeset
2098 * 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
2099 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
2100
d40da430d2fe Added stub code to write gauges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 189
diff changeset
2101 * 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
2102 Added stub code to write gauges.
d40da430d2fe Added stub code to write gauges
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 189
diff changeset
2103
189
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2104 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
2105
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2106 First part of parsing main values.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2107
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2108 * 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
2109 creation of dummy rivers.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2110
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2111 * 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
2112 Moved to NamedMainValue.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2113
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2114 * 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
2115 New. Formerly NamedMainValues.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2116
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2117 * 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
2118 New. Forgotten part of the model.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2119
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2120 * 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
2121 Data is String not BigDecimal
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2122
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2123 * 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
2124 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
2125
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2126 * 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
2127 Propagate BigDecimal usage.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2128
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2129 * 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
2130 Removed needless import. Added TODO
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2131
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2132 * 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
2133 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
2134
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2135 * 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
2136 New. Parser for STA files.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2137
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2138 * 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
2139 Call STA file parser.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2140
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2141 * 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
2142 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
2143 Uses BigDecimal now.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2144
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2145 * 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
2146 Fixed wrong type cast in equals.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2147
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2148 * 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
2149 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
2150
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2151 * 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
2152 Register forgotten MainValue model.
bc3747a371cc First part of parsing main values.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 188
diff changeset
2153
188
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2154 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
2155
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2156 Store annotations in backend.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2157
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2158 * 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
2159 New convinience constructor.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2160
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2161 * 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
2162 Added toString() method.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2163
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2164 * 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
2165 Fixed nasty mistake in @OneToOne annotatation.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2166 New convinience constructors.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2167
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2168 * 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
2169 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
2170 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
2171 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
2172 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
2173
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2174 * 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
2175 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
2176 * 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
2177 Stored annotations into backend. More eloquent SQL exception
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2178 handling.
003ac16812dd Store annotations in backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 187
diff changeset
2179
187
ecf90018563b Importer: Bound Attributes and Positions to there backend peers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 186
diff changeset
2180 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
2181
ecf90018563b Importer: Bound Attributes and Positions to there backend peers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 186
diff changeset
2182 * 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
2183 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
2184 Added convinience constructors.
ecf90018563b Importer: Bound Attributes and Positions to there backend peers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 186
diff changeset
2185
ecf90018563b Importer: Bound Attributes and Positions to there backend peers.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 186
diff changeset
2186 * 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
2187 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
2188 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
2189
186
cf8cbcb6a10d Added parser to read *.KM files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 185
diff changeset
2190 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
2191
cf8cbcb6a10d Added parser to read *.KM files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 185
diff changeset
2192 * 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
2193 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
2194
cf8cbcb6a10d Added parser to read *.KM files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 185
diff changeset
2195 * 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
2196 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
2197 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
2198 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
2199 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
2200 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
2201 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
2202 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
2203
185
a60edcfe5f53 Added new helper models for import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 184
diff changeset
2204 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
2205
a60edcfe5f53 Added new helper models for import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 184
diff changeset
2206 * 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
2207 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
2208 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
2209 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
2210 New helper models for import.
a60edcfe5f53 Added new helper models for import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 184
diff changeset
2211
a60edcfe5f53 Added new helper models for import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 184
diff changeset
2212 * 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
2213 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
2214 Use new models.
a60edcfe5f53 Added new helper models for import.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 184
diff changeset
2215
184
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
2216 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
2217
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
2218 * 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
2219 New. Parser for PEGEL.GLT files.
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
2220
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
2221 * 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
2222 New. Import model for gauges.
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
2223
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
2224 * 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
2225 Removed needless imports.
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
2226
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
2227 * 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
2228 Added method to parse the gauges.
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
2229
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
2230 * 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
2231 Trigger pegel glt file parsing.
4ab2c3bd474c Added parsing of PEGEL.GLT files.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 183
diff changeset
2232
183
222f4db3430a Importer: Used thread local pattern to make sharing of session easier.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 182
diff changeset
2233 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
2234
222f4db3430a Importer: Used thread local pattern to make sharing of session easier.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 182
diff changeset
2235 * 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
2236 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
2237
182
1c0afb01bc93 Importer: Fixed error in HQL statement.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 181
diff changeset
2238 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
2239
1c0afb01bc93 Importer: Fixed error in HQL statement.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 181
diff changeset
2240 * 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
2241 Fixed error in HQL statement.
1c0afb01bc93 Importer: Fixed error in HQL statement.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 181
diff changeset
2242
181
4d9984411b3f Commented out a debug block because it leaks the db password.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 180
diff changeset
2243 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
2244
4d9984411b3f Commented out a debug block because it leaks the db password.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 180
diff changeset
2245 * 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
2246 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
2247
180
3908bfb2aa43 Store imported rivers into database. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 179
diff changeset
2248 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
2249
3908bfb2aa43 Store imported rivers into database. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 179
diff changeset
2250 * 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
2251 Expose imported rivers.
3908bfb2aa43 Store imported rivers into database. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 179
diff changeset
2252
3908bfb2aa43 Store imported rivers into database. Needs testing!
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 179
diff changeset
2253 * 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
2254 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
2255
179
aaac9c291067 Default connection parameters are now overwritable with system properties.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 178
diff changeset
2256 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
2257
aaac9c291067 Default connection parameters are now overwritable with system properties.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 178
diff changeset
2258 * 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
2259 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
2260 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
2261 - 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
2262 - 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
2263 - 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
2264 - 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
2265 - 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
2266
178
82bc55666a97 Expose the creation of the SessionFactory to the public to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 177
diff changeset
2267 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
2268
82bc55666a97 Expose the creation of the SessionFactory to the public to
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 177
diff changeset
2269 * 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
2270 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
2271 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
2272
177
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
2273 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
2274
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
2275 * 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
2276 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
2277 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
2278 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
2279 un*x platform.
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
2280
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
2281 * 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
2282 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
2283 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
2284 anything. It only loads info gew files.
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
2285
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
2286 * 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
2287 Info gew parser.
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
2288
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
2289 * 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
2290 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
2291 info gew files.
31895d24387e Importer: Added info gew parser.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 176
diff changeset
2292
176
3035d861a576 SessionFactoryProvider for access to the backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 175
diff changeset
2293 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
2294
3035d861a576 SessionFactoryProvider for access to the backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 175
diff changeset
2295 * 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
2296 New. SessionFactoryProvider.getSessionFactory() provides a
3035d861a576 SessionFactoryProvider for access to the backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 175
diff changeset
2297 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
2298
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
2299 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
2300
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
2301 * 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
2302 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
2303
174
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
2304 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
2305
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
2306 * 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
2307 to corresponding factory.
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
2308
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
2309 * 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
2310 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
2311 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
2312 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
2313
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
2314 * 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
2315 of wst columns.
249390dd24e7 Added foreign key constraint annotations to model classes.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 173
diff changeset
2316
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
2317 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
2318
8e2f2ddc507f Fixed wrong spelled column references in foreign keys introduces with last change.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 172
diff changeset
2319 * 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
2320 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
2321 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
2322
172
605320b7df94 Added column annotations for simple fields. TODO: foreign keys.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 171
diff changeset
2323 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
2324
605320b7df94 Added column annotations for simple fields. TODO: foreign keys.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 171
diff changeset
2325 * 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
2326 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
2327
171
4a83e14f40f9 Added entity and id annotations.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 170
diff changeset
2328 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
2329
4a83e14f40f9 Added entity and id annotations.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 170
diff changeset
2330 * 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
2331 Fixed inconsistent table names.
4a83e14f40f9 Added entity and id annotations.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 170
diff changeset
2332
4a83e14f40f9 Added entity and id annotations.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 170
diff changeset
2333 * 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
2334 entity and id annotations.
4a83e14f40f9 Added entity and id annotations.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 170
diff changeset
2335
170
88c14d5d45be Added missing sequences. Deleted unsupported sqlite schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 169
diff changeset
2336 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
2337
88c14d5d45be Added missing sequences. Deleted unsupported sqlite schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 169
diff changeset
2338 * 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
2339 Added missing sequences.
88c14d5d45be Added missing sequences. Deleted unsupported sqlite schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 169
diff changeset
2340
88c14d5d45be Added missing sequences. Deleted unsupported sqlite schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 169
diff changeset
2341 * 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
2342
169
7929f4144d2f Bound Apache Commons DBCP with Hibernate.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 168
diff changeset
2343 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
2344
7929f4144d2f Bound Apache Commons DBCP with Hibernate.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 168
diff changeset
2345 * 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
2346
7929f4144d2f Bound Apache Commons DBCP with Hibernate.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 168
diff changeset
2347 * 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
2348 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
2349
7929f4144d2f Bound Apache Commons DBCP with Hibernate.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 168
diff changeset
2350 * 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
2351 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
2352 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
2353
7929f4144d2f Bound Apache Commons DBCP with Hibernate.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 168
diff changeset
2354 * 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
2355
168
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2356 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
2357
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2358 * 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
2359 for a postgres database.
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2360
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2361 * doc/schema/postgresql.sql: Added squence for
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2362 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
2363
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2364 * 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
2365 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
2366 because its only a toy.
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2367
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2368 * 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
2369 New. Binds Apache Commons to Hibernate.
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2370
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2371 * pom.xml: Added dependencies to log4j, commons dbcp,
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2372 JPA of hibernate.
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2373
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2374 * 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
2375 JPA annotations.
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2376
86a1bd9cc50e More Hibernate/JPA stuff
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 167
diff changeset
2377 * 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
2378 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
2379
167
15d515fe15f5 Added POJOs to be mapped to schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 166
diff changeset
2380 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
2381
15d515fe15f5 Added POJOs to be mapped to schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 166
diff changeset
2382 * 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
2383 smaller issues in ddl.
15d515fe15f5 Added POJOs to be mapped to schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 166
diff changeset
2384
15d515fe15f5 Added POJOs to be mapped to schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 166
diff changeset
2385 * 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
2386 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
2387
15d515fe15f5 Added POJOs to be mapped to schema.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 166
diff changeset
2388 * 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
2389
166
56eb8f1b42cf Added dependency Hibernate Core 3.6.1 Final
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 165
diff changeset
2390 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
2391
56eb8f1b42cf Added dependency Hibernate Core 3.6.1 Final
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 165
diff changeset
2392 * 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
2393 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
2394
165
a69b8494fcac Created a new empty maven project
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 164
diff changeset
2395 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
2396
a69b8494fcac Created a new empty maven project
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 164
diff changeset
2397 * 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
2398 $ mvn archetype:create \
a69b8494fcac Created a new empty maven project
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 164
diff changeset
2399 -DgroupId=de.intevation.flys \
a69b8494fcac Created a new empty maven project
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 164
diff changeset
2400 -DartifactId=flys-backend
a69b8494fcac Created a new empty maven project
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 164
diff changeset
2401
164
324e12ab7a05 Converted schema to be PostgreSQL compatible.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 163
diff changeset
2402 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
2403
324e12ab7a05 Converted schema to be PostgreSQL compatible.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 163
diff changeset
2404 * README: New. Some setup instructions.
324e12ab7a05 Converted schema to be PostgreSQL compatible.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 163
diff changeset
2405
324e12ab7a05 Converted schema to be PostgreSQL compatible.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 163
diff changeset
2406 * 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
2407
324e12ab7a05 Converted schema to be PostgreSQL compatible.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 163
diff changeset
2408 * 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
2409
163
4a3b2912a0cd Factorized time intervals out into a separated table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 162
diff changeset
2410 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
2411
4a3b2912a0cd Factorized time intervals out into a separated table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 162
diff changeset
2412 * 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
2413 a separated table.
4a3b2912a0cd Factorized time intervals out into a separated table.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 162
diff changeset
2414
162
80669241956c Initial database import scripts. Not finished, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 161
diff changeset
2415 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
2416
80669241956c Initial database import scripts. Not finished, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 161
diff changeset
2417 * 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
2418 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
2419
80669241956c Initial database import scripts. Not finished, yet.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 161
diff changeset
2420 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
2421
119048655872 Initial check in of the FLYS database backend.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
2422 * 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
2423 FLYS database.

http://dive4elements.wald.intevation.org