annotate flys-backend/ChangeLog @ 2798:5a654f2e35bc

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

http://dive4elements.wald.intevation.org