ingo@2824: 2012-04-16 Ingo Weinzierl ingo@2824: ingo@2824: * doc/schema/oracle-minfo.sql, ingo@2824: doc/schema/oracle-drop-minfo.sql: Added new relations for MINFO specific ingo@2824: flow velocity values. ingo@2824: sascha@2823: 2012-02-14 Sascha L. Teichmann sascha@2823: sascha@2823: * doc/schema/oracle-minfo.sql: Fixed column unit_id in table depths sascha@2823: to match type of column id in table units. sascha@2823: sascha@2823: * doc/schema/postgresql-minfo.sql: oracle-minfo.sql for a better DBMS. sascha@2823: ingo@2822: 2012-04-13 Ingo Weinzierl ingo@2822: ingo@2822: * src/main/java/de/intevation/flys/model/MorphologicalWidth.java: Added ingo@2822: annotation for values. ingo@2822: ingo@2822: * src/main/java/de/intevation/flys/importer/ImportMorphWidthValue.java: ingo@2822: Removed debug output in getPeer() and storeDependencies(). ingo@2822: ingo@2821: 2012-04-13 Ingo Weinzierl ingo@2821: ingo@2821: * src/main/java/de/intevation/flys/importer/parsers/MorphologicalWidthParser.java: ingo@2821: New parser for morphological widths files. ingo@2821: ingo@2821: * src/main/java/de/intevation/flys/importer/ImportMorphWidth.java: Throw ingo@2821: constraint violation exceptions. ingo@2821: ingo@2821: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Parse and ingo@2821: store morphological widths. ingo@2821: ingo@2820: 2012-04-13 Ingo Weinzierl ingo@2820: ingo@2820: * src/main/java/de/intevation/flys/importer/Config.java: Added a config ingo@2820: option to skip parsing morphological widths: ingo@2820: ingo@2820: -Dflys.backend.importer.skip.morphological.width=true ingo@2820: ingo@2819: 2012-04-13 Ingo Weinzierl ingo@2819: ingo@2819: * doc/schema/oracle-minfo.sql: Added a description field to morphological ingo@2819: width values. ingo@2819: ingo@2819: * src/main/java/de/intevation/flys/model/MorphologicalWidthValue.java: ingo@2819: Added new instance variable for descriptions. ingo@2819: ingo@2819: * src/main/java/de/intevation/flys/importer/ImportMorphWidthValue.java, ingo@2819: src/main/java/de/intevation/flys/importer/ImportMorphWidth.java: New ingo@2819: temp classes used to store morphological width values during the import. ingo@2819: ingo@2818: 2012-04-13 Ingo Weinzierl ingo@2818: ingo@2818: * doc/schema/oracle-minfo.sql, ingo@2818: doc/schema/oracle-drop-minfo.sql: Added new relations for MINFO specific ingo@2818: morphological width. ingo@2818: ingo@2818: * src/main/java/de/intevation/flys/model/MorphologicalWidth.java, ingo@2818: src/main/java/de/intevation/flys/model/MorphologicalWidthValue.java: New ingo@2818: model classes for morphological width. ingo@2818: ingo@2818: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2818: Registered new model classes. ingo@2818: ingo@2817: 2012-04-13 Ingo Weinzierl ingo@2817: ingo@2817: * doc/schema/oracle-minfo.sql: Added a description field to table ingo@2817: sediment_density. ingo@2817: ingo@2817: * src/main/java/de/intevation/flys/model/SedimentDensityValue.java, ingo@2817: src/main/java/de/intevation/flys/model/SedimentDensity.java: Some ingo@2817: modifications based on the changes of the schema adaption in last commit. ingo@2817: ingo@2817: * src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java: ingo@2817: Override parse() of parent class to get the filename. ingo@2817: ingo@2817: * src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java, ingo@2817: src/main/java/de/intevation/flys/importer/ImportDepth.java, ingo@2817: src/main/java/de/intevation/flys/importer/ImportSedimentDensityValue.java: ingo@2817: Implemented the methods storeDependencies() and getPeer() to save new ingo@2817: instances into database. ingo@2817: ingo@2817: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Save all ingo@2817: ImportSedimentDensity objects to database. ingo@2817: ingo@2817: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2817: Registered the new model classes. ingo@2817: ingo@2816: 2012-04-13 Ingo Weinzierl ingo@2816: ingo@2816: * doc/schema/oracle-minfo.sql, ingo@2816: doc/schema/oracle-drop-minfo.sql: Modified the db schema specific to ingo@2816: MINFO; replaced some columns. ingo@2816: ingo@2816: * src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java: ingo@2816: Implemented the method stubs: parse meta data and data values. ingo@2816: ingo@2816: * src/main/java/de/intevation/flys/importer/ImportSedimentDensityValue.java, ingo@2816: src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java: ingo@2816: Added and replaced some instance variables because the db schema has ingo@2816: changed. ingo@2816: ingo@2815: 2012-04-13 Ingo Weinzierl ingo@2815: ingo@2815: * src/main/java/de/intevation/flys/importer/parsers/LineParser.java: New. ingo@2815: An abstract parser that might be used to read a file and handle each ingo@2815: line contained in the file seperatly. ingo@2815: ingo@2815: * src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java: ingo@2815: New. Subclasses LineParser. It is able to parse MINFO specific sediment ingo@2815: density files. NOTE: currently just a stub. ingo@2815: ingo@2815: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Prepared to ingo@2815: read MINFO specific sediment density files. ingo@2815: ingo@2814: 2012-04-13 Ingo Weinzierl ingo@2814: ingo@2814: * src/main/java/de/intevation/flys/importer/Config.java: Added a new ingo@2814: config option to skip parsing MINFO sediment density values: ingo@2814: ingo@2814: -Dflys.backend.importer.skip.sediment.density=true ingo@2814: ingo@2813: 2012-04-13 Ingo Weinzierl ingo@2813: ingo@2813: * src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java, ingo@2813: src/main/java/de/intevation/flys/importer/ImportSedimentDensityValue.java, ingo@2813: src/main/java/de/intevation/flys/importer/ImportDepth.java: New importer ingo@2813: classes used during MINFO sediment density import. ingo@2813: ingo@2812: 2012-04-13 Ingo Weinzierl ingo@2812: ingo@2812: * doc/schema/oracle-minfo.sql, ingo@2812: doc/schema/oracle-drop-minfo.sql: Improved the MINFO schema to store ingo@2812: sediment density values specific to a river and depth. ingo@2812: ingo@2812: * src/main/java/de/intevation/flys/model/SedimentDensityValue.java, ingo@2812: src/main/java/de/intevation/flys/model/SedimentDensity.java, ingo@2812: src/main/java/de/intevation/flys/model/Depth.java: New model classes ingo@2812: used to store sediment density values specific to a river and depth. ingo@2812: ingo@2811: 2012-04-13 Ingo Weinzierl ingo@2811: ingo@2811: * src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java: ingo@2811: New. An abstract super class for BedHeightSingleParser and ingo@2811: BedHeightEpochParser. It implements methods for parsing meta data. ingo@2811: Concrete subclasses need to implements the method for parsing data rows ingo@2811: only. ingo@2811: ingo@2811: * src/main/java/de/intevation/flys/importer/ImportBedHeight.java, ingo@2811: src/main/java/de/intevation/flys/importer/ImportBedHeightValue.java: New. ingo@2811: Interfaces that define some major methods which enables the BedHeightParser ingo@2811: to parse both - single and epoch bed heights. ingo@2811: ingo@2811: * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: ingo@2811: Moved the code for parsing meta data to BedHeightParser which is now the ingo@2811: parent class. ingo@2811: ingo@2811: * src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java: ingo@2811: New. A further subclass of BedHeightParser for parsing MINFO bed heights ingo@2811: for epochs. ingo@2811: ingo@2811: * src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java, ingo@2811: src/main/java/de/intevation/flys/importer/ImportBedHeightEpochValue.java: ingo@2811: Made them subclasses of ImportBedHeightValue. ingo@2811: ingo@2811: * src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, ingo@2811: src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java: Made ingo@2811: them subclasses of ImportBedHeight. ingo@2811: ingo@2811: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Some ingo@2811: adjustments to store ImportBedHeight and ImportBedHeightValue instances ingo@2811: instead of concrete subclasses. ingo@2811: ingo@2810: 2012-04-12 Ingo Weinzierl ingo@2810: ingo@2810: * doc/schema/oracle-minfo.sql: Added a link to the river to bed_height_epoch ingo@2810: table. ingo@2810: ingo@2810: * src/main/java/de/intevation/flys/model/BedHeightEpochValue.java, ingo@2810: src/main/java/de/intevation/flys/model/BedHeightEpoch.java: New model ingo@2810: classes for MINFO bed height epochs. ingo@2810: ingo@2810: * src/main/java/de/intevation/flys/importer/Config.java: Splitted up the ingo@2810: config option to skip parsing bed heights. Now, we are able to skip single ingo@2810: and epoch bed heights using the following options: ingo@2810: ingo@2810: -Dflys.backend.importer.skip.bed.height.single=true (skip singles) ingo@2810: -Dflys.backend.importer.skip.bed.height.epoch=true (skip epochs) ingo@2810: ingo@2810: * src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java, ingo@2810: src/main/java/de/intevation/flys/importer/ImportBedHeightEpochValue.java, ingo@2810: src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented ingo@2810: the whole stuff to parse those data. ingo@2810: ingo@2810: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2810: Registered the new model classes. ingo@2810: ingo@2809: 2012-04-12 Ingo Weinzierl ingo@2809: ingo@2809: * doc/schema/oracle-minfo.sql, ingo@2809: doc/schema/oracle-drop-minfo.sql: Schema adaptions specific to MINFO bed ingo@2809: heights. ingo@2809: ingo@2809: * src/main/java/de/intevation/flys/model/BedHeightSingleValue.java, ingo@2809: src/main/java/de/intevation/flys/model/BedHeightType.java, ingo@2809: src/main/java/de/intevation/flys/model/ElevationModel.java, ingo@2809: src/main/java/de/intevation/flys/model/LocationSystem.java, ingo@2809: src/main/java/de/intevation/flys/model/BedHeightSingle.java: New model ingo@2809: classes for MINFO bed heights. ingo@2809: ingo@2809: * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: ingo@2809: Some logging adjustments and a little bugfix: add BedHeightSingle objects ingo@2809: after they were parsed; otherwise they are not saved to database. ingo@2809: ingo@2809: * src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java, ingo@2809: src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, ingo@2809: src/main/java/de/intevation/flys/importer/ImportElevationModel.java, ingo@2809: src/main/java/de/intevation/flys/importer/ImportLocationSystem.java, ingo@2809: src/main/java/de/intevation/flys/importer/ImportBedHeightType.java, ingo@2809: src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented ingo@2809: storeDependencies() and getPeer(). ingo@2809: ingo@2809: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2809: Registered model classes. ingo@2809: ingo@2808: 2012-04-11 Ingo Weinzierl ingo@2808: ingo@2808: * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: ingo@2808: Finished work on parsing meta information and data specific to single bed ingo@2808: heights. ingo@2808: ingo@2808: * src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java, ingo@2808: src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, ingo@2808: src/main/java/de/intevation/flys/importer/ImportElevationModel.java, ingo@2808: src/main/java/de/intevation/flys/importer/ImportLocationSystem.java, ingo@2808: src/main/java/de/intevation/flys/importer/ImportBedHeightType.java: Some ingo@2808: new and modified temp storages used during MINFO import. ingo@2808: ingo@2807: 2012-04-11 Ingo Weinzierl ingo@2807: ingo@2807: * doc/schema/oracle-minfo.sql, ingo@2807: doc/schema/oracle-drop-minfo.sql: Some schema adaptions specific to bed ingo@2807: heights in MINFO. ingo@2807: ingo@2806: 2012-04-11 Ingo Weinzierl ingo@2806: ingo@2806: * src/main/java/de/intevation/flys/importer/Config.java: Added new command ingo@2806: line option to skip parsing bed heights (german "Sohlhoehen"). ingo@2806: Set "-Dflys.backend.importer.skip.bed.height=true" to skip parsing this ingo@2806: file type. ingo@2806: ingo@2806: * src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java, ingo@2806: src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: ingo@2806: Initial checkin of parsers for bed heights (single and epoch). ingo@2806: ingo@2806: * src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, ingo@2806: src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java: Temp ingo@2806: storage for bed heights data used during the import. ingo@2806: ingo@2806: * src/main/java/de/intevation/flys/importer/Importer.java: Added an INFO ingo@2806: statement that signals the start of parsing rivers. ingo@2806: ingo@2806: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Collect and ingo@2806: trigger parsing of bed heights files (placed in 'Morphologie/Sohlhoehen'). ingo@2806: ingo@2805: 2012-04-11 Ingo Weinzierl ingo@2805: ingo@2805: * doc/schema/oracle-minfo.sql, ingo@2805: doc/schema/oracle-drop-minfo.sql: MINFO specific DB schema and sql statements ingo@2805: to drop MINFO specific stuff. ingo@2805: ingo@2804: 2012-03-29 Ingo Weinzierl ingo@2804: ingo@2804: * src/main/java/de/intevation/flys/importer/Config.java: Added a config ingo@2804: option "flys.backend.importer.infogew.file" to set the path of an ingo@2804: INFO.gew file. ingo@2804: ingo@2804: * src/main/java/de/intevation/flys/importer/Importer.java: Read the path ingo@2804: to the INFO.gew from the new config option and try to parse it. ingo@2804: ingo@2803: 2012-03-19 Ingo Weinzierl ingo@2803: ingo@2803: * doc/schema/oracle-spatial.sql: Set the type of 'lower' and 'upper' column ingo@2803: of relation 'dem' to NUMBER(19,5). ingo@2803: ingo@2803: 2012-03-19 Ingo Weinzierl ingo@2802: ingo@2802: * src/main/java/de/intevation/flys/model/Floodmaps.java: Set geometry type ingo@2802: to 'Geometry', because Oracle can save POLYGONS and MULTIPOLYGONS in the ingo@2802: same relation; Hibernate seems unable to load both types. ingo@2802: ingo@2802: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2802: Registered missing Floodmaps. ingo@2802: ingo@2801: 2012-03-16 Ingo Weinzierl ingo@2801: ingo@2801: * Tagged module as 'pre2.7-2012-03-16'. ingo@2801: ingo@2800: 2012-03-16 Ingo Weinzierl ingo@2800: ingo@2800: * doc/schema/oracle-spatial.sql: Repaired broken oracle db schema for ingo@2800: relation 'floodmaps'. ingo@2800: ingo@2799: 2012-03-08 Ingo Weinzierl ingo@2799: ingo@2799: * src/main/java/de/intevation/flys/model/Floodmaps.java: New model class for ingo@2799: 'floodmaps'. ingo@2799: ingo@2799: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2799: Registered the Floodmaps model class. ingo@2799: ingo@2798: 2012-03-07 Ingo Weinzierl ingo@2798: ingo@2798: * contrib/shpimporter/shpimporter.py, ingo@2798: contrib/shpimporter/utils.py, ingo@2798: contrib/shpimporter/uesg.py: A python based tool for importing ingo@2798: shapefiles into a database. This tool is based on python because it ingo@2798: makes use of GDAL OGR to read shapefiles and write features into ingo@2798: database. ingo@2798: ingo@2798: 2012-03-07 Ingo Weinzierl ingo@2797: ingo@2797: * doc/schema/postgresql-spatial.sql: Adapted the PostgreSQL schema for ingo@2797: floodmaps. ingo@2797: ingo@2796: 2012-03-06 Ingo Weinzierl ingo@2796: ingo@2796: * doc/schema/postgresql-spatial.sql, ingo@2796: doc/schema/oracle-spatial.sql: Added new relations for existing ingo@2796: floodmaps (currently tested for PostgreSQL only!). ingo@2796: ingo@2795: 2012-03-06 Ingo Weinzierl ingo@2795: ingo@2795: * src/main/java/de/intevation/flys/model/Wst.java: Adapted method call of ingo@2795: Log4J logger 'warning()' -> 'warn()'. ingo@2795: felix@2794: 2012-03-02 Felix Wolfsteller felix@2794: felix@2794: Fix or workaround flys/issue632 . felix@2794: felix@2794: * src/main/java/de/intevation/flys/model/Wst.java: Avoid NPE when felix@2794: trying to get min/max q values. felix@2794: sascha@2425: 2012-02-14 Sascha L. Teichmann sascha@2425: sascha@2425: * src/main/java/de/intevation/flys/model/DischargeTable.java: sascha@2425: The list of DischargeTableValue is now sorted by Q. sascha@2425: ingo@2385: 2012-02-09 Ingo Weinzierl ingo@2385: ingo@2385: * src/main/java/de/intevation/flys/model/Gauge.java: Added a method ingo@2385: getMasterDischargeTable() to retrieve the discharge table with kind 0. ingo@2385: felix@2384: 2012-02-03 Felix Wolfsteller felix@2384: felix@2384: * src/main/java/de/intevation/flys/model/River.java felix@2384: (getGaugeDatumsKMs,queryGaugeDatumsKMs): renamed to avoid hibernate felix@2384: running into trouble finding db-mapping for type Map for felix@2384: what looks like a 'getter' of GaugeDatumsKMs. felix@2384: felix@2384: 2012-02-03 Sascha L. Teichmann sascha@2383: sascha@2383: * src/main/java/de/intevation/flys/model/River.java(getGaugeDatumsKMs): sascha@2383: New method to build a map of gauge stattion km to sascha@2383: the datums (PNP) of the gauge. Useful look if a km sascha@2383: is a gauge station. sascha@2383: sascha@2382: 2012-01-18 Sascha L. Teichmann sascha@2382: sascha@2382: * src/main/java/de/intevation/flys/model/FastAnnotations.java: sascha@2382: New. Fetches all informations of annotations in one go for sascha@2382: a river. Useful to speed up annotation handling. sascha@2382: ingo@2381: 2012-01-18 Ingo Weinzierl ingo@2381: ingo@2381: * src/main/java/de/intevation/flys/model/Gauge.java: Added a function that ingo@2381: returns a Gauge based on its official number. ingo@2381: sascha@2380: 2012-01-17 Sascha L. Teichmann sascha@2380: sascha@2380: * src/main/java/de/intevation/flys/model/FastCrossSectionLine.java: sascha@2380: New. Cacheable representation of the cross section line. sascha@2380: sascha@2380: * src/main/java/de/intevation/flys/model/CrossSectionLine.java: sascha@2380: Add a new isValid() method. sascha@2380: sascha@2380: * src/main/java/de/intevation/flys/model/CrossSection.java: sascha@2380: Added method getFastLines() to fetch the lines (FastCrossSectionLines) sascha@2380: directly with a single SQL statement and without expensive sascha@2380: intermediate representations. sascha@2380: sascha@2379: 2012-01-16 Sascha L. Teichmann sascha@2379: sascha@2379: * src/main/java/de/intevation/flys/model/CrossSection.java(getLines): sascha@2379: Added method to fetch the lines of a cross section in a given interval. sascha@2379: Useful to have chunked access to the lines. sascha@2379: sascha@2378: 2012-01-16 Sascha L. Teichmann sascha@2378: sascha@2378: * src/main/java/de/intevation/flys/model/CrossSectionLine.java sascha@2378: (fetchCrossSectionLinesPoints): Simplified and prevent reallocations. sascha@2378: sascha@2377: 2012-01-10 Sascha L. Teichmann sascha@2377: sascha@2377: * src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java: sascha@2377: Introduced boolean system property 'flys.backend.sta.parse.gauge.numbers' sascha@2377: default: false. If set the official number is parsed out of sascha@2377: the first line of the STA files. This leads to problems with the sascha@2377: data of the Elbe river. sascha@2377: sascha@2377: * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Removed sascha@2377: superfluous import. sascha@2377: sascha@2376: 2012-01-05 Sascha L. Teichmann sascha@2376: sascha@2376: * doc/schema/postgresql-spatial.sql: Fixed table hws. sascha@2376: ingo@2375: 2012-01-05 Ingo Weinzierl ingo@2375: ingo@2375: * src/main/java/de/intevation/flys/model/RiverAxis.java: The method ingo@2375: getRiverAxis() now returns a list of RiverAxis objects. There is a ingo@2375: modeling problem (see comment in the header of the class) which should ingo@2375: be fixed! ingo@2375: ingo@2375: * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Adapted the ingo@2375: code based on the modified signature in RiverAxis. ingo@2375: ingo@2374: 2012-01-03 Ingo Weinzierl ingo@2374: ingo@2374: * src/main/java/de/intevation/flys/model/Wst.java: Added a method ingo@2374: determineMinMaxQFree() that determines the min/max Qs at a given ingo@2374: kilometer. ingo@2374: sascha@2373: 2012-01-02 Sascha L. Teichmann sascha@2373: sascha@2373: * doc/schema/postgresql.sql: Remove 'NOT NULL' constraint from sascha@2373: gauges.range_id because there are gauges which don't have sascha@2373: a 'Gueltigkeitsbereich' sascha@2373: sascha@2373: To adjust existing PostgreSQL databases use: sascha@2373: sascha@2373: ALTER TABLE gauges ALTER COLUMN range_id DROP NOT NULL; sascha@2373: sascha@2373: * src/main/java/de/intevation/flys/model/River.java: Handle sascha@2373: null references to 'Gueltigkeitsbereiche'. sascha@2373: ingo@2372: 2011-12-28 Ingo Weinzierl ingo@2372: ingo@2372: * src/main/java/de/intevation/flys/model/Wst.java: Added a method ingo@2372: determineMinMaxQ(double double) to be able to determine the Q range of a ingo@2372: WST without having a Range object. ingo@2372: sascha@2371: 2011-12-19 Sascha L. Teichmann : sascha@2371: sascha@2371: * src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java: sascha@2371: Parse the official 'Pegelnummer' out of the STA files, too. sascha@2371: sascha@2371: * src/main/java/de/intevation/flys/importer/ImportGauge.java: sascha@2371: Adjusted import model. sascha@2371: sascha@2371: * src/main/java/de/intevation/flys/model/Gauge.java: Make the sascha@2371: official gauge number accessible via Hibernate. sascha@2371: sascha@2371: * doc/schema/postgresql.sql, doc/schema/oracle.sql: Added sascha@2371: an official_number to the gauges table. sascha@2371: bjoern@2370: 2011-11-30 Bjoern Schilberg : bjoern@2370: bjoern@2370: * doc/schema/oracle-spatial.sql: Adjust extent of germany to EPSG:31467 bjoern@2370: (GK3) coordinates. bjoern@2370: bjoern@2369: 2011-11-30 Bjoern Schilberg : bjoern@2369: bjoern@2369: * doc/schema/oracle-spatial.sql: Adjust extent to the extent of germany bjoern@2369: and srs to 31467 in USER_SDO_GEOM_METADATA. bjoern@2369: bjoern@2368: 2011-11-29 Bjoern Schilberg : bjoern@2368: bjoern@2368: * doc/schema/oracle_create_user.sql: Fixed notation of the table in the bjoern@2368: alter statement. bjoern@2368: sascha@2367: 2011-11-18 Sascha L. Teichmann : sascha@2367: sascha@2367: Fixed flys/issue415 sascha@2367: sascha@2367: * doc/schema/oracle.sql: Increased precision of a and b in ranges. sascha@2367: ingo@2366: 2011-11-10 Ingo Weinzierl ingo@2366: ingo@2366: * src/main/java/de/intevation/flys/model/Building.java, ingo@2366: src/main/java/de/intevation/flys/model/Fixpoint.java: Added functions ingo@2366: that return a list of Buildings/Fixpoints for a given river. ingo@2366: ingo@2365: 2011-11-10 Ingo Weinzierl ingo@2365: ingo@2365: * doc/schema/oracle-spatial.sql, ingo@2365: doc/schema/postgresql-spatial.sql: Adapted the "kind" field of "lines" ingo@2365: relation (Int -> Varchar). ingo@2365: ingo@2365: * doc/schema/oracle-spatial_idx.sql: Added missing spatial index for ingo@2365: "lines" relation. ingo@2365: ingo@2365: * src/main/java/de/intevation/flys/model/Line.java: Added a function that ingo@2365: returns all lines of a given river. ingo@2365: ingo@2364: 2011-11-09 Ingo Weinzierl ingo@2364: ingo@2364: * src/main/java/de/intevation/flys/model/Catchment.java: New. A model for ingo@2364: the 'catchment' relation. ingo@2364: ingo@2364: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2364: Registered the Catchment model. ingo@2364: ingo@2363: 2011-11-09 Ingo Weinzierl ingo@2363: ingo@2363: * doc/schema/postgresql-spatial.sql: Synced "hws" relation with oracle ingo@2363: schema. ingo@2363: ingo@2363: * src/main/java/de/intevation/flys/model/Hws.java: New. A model for the ingo@2363: "hws" relation. ingo@2363: ingo@2363: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2363: Registered the Hws model. ingo@2363: ingo@2362: 2011-11-09 Ingo Weinzierl ingo@2362: ingo@2362: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2362: Added methods that return information about the database connection used ingo@2362: by a concrete SessionFactoryImpl. ingo@2362: ingo@2361: 2011-11-09 Ingo Weinzierl ingo@2361: ingo@2361: * src/main/java/de/intevation/flys/model/Floodplain.java: Changed the ingo@2361: geometry type from MultiPolygon to Polygon. ingo@2361: ingo@2361: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2361: Added a function that returns the db driver of a given ingo@2361: SessionFactoryImpl instance. ingo@2361: ingo@2360: 2011-11-01 Ingo Weinzierl ingo@2360: ingo@2360: * src/main/java/de/intevation/flys/model/RiverAxisKm.java: New. Model class ingo@2360: for 'river_axes_km' relation. ingo@2360: ingo@2360: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2360: Added mapping for RiverAxisKm. ingo@2360: bjoern@2359: 2011-10-25 Bjoern Schilberg bjoern@2359: bjoern@2359: * doc/schema/oracle_create_user.sql: bjoern@2359: Added explizit TABLESPACE definition for the user. bjoern@2359: bjoern@2358: 2011-10-25 Bjoern Schilberg bjoern@2358: bjoern@2358: * doc/schema/oracle_create_user.sql: bjoern@2358: Adjusted oracle_create_user.sql script. Added USER SQL snippet to change bjoern@2358: tablespace to users. bjoern@2358: sascha@2357: 2011-10-05 Sascha L. Teichmann : sascha@2357: sascha@2357: * src/main/java/de/intevation/flys/utils/DateGuesser.java: sascha@2357: New. Date guesser from desktop FLYS. sascha@2357: sascha@2357: * src/main/java/de/intevation/flys/importer/parsers/WstParser.java: sascha@2357: Try to parse the name of a WST column as a date and store sascha@2357: the date into the database sascha@2357: sascha@2357: * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: sascha@2357: Added code to store the date of the column in the database. sascha@2357: bjoern@2356: 2011-10-24 Bjoern Schilberg bjoern@2356: bjoern@2356: * doc/schema/postgresql-spatial.sql: bjoern@2356: Adjusted geometry type for floodplain and hws in AddGeometryColumn. bjoern@2356: bjoern@2355: 2011-10-19 Bjoern Schilberg bjoern@2355: bjoern@2355: * doc/schema/oracle.sql: bjoern@2355: Added missing views (wst_value_table,wst_w_values,wst_q_values). bjoern@2355: bjoern@2354: 2011-10-18 Bjoern Schilberg bjoern@2354: bjoern@2354: * doc/schema/oracle.sql: bjoern@2354: Removed all CREATE OR REPLACE TRIGGER statements. bjoern@2354: bjoern@2353: 2011-10-17 Bjoern Schilberg bjoern@2353: bjoern@2353: * doc/schema/oracle.sql: bjoern@2353: Adjusted NUMBER format for units, positions and cross_section_points tables. bjoern@2353: bjoern@2352: 2011-10-10 Bjoern Schilberg bjoern@2352: bjoern@2352: * doc/schema/oracle.sql: bjoern@2352: Fix errors. bjoern@2352: bjoern@2351: 2011-10-10 Bjoern Schilberg bjoern@2351: bjoern@2351: * doc/schema/oracle.sql: bjoern@2351: Adjust oracle schema [I382]. bjoern@2351: felix@2350: 2011-10-10 Felix Wolfsteller felix@2350: felix@2350: * src/main/java/de/intevation/flys/importer/ImportWst.java, felix@2350: src/main/java/de/intevation/flys/importer/ImportUnit.java: felix@2350: Removed obsolete imports. felix@2350: sascha@2349: 2011-10-05 Sascha L. Teichmann : sascha@2349: sascha@2349: * ChangeLog: Added database update statements. sascha@2349: sascha@2349: To update existing databases: sascha@2349: sascha@2349: BEGIN; sascha@2349: CREATE SEQUENCE UNITS_ID_SEQ; sascha@2349: CREATE TABLE units ( sascha@2349: id int PRIMARY KEY NOT NULL, sascha@2349: name VARCHAR(32) NOT NULL UNIQUE sascha@2349: ); sascha@2349: ALTER TABLE rivers ADD COLUMN wst_unit_id int REFERENCES units(id); sascha@2349: INSERT INTO units (id, name) VALUES (nextval('UNITS_ID_SEQ'), 'NN + m'); sascha@2349: INSERT INTO units (id, name) VALUES (nextval('UNITS_ID_SEQ'), 'NHN + m'); sascha@2349: UPDATE rivers SET wst_unit_id = (SELECT id FROM units WHERE name = 'NHN + m') WHERE name = 'Elbe'; sascha@2349: UPDATE rivers SET wst_unit_id = (SELECT id FROM units WHERE name = 'NN + m') WHERE name <> 'Elbe'; sascha@2349: ALTER TABLE rivers ALTER COLUMN wst_unit_id SET NOT NULL; sascha@2349: COMMIT; sascha@2349: ingo@2348: 2011-10-05 Ingo Weinzierl ingo@2348: ingo@2348: * contrib/dump-schema.sh: New. A small shell script that dumps the ingo@2348: database schema of a given database to SQL. ingo@2348: ingo@2348: * pom.xml: Added dependency for hibernate-spatial-oracle stuff. ingo@2348: ingo@2347: 2011-10-04 Ingo Weinzierl ingo@2347: ingo@2347: * doc/schema/postgresql.sql: Removed unit column from wsts; added a ingo@2347: wst_unit_id column to rivers. We decided to support a single elevation ingo@2347: model for the whole river. ingo@2347: ingo@2347: * src/main/java/de/intevation/flys/model/River.java: Added a WstUnit ingo@2347: column. ingo@2347: ingo@2347: * src/main/java/de/intevation/flys/model/Wst.java: Removed the Unit ingo@2347: column. ingo@2347: ingo@2347: * src/main/java/de/intevation/flys/importer/ImportWst.java: Provide a ingo@2347: getUnit() method that allows querying the elevation unit for this wst. ingo@2347: ingo@2347: * src/main/java/de/intevation/flys/importer/ImportUnit.java: Removed ingo@2347: storeDependencies(). ingo@2347: ingo@2347: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Save the ingo@2347: Unit of the wst file or a default one into database before all other ingo@2347: dependencies as well as the river itself is saved to database. ingo@2347: ingo@2346: 2011-10-04 Ingo Weinzierl ingo@2346: ingo@2346: * doc/schema/postgresql.sql: Added a "units" table. ingo@2346: ingo@2346: * src/main/java/de/intevation/flys/model/Unit.java: New. Model class that ingo@2346: represents a unit. ingo@2346: ingo@2346: * src/main/java/de/intevation/flys/importer/ImportUnit.java: New. Model ingo@2346: class that is used to import units. ingo@2346: ingo@2346: * src/main/java/de/intevation/flys/model/Wst.java: A Wst stores a Unit ingo@2346: which references "units" table now. ingo@2346: ingo@2346: * src/main/java/de/intevation/flys/importer/parsers/WstParser.java: Set ingo@2346: units which have already been parsed on Wsts. ingo@2346: ingo@2346: * src/main/java/de/intevation/flys/importer/ImportWst.java: Added setter ingo@2346: method for Units and call storeDependencies() for ImportUnits. ingo@2346: ingo@2346: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2346: Registered new model class Unit. ingo@2346: ingo@2345: 2011-10-04 Ingo Weinzierl ingo@2345: ingo@2345: flys/issue333 (W-INFO / Berechnung Wasserspiegellage, Zuordnung Bezugspegel) ingo@2345: ingo@2345: * src/main/java/de/intevation/flys/model/River.java: Modified ingo@2345: determination of gauge based on a km range. River.determineGauge(double, ingo@2345: double) will now return the gauge which matches the start km. ingo@2345: felix@2344: 2011-09-28 Felix Wolfsteller felix@2344: felix@2344: * src/main/java/de/intevation/flys/utils/StringUtil.java: felix@2344: (wWrap): New method (extracted from WaterlevelSelectState). felix@2344: felix@2343: 2011-09-28 Felix Wolfsteller felix@2343: felix@2343: * src/main/java/de/intevation/flys/utils/StringUtil.java: felix@2343: (unbracket): New method (extracted from WaterlevelSelectState). felix@2343: sascha@2342: 2011-09-27 Sascha L. Teichmann sascha@2342: sascha@2342: * src/main/java/de/intevation/flys/model/CrossSectionLine.java: sascha@2342: Moved some logic from cross section demo app to this model. sascha@2342: ingo@2341: 2011-09-26 Ingo Weinzierl ingo@2341: ingo@2341: * src/main/java/de/intevation/flys/model/CrossSectionTrack.java: ingo@2341: Added new function that the nearest CrossSectionTrack of a river to a ingo@2341: given kilometer. ingo@2341: bjoern@2340: 2011-09-23 Bjoern Schilberg bjoern@2340: bjoern@2340: * doc/schema/postgresql-spatial.sql: bjoern@2340: Added missing river_axes_km schema. bjoern@2340: * doc/schema/oracle-spatial.sql: bjoern@2340: Added missing dem and lines schema. bjoern@2340: bjoern@2339: 2011-09-22 Bjoern Schilberg bjoern@2339: bjoern@2339: * doc/schema/postgresql-spatial.sql, doc/schema/oracle-spatial.sql: bjoern@2339: Harmonized oracle and postgresql spatial schema. bjoern@2339: bjoern@2338: 2011-09-22 Bjoern Schilberg bjoern@2338: bjoern@2338: * doc/schema/oracle-spatial.sql: Harmonized Extent for Saar and Mosel. Some cleanups. bjoern@2338: ingo@2337: 2011-09-22 Ingo Weinzierl ingo@2337: ingo@2337: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@2337: Added the possibility to enable JMX (/MBean) support for hibernate. By ingo@2337: default, this support is NOT enabled. To enable JMX support for ingo@2337: hibernate, set the system property "flys.backend.enablejmx=true". ingo@2337: bjoern@2336: 2011-09-20 Bjoern Schilberg bjoern@2336: bjoern@2336: * doc/schema/oracle_create_user.sql: Added right to create views. bjoern@2336: bjoern@2335: 2011-09-20 Bjoern Schilberg bjoern@2335: bjoern@2335: * doc/schema/oracle-spatial.sql: Generalized oracle spatial schema. bjoern@2335: ingo@2334: 2011-09-19 Ingo Weinzierl ingo@2334: ingo@2334: Tagged RELEASE 2.5 ingo@2334: ingo@2334: * Changes: Prepared changes for release. ingo@2334: ingo@1257: 2011-09-16 Ingo Weinzierl ingo@1257: ingo@1257: * src/main/java/de/intevation/flys/model/DGM.java: Added function to query ingo@1257: a DGM by Id. ingo@1257: bjoern@1256: 2011-09-15 Bjoern Schilberg bjoern@1256: bjoern@1256: * pom.xml: Removed oracle dependency. bjoern@1256: bjoern@1255: 2011-09-15 Bjoern Schilberg bjoern@1255: bjoern@1255: * doc/schema/oracle.sql: Added inital oracle schema. bjoern@1255: bjoern@1254: 2011-09-14 Bjoern Schilberg bjoern@1254: bjoern@1254: * doc/schema/oracle-spatial_idx.sql: Added inital oracle-spatial_idx.sql bjoern@1254: script. bjoern@1254: bjoern@1253: 2011-09-14 Bjoern Schilberg bjoern@1253: bjoern@1253: * doc/schema/oracle-spatial.sql: Deactivated spatial indexes. bjoern@1253: bjoern@1252: 2011-09-14 Bjoern Schilberg bjoern@1252: bjoern@1252: * doc/schema/oracle_create_user.sql: Added inital oracle_create_user.sql bjoern@1252: script. bjoern@1252: bjoern@1251: 2011-09-14 Bjoern Schilberg bjoern@1251: bjoern@1251: * doc/schema/oracle-spatial.sql: Added schema floodplain. bjoern@1251: bjoern@1250: 2011-09-14 Bjoern Schilberg bjoern@1250: bjoern@1250: * doc/schema/oracle-spatial.sql: Added schema hws. bjoern@1250: bjoern@1249: 2011-09-14 Bjoern Schilberg bjoern@1249: bjoern@1249: * doc/schema/oracle-spatial.sql: Added schema cross_section_tracks. bjoern@1249: bjoern@1248: 2011-09-14 Bjoern Schilberg bjoern@1248: bjoern@1248: * doc/schema/oracle-spatial.sql: Added schema river_axes. bjoern@1248: bjoern@1247: 2011-09-14 Bjoern Schilberg bjoern@1247: bjoern@1247: * doc/schema/oracle-spatial.sql: Added schema fixpoints. bjoern@1247: bjoern@1246: 2011-09-14 Bjoern Schilberg bjoern@1246: bjoern@1246: * doc/schema/oracle-spatial.sql: Added schema buildings. bjoern@1246: bjoern@1245: 2011-09-14 Bjoern Schilberg bjoern@1245: bjoern@1245: * doc/schema/oracle-spatial.sql: Fixed table river_axes_km. bjoern@1245: bjoern@1244: 2011-09-13 Bjoern Schilberg bjoern@1244: bjoern@1244: * doc/schema/oracle-spatial.sql: Added initial oracle schemas. bjoern@1244: bjoern@1241: 2011-09-12 Bjoern Schilberg bjoern@1241: bjoern@1241: * doc/schema/postgresql-spatial.sql: Added initial schemas for bjoern@1241: Hydrologie/Einzugsgebiete, Hydrologie/HW-Schutzanlagen, Hydrologie/Hydr. bjoern@1241: Grenzen/Linien, BfG/hauptoeff_*.shp, BfG/MNQ-*.shp, bjoern@1241: BfG/modellgrenze*.shp, BfG/uferlinie.shp, BfG/vorland_*.shp, bjoern@1241: Hydrologie/Streckendaten, Hydrologie/UeSG/Berechnung, bjoern@1241: Hydrologie/UeSG/Messung bjoern@1241: ingo@1240: 2011-09-02 Ingo Weinzierl ingo@1240: ingo@1240: * doc/schema/postgresql-spatial.sql: Removed SERIALs from schema. ingo@1240: Auto-Increment is realized through SERIALs now. ingo@1240: ingo@1240: * src/main/java/de/intevation/flys/model/DGM.java: The table for dem has ingo@1240: been renamed to 'dem' (before 'dgm'). ingo@1240: hans@1239: 2011-09-01 Hans Plum hans@1239: hans@1239: * doc/schema/postgresql-spatial.sql: hans@1239: Hint for unifying table names: dgm -> dem hans@1239: hans@1238: 2011-09-01 Hans Plum hans@1238: hans@1238: * doc/schema/postgresql-spatial.sql: hans@1238: Added mappings to existing data in file system (based on hans@1238: river Saar); added TODOs for missing tables/mappings hans@1238: ingo@1237: 2011-08-31 Ingo Weinzierl ingo@1237: ingo@1237: * doc/schema/postgresql-spatial.sql: New relation for floodplains (german ingo@1237: "Talaue"). ingo@1237: ingo@1237: * src/main/java/de/intevation/flys/model/Floodplain.java: New. Model class ingo@1237: that represents a floodplain. ingo@1237: ingo@1237: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@1237: Registered the Floodplain mapping. ingo@1237: ingo@1236: 2011-08-31 Ingo Weinzierl ingo@1236: ingo@1236: * doc/schema/postgresql-spatial.sql: Added a relation for DGMs. Note, that ingo@1236: no data of the DGM is stored in this relation, but only the file path to ingo@1236: the DGM file. ingo@1236: ingo@1236: * src/main/java/de/intevation/flys/model/DGM.java: New. This class provides ingo@1236: information for a DGM (km range and file path). ingo@1236: ingo@1236: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@1236: Registered the DGM. ingo@1236: ingo@1235: 2011-08-30 Ingo Weinzierl ingo@1235: ingo@1235: * src/main/java/de/intevation/flys/model/CrossSectionTrack.java: New ingo@1235: static function to retrieve all CrossSectionTracks of a specific river. ingo@1235: ingo@1234: 2011-08-25 Ingo Weinzierl ingo@1234: ingo@1234: * src/main/java/de/intevation/flys/utils/FileTools.java: Moved to ingo@1234: artifacts-common module. ingo@1234: ingo@1234: * src/main/java/de/intevation/flys/importer/parsers/PegelGltParser.java, ingo@1234: src/main/java/de/intevation/flys/importer/parsers/PRFParser.java, ingo@1234: src/main/java/de/intevation/flys/importer/parsers/HYKParser.java, ingo@1234: src/main/java/de/intevation/flys/importer/parsers/AnnotationsParser.java, ingo@1234: src/main/java/de/intevation/flys/importer/parsers/InfoGewParser.java, ingo@1234: src/main/java/de/intevation/flys/importer/ImportRiver.java, ingo@1234: src/main/java/de/intevation/flys/importer/ImportGauge.java: Adjusted ingo@1234: imports of FileTools. ingo@1234: felix@1233: 2011-08-25 Felix Wolfsteller felix@1233: felix@1233: * src/main/java/de/intevation/flys/model/Gauge.java (getMainValues) felix@1233: (setMainValues): felix@1233: New method and mapping to get/set MainValues of a Gauge. Essentially felix@1233: developed by Sascha L. Teichmann. felix@1233: ingo@1232: 2011-08-22 Ingo Weinzierl ingo@1232: ingo@1232: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@1232: Reverted the default db dialect to PostgreSQL - this has been changed to ingo@1232: PostGIS by accident. ingo@1232: Configure the dialect "org.hibernatespatial.postgis.PostgisDialect" to ingo@1232: use the PostGIS stuff. ingo@1232: ingo@1231: 2011-08-22 Ingo Weinzierl ingo@1231: ingo@1231: * src/main/java/de/intevation/flys/model/RiverAxis.java: Added a function ingo@1231: that returns the RiverAxis for a given River. ingo@1231: ingo@1231: * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Use the new ingo@1231: function of RiverAxis to retrieve the RiverAxis. ingo@1231: ingo@1230: 2011-08-18 Ingo Weinzierl ingo@1230: ingo@1230: * doc/schema/postgresql-spatial.sql: The PostGIS database schema for ingo@1230: FLYS spatial data. ingo@1230: ingo@1230: * src/main/java/de/intevation/flys/model/CrossSectionTrack.java, ingo@1230: src/main/java/de/intevation/flys/model/RiverAxis.java, ingo@1230: src/main/java/de/intevation/flys/model/Line.java, ingo@1230: src/main/java/de/intevation/flys/model/Building.java, ingo@1230: src/main/java/de/intevation/flys/model/Fixpoint.java: Model classes that ingo@1230: represent FLYS spatial data. ingo@1230: ingo@1230: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: ingo@1230: Registered model classes. ingo@1230: ingo@1230: * pom.xml: Added dependencies to HibernateSpatial and PostGIS. ingo@1230: ingo@1230: * src/main/java/de/intevation/flys/backend/SpatialInfo.java, ingo@1230: contrib/spatial-info.sh: A small demo application that prints out some ingo@1230: information about spatial data of specific rivers. Modify the system ingo@1230: property -Dflys.backend.spatial.river to get information of a river of ingo@1230: your choice. ingo@1230: sascha@1229: 2011-07-31 Sascha L. Teichmann sascha@1229: sascha@1229: Re-enabled Hibernate schema dumps. sascha@1229: sascha@1229: * src/main/java/de/intevation/flys/App.java: Removed old code sascha@1229: and use new SessionFactoryProvider infrastructure. sascha@1229: sascha@1229: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@1229: Added methods to create db configurations without opening them. sascha@1229: Useful for introspection only purposes. sascha@1229: sascha@1228: 2011-07-31 Sascha L. Teichmann sascha@1228: sascha@1228: * pom.xml: Bumped Apache DBCP up to 1.4 to use the same version sascha@1228: as artifact database. sascha@1228: sascha@1227: 2011-07-28 Sascha L. Teichmann sascha@1227: sascha@1227: * src/main/java/de/intevation/flys/importer/ImporterSession.java: sascha@1227: Make use of the LRU cache from artifacts common. sascha@1227: sascha@1226: 2011-07-18 Sascha L. Teichmann sascha@1226: sascha@1226: * doc/schema/postgresql.sql: Added missing foreign key contraint on hyks table. sascha@1226: To update existing databases: sascha@1226: sascha@1226: ALTER TABLE hyks ADD CONSTRAINT hyks_river_id_fkey FOREIGN KEY (river_id) REFERENCES rivers(id); sascha@1226: sascha@1225: 2011-07-18 Sascha L. Teichmann sascha@1225: sascha@1225: * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: sascha@1225: Check if zone coordinates in HYKs are swapped and warn the user. sascha@1225: sascha@1224: 2011-07-18 Sascha L. Teichmann sascha@1224: sascha@1224: * src/main/java/de/intevation/flys/model/HYK.java sascha@1224: src/main/java/de/intevation/flys/importer/parsers/HYKParser.java, sascha@1224: src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, sascha@1224: src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, sascha@1224: src/main/java/de/intevation/flys/importer/ImportHYK.java: sascha@1224: Various small fixes and some extra logging. sascha@1224: sascha@1223: 2011-07-18 Sascha L. Teichmann sascha@1223: sascha@1223: * src/main/java/de/intevation/flys/importer/Config.java: New. sascha@1223: Central singleton to configure the Importer. sascha@1223: Uses system properties by now: sascha@1223: sascha@1223: flys.backend.importer.dry.run: boolean sascha@1223: default false. true: don't write to database. sascha@1223: sascha@1223: flys.backend.importer.annotation.types: String sascha@1223: default unset. Filename of annotation type classifications. sascha@1223: sascha@1223: flys.backend.importer.skip.gauges: boolean sascha@1223: default: false. true: don't parse/store *.glt, *.sta files sascha@1223: sascha@1223: flys.backend.importer.skip.annotations: boolean sascha@1223: default: false. true: don't parse/store *.km files sascha@1223: sascha@1223: flys.backend.importer.skip.prfs: boolean sascha@1223: default: false. true: don't parse/store *.prf files sascha@1223: sascha@1223: flys.backend.importer.skip.hyks: boolean sascha@1223: default: false. true: don't parse/store *.hyk files sascha@1223: sascha@1223: flys.backend.importer.skip.wst: boolean sascha@1223: default: false. true: don't parse/store river wst files sascha@1223: sascha@1223: flys.backend.importer.skip.extra.wsts: boolean sascha@1223: default: false. true: don't parse/store extra *.zus, *.wst files sascha@1223: sascha@1223: flys.backend.importer.skip.fixations: boolean sascha@1223: default: false. true: don't parse/store fixation *.wst files sascha@1223: sascha@1223: flys.backend.importer.skip.official.lines: boolean sascha@1223: default: false. true: don't parse/store 'amtliche Linien' *.wst files sascha@1223: sascha@1223: flys.backend.importer.skip.flood.water: boolean sascha@1223: default: false. true: don't parse/store 'HW-Marken' *.wst files sascha@1223: sascha@1223: flys.backend.importer.skip.flood.protection: boolean sascha@1223: default: false. true: don't parse/store 'HW-Schutzanlagen' *.wst files sascha@1223: ingo@1222: 2011-07-18 Ingo Weinzierl ingo@1222: ingo@1222: * src/main/java/de/intevation/flys/model/HYKEntry.java: Fixed OrderBy ingo@1222: clause. ingo@1222: sascha@1221: 2011-07-18 Sascha L. Teichmann sascha@1221: sascha@1221: * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, sascha@1221: src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java, sascha@1221: src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, sascha@1221: src/main/java/de/intevation/flys/importer/ImportRiver.java, sascha@1221: src/main/java/de/intevation/flys/importer/ImportHYK.java: sascha@1221: Store HYK data structures to database. Needs testing. sascha@1221: sascha@1220: 2011-07-18 Sascha L. Teichmann sascha@1220: sascha@1220: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@1220: Parse the HYKs from the importer. TODO: Store them in database. sascha@1220: sascha@1219: 2011-07-18 Sascha L. Teichmann sascha@1219: sascha@1219: * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: sascha@1219: Create data structures while parsing. sascha@1219: sascha@1219: * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, sascha@1219: src/main/java/de/intevation/flys/importer/ImportHYK.java: Added sascha@1219: getters/setters to ease model wiring. sascha@1219: sascha@1218: 2011-07-17 Sascha L. Teichmann sascha@1218: sascha@1218: * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, sascha@1218: src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java, sascha@1218: src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, sascha@1218: src/main/java/de/intevation/flys/importer/ImportHYK.java: New. sascha@1218: Importer models for HYKs. sascha@1218: sascha@1217: 2011-07-17 Sascha L. Teichmann sascha@1217: sascha@1217: * doc/schema/postgresql.sql: Each entry in a HYK can have sascha@1217: an optional 'Peilungsjahr' (measure) not only the whole HYK. sascha@1217: To update existing databases: sascha@1217: BEGIN; sascha@1217: ALTER TABLE hyks DROP COLUMN measure; sascha@1217: ALTER TABLE hyk_entries ADD COLUMN measure TIMESTAMP; sascha@1217: COMMIT; sascha@1217: sascha@1217: * src/main/java/de/intevation/flys/model/HYKEntry.java, sascha@1217: src/main/java/de/intevation/flys/model/HYK.java: sascha@1217: Adjusted Hibernate models. sascha@1217: sascha@1216: 2011-07-17 Sascha L. Teichmann sascha@1216: sascha@1216: * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: sascha@1216: Added callback mechanism and recursive file search like in the PRF parser. sascha@1216: All BfG-HYK files seem to parse correctly now. TODO: Build the data structures. sascha@1216: sascha@1216: * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java: sascha@1216: Added x.canRead() before accepting files for parsing. sascha@1216: sascha@1215: 2011-07-15 Sascha L. Teichmann sascha@1215: sascha@1215: * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: sascha@1215: Initial version of the HYK parser. Not ready, yet. sascha@1215: sascha@1215: * src/main/java/de/intevation/flys/importer/ImportHYKFlowZoneType.java: sascha@1215: Importer model for HYK flow zone types. sascha@1215: sascha@1214: 2011-07-15 Sascha L. Teichmann sascha@1214: sascha@1214: * doc/schema/postgresql.sql: Argh! Added distance_{vl|hf|vr} to sascha@1214: wrong table. sascha@1214: To update existing databases: sascha@1214: BEGIN; sascha@1214: ALTER TABLE hyk_entries DROP COLUMN distance_vl; sascha@1214: ALTER TABLE hyk_entries DROP COLUMN distance_hf; sascha@1214: ALTER TABLE hyk_entries DROP COLUMN distance_vr; sascha@1217: ALTER TABLE hyk_formations ADD COLUMN distance_vl NUMERIC NOT NULL; sascha@1217: ALTER TABLE hyk_formations ADD COLUMN distance_hf NUMERIC NOT NULL; sascha@1217: ALTER TABLE hyk_formations ADD COLUMN distance_vr NUMERIC NOT NULL; sascha@1214: COMMIT; sascha@1214: sascha@1214: * src/main/java/de/intevation/flys/model/HYKFormation.java, sascha@1214: src/main/java/de/intevation/flys/model/HYKEntry.java: sascha@1214: Adjusted Hibernate models. sascha@1214: sascha@1213: 2011-07-15 Sascha L. Teichmann sascha@1213: sascha@1213: * src/main/java/de/intevation/flys/utils/FileTools.java: Added method sascha@1213: walkTree() to traverse a directory tree. To be reused in HYK parser. sascha@1213: sascha@1213: * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java: sascha@1213: Uses the FileTools.walkTree() method now to find all PRF file. sascha@1213: sascha@1212: 2011-07-15 Sascha L. Teichmann sascha@1212: sascha@1212: * doc/schema/postgresql.sql: Added missing columns. sascha@1212: To update existing databases: sascha@1212: BEGIN; sascha@1212: ALTER TABLE hyks ADD COLUMN measure TIMESTAMP; sascha@1212: ALTER TABLE hyk_entries ADD COLUMN distance_vl NUMERIC NOT NULL; sascha@1212: ALTER TABLE hyk_entries ADD COLUMN distance_hf NUMERIC NOT NULL; sascha@1212: ALTER TABLE hyk_entries ADD COLUMN distance_vr NUMERIC NOT NULL; sascha@1212: COMMIT; sascha@1213: sascha@1212: * src/main/java/de/intevation/flys/model/HYKEntry.java, sascha@1212: src/main/java/de/intevation/flys/model/HYK.java: sascha@1212: Adjusted Hibernate models. sascha@1212: sascha@1211: 2011-07-15 Sascha L. Teichmann sascha@1211: sascha@1211: * src/main/java/de/intevation/flys/importer/parsers/*.java: sascha@1211: New package. Moved the file parsers (*.gew, *.sta, *.at, *.glt, *.prf, *.km, *.wst) sascha@1211: into this package. sascha@1211: sascha@1211: * src/main/java/de/intevation/flys/importer/*.java: Adjusted the imports. sascha@1211: sascha@1210: 2011-07-15 Sascha L. Teichmann sascha@1210: sascha@1210: * src/main/java/de/intevation/flys/model/HYKFormation.java, sascha@1210: src/main/java/de/intevation/flys/model/HYKEntry.java, sascha@1210: src/main/java/de/intevation/flys/model/HYKFlowZone.java, sascha@1210: src/main/java/de/intevation/flys/model/HYKFlowZoneType.java, sascha@1210: src/main/java/de/intevation/flys/model/HYK.java: New. The hibernate models sascha@1210: for the HYK structures. sascha@1210: sascha@1210: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@1210: Registered new models. sascha@1210: sascha@1210: * src/main/java/de/intevation/flys/model/CrossSection.java: Added sascha@1210: 'order by' annotation for fetching the cross section lines. sascha@1210: sascha@1209: 2011-07-15 Sascha L. Teichmann sascha@1209: sascha@1209: * doc/schema/postgresql.sql: Added structures for HYKs "Hydraulische Kenngroessen" sascha@1209: To update existing databases: sascha@1209: sascha@1209: BEGIN; sascha@1209: CREATE SEQUENCE HYKS_ID_SEQ; sascha@1209: CREATE TABLE hyks ( sascha@1209: id int PRIMARY KEY NOT NULL, sascha@1209: river_id int NOT NULL, sascha@1209: description VARCHAR(256) NOT NULL sascha@1209: ); sascha@1209: sascha@1209: CREATE SEQUENCE HYK_ENTRIES_ID_SEQ; sascha@1209: CREATE TABLE hyk_entries ( sascha@1209: id int PRIMARY KEY NOT NULL, sascha@1209: hyk_id int NOT NULL REFERENCES hyks(id), sascha@1209: km NUMERIC NOT NULL, sascha@1209: UNIQUE (hyk_id, km) sascha@1209: ); sascha@1209: sascha@1209: CREATE SEQUENCE HYK_FORMATIONS_ID_SEQ; sascha@1209: CREATE TABLE hyk_formations ( sascha@1209: id int PRIMARY KEY NOT NULL, sascha@1209: formation_num int NOT NULL DEFAULT 0, sascha@1209: hyk_entry_id int NOT NULL REFERENCES hyk_entries(id), sascha@1209: top NUMERIC NOT NULL, sascha@1209: bottom NUMERIC NOT NULL, sascha@1209: UNIQUE (hyk_entry_id, formation_num) sascha@1209: ); sascha@1209: sascha@1209: CREATE SEQUENCE HYK_FLOW_ZONE_TYPES_ID_SEQ; sascha@1209: CREATE TABLE hyk_flow_zone_types ( sascha@1209: id int PRIMARY KEY NOT NULL, sascha@1209: name VARCHAR(50) NOT NULL UNIQUE, sascha@1209: description VARCHAR(256) sascha@1209: ); sascha@1209: sascha@1209: CREATE SEQUENCE HYK_FLOW_ZONES_ID_SEQ; sascha@1209: CREATE TABLE hyk_flow_zones ( sascha@1209: id int PRIMARY KEY NOT NULL, sascha@1209: formation_id int NOT NULL REFERENCES hyk_formations(id), sascha@1209: type_id int NOT NULL REFERENCES hyk_flow_zone_types(id), sascha@1209: a NUMERIC NOT NULL, sascha@1209: b NUMERIC NOT NULL, sascha@1209: CHECK (a <= b) sascha@1209: ); sascha@1209: COMMIT; sascha@1209: sascha@1208: 2011-07-13 Sascha L. Teichmann sascha@1208: sascha@1208: * pom.xml: Bumped Hibernate up to 3.6.5. sascha@1208: sascha@1207: 2011-07-11 Sascha L. Teichmann sascha@1207: sascha@1207: * src/main/java/de/intevation/flys/utils/FileTools.java: Argh! sascha@1207: Forget to call the file hashing so only the file lengths were sascha@1207: compared. sascha@1207: sascha@1207: 2011-07-11 Sascha L. Teichmann sascha@1206: sascha@1206: * src/main/java/de/intevation/flys/utils/FileTools.java: sascha@1206: Added a class HashedFile to compare files by there length sascha@1206: and a message digest. Digest can be set with system property sascha@1206: "flys.backend.file.cmp.digest" and defaults to MD5. Useful to sascha@1206: detect file duplicates. sascha@1206: sascha@1206: * src/main/java/de/intevation/flys/importer/PRFParser.java: Added sascha@1206: method prfAccept(File) to callback to check if a found PRF file sascha@1206: should be parsed. Useful to prevent parsing file duplicates. sascha@1206: sascha@1206: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@1206: Use the HashedFile and the PRFParser.Callback to prevent sascha@1206: parsing of PRF duplicates. sascha@1206: sascha@1205: 2011-07-08 Sascha L. Teichmann sascha@1205: sascha@1205: * doc/schema/postgresql.sql: Misspelled sequence. sascha@1205: To update existing databases: sascha@1205: sascha@1205: DROP SEQUENCE CROSS_SECTION_LINES_SEQ; sascha@1205: CREATE SEQUENCE CROSS_SECTION_LINES_ID_SEQ; sascha@1205: sascha@1205: * src/main/java/de/intevation/flys/importer/ImportCrossSection.java: sascha@1205: Added some logging because importing is slow. sascha@1205: sascha@1205: * src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java: sascha@1205: Prevent NPE if a cross section line from db has no points. sascha@1205: sascha@1204: 2011-07-08 Sascha L. Teichmann sascha@1204: sascha@1204: Parse all PRFs in all subfolders of a river and store them sascha@1204: as cross sections into the database. Needs testing! sascha@1204: sascha@1204: * src/main/java/de/intevation/flys/importer/ImportCrossSection.java, sascha@1204: src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java: sascha@1204: New. Importer models for cross sections. sascha@1204: sascha@1204: * src/main/java/de/intevation/flys/importer/XY.java: sascha@1204: New. Made top level class from inner PRFParser.XY. sascha@1204: sascha@1204: * src/main/java/de/intevation/flys/importer/PRFParser.java: sascha@1204: Moved out XY class. Renamed callback. sascha@1204: sascha@1204: * src/main/java/de/intevation/flys/model/CrossSection.java, sascha@1204: src/main/java/de/intevation/flys/model/CrossSectionLine.java, sascha@1204: src/main/java/de/intevation/flys/model/CrossSectionPoint.java, sascha@1204: src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: sascha@1204: Added convinience constructors. sascha@1204: sascha@1204: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@1204: Parse and store cross sections into database. sascha@1204: sascha@1203: 2011-07-07 Sascha L. Teichmann sascha@1203: sascha@1203: * doc/schema/postgresql.sql: Introduced a new table cross_section_line sascha@1203: holding the km of a set of points. sascha@1203: sascha@1203: * src/main/java/de/intevation/flys/model/CrossSectionLine.java: sascha@1203: New. Model for a single line of a "Querprofil". sascha@1203: sascha@1203: * src/main/java/de/intevation/flys/model/CrossSection.java: Removed sascha@1203: 'km' and 'points' they are part of the line now. sascha@1203: sascha@1203: * src/main/java/de/intevation/flys/model/CrossSectionPoint.java: sascha@1203: They reference to the containing line now. sascha@1203: sascha@1203: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@1203: Registered new model. sascha@1203: sascha@1203: To update existing databases: sascha@1203: BEGIN; sascha@1203: DROP SEQUENCE CROSS_SECTIONS_ID_SEQ; sascha@1203: DROP SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; sascha@1203: DROP TABLE cross_section_points; sascha@1203: DROP TABLE cross_sections; sascha@1203: CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ; sascha@1203: CREATE TABLE cross_sections ( sascha@1203: id int PRIMARY KEY NOT NULL, sascha@1203: river_id int NOT NULL REFERENCES rivers(id), sascha@1203: time_interval_id int REFERENCES time_intervals(id), sascha@1203: description VARCHAR(256) sascha@1203: ); sascha@1203: CREATE SEQUENCE CROSS_SECTION_LINES_SEQ; sascha@1203: CREATE TABLE cross_section_lines ( sascha@1203: id int PRIMARY KEY NOT NULL, sascha@1203: km NUMERIC NOT NULL, sascha@1203: cross_section_id int NOT NULL REFERENCES cross_sections(id), sascha@1203: UNIQUE (km, cross_section_id) sascha@1203: ); sascha@1203: CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; sascha@1203: CREATE TABLE cross_section_points ( sascha@1203: id int PRIMARY KEY NOT NULL, sascha@1203: cross_section_line_id int NOT NULL REFERENCES cross_section_lines(id), sascha@1203: col_pos int NOT NULL, sascha@1203: x NUMERIC NOT NULL, sascha@1203: y NUMERIC NOT NULL, sascha@1203: UNIQUE (cross_section_line_id, col_pos) sascha@1203: ); sascha@1203: COMMIT; sascha@1203: sascha@1202: 2011-07-07 Sascha L. Teichmann sascha@1202: sascha@1202: * doc/schema/postgresql.sql: Dropped constraint that enforces the sascha@1203: uniqueness of km and river. This is violated because there are sascha@1202: more than one sounding in different year at the same km of a river. sascha@1202: Added column 'description' to the cross section table to make it sascha@1202: human readable. sascha@1202: sascha@1202: To update existing databases: sascha@1202: sascha@1202: ALTER TABLE cross_sections DROP CONSTRAINT cross_sections_km_key; sascha@1202: ALTER TABLE cross_sections ADD COLUMN description VARCHAR(256); sascha@1202: sascha@1202: * src/main/java/de/intevation/flys/model/CrossSection.java: sascha@1202: Added the description column to the Hibernate model. sascha@1202: sascha@1201: 2011-07-07 Sascha L. Teichmann sascha@1201: sascha@1201: * doc/schema/postgresql.sql: Dropped constraint that enforces the sascha@1203: uniqueness of x in a "Querprofil-Spur". There are vertical lines sascha@1201: in the soundings so this constraint is violated. sascha@1201: sascha@1201: To update existing databases: sascha@1201: sascha@1201: ALTER TABLE cross_section_points DROP CONSTRAINT cross_section_points_cross_section_id_key2; sascha@1201: sascha@1200: 2011-07-07 Sascha L. Teichmann sascha@1200: sascha@1200: * src/main/java/de/intevation/flys/importer/PRFParser.java: sascha@1200: Added a callback to be called from parsePRFs() if sascha@1200: a PRF was parsed successfully. Useful to scan whole sascha@1200: sub directories for PRF files. sascha@1200: sascha@1199: 2011-07-07 Sascha L. Teichmann sascha@1199: sascha@1199: * src/main/java/de/intevation/flys/importer/PRFParser.java: sascha@1199: Extract the year of sounding from file names. If not found sascha@1199: from the name of th containing directory. Description is made sascha@1199: of file name and parent directory file name. sascha@1199: sascha@1198: 2011-07-07 Sascha L. Teichmann sascha@1198: sascha@1198: * src/main/java/de/intevation/flys/importer/PRFParser.java: sascha@1198: Extracted the data. All BfG PRFs are parsed correctly, now. sascha@1198: sascha@1197: 2011-07-07 Sascha L. Teichmann sascha@1197: sascha@1197: * src/main/java/de/intevation/flys/importer/PRFParser.java: sascha@1197: Extract km from lines. TODO: extract data. sascha@1197: sascha@1196: 2011-07-06 Sascha L. Teichmann sascha@1196: sascha@1196: * src/main/java/de/intevation/flys/importer/PRFParser.java: New. sascha@1196: Parser for PRF files. TODO extra data and station from data lines. sascha@1196: sascha@1195: 2011-07-06 Sascha L. Teichmann sascha@1195: sascha@1195: * src/main/java/de/intevation/flys/model/Point3d.java: Deleted. sascha@1195: Not needed (braindead). sascha@1195: sascha@1195: * src/main/java/de/intevation/flys/model/CrossSectionPoint.java: sascha@1195: Directly store the x/y values now. sascha@1195: sascha@1195: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@1195: Removed registration of Point3d. sascha@1195: sascha@1195: To update existing databases: sascha@1195: sascha@1195: BEGIN; sascha@1195: ALTER TABLE cross_section_points DROP COLUMN point3d_id; sascha@1195: DROP SEQUENCE POINTS3D_ID_SEQ; sascha@1195: DROP TABLE points3d; sascha@1195: ALTER TABLE cross_section_points ADD COLUMN x NUMERIC NOT NULL; sascha@1195: ALTER TABLE cross_section_points ADD COLUMN y NUMERIC NOT NULL; sascha@1195: ALTER TABLE cross_section_points ADD CONSTRAINT sascha@1195: cross_section_points_cross_section_id_key2 UNIQUE (cross_section_id, x); sascha@1195: COMMIT; sascha@1195: sascha@1194: 2011-07-06 Sascha L. Teichmann sascha@1194: sascha@1194: * src/main/java/de/intevation/flys/model/CrossSection.java, sascha@1194: src/main/java/de/intevation/flys/model/CrossSectionPoint.java: sascha@1194: New. Hibernate models for cross-sections and their forming points. sascha@1194: sascha@1194: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@1194: Registered the new models. sascha@1194: sascha@1193: 2011-07-06 Sascha L. Teichmann sascha@1193: sascha@1193: * src/main/java/de/intevation/flys/model/Point3d.java: New. point3d model sascha@1193: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@1193: Registered point3d model. sascha@1193: sascha@1192: 2011-07-06 Sascha L. Teichmann sascha@1192: sascha@1192: * doc/schema/postgresql.sql: Add relations for cross sections. sascha@1192: To update existing databases: sascha@1192: BEGIN; sascha@1192: sascha@1192: CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ; sascha@1192: CREATE TABLE cross_sections ( sascha@1192: id int PRIMARY KEY NOT NULL, sascha@1192: km NUMERIC NOT NULL, sascha@1192: river_id int NOT NULL REFERENCES rivers(id), sascha@1192: time_interval_id int REFERENCES time_intervals(id), sascha@1192: UNIQUE (km, river_id) sascha@1192: ); sascha@1192: sascha@1192: CREATE SEQUENCE POINTS3D_ID_SEQ; sascha@1192: CREATE TABLE points3d ( sascha@1192: id int PRIMARY KEY NOT NULL, sascha@1192: x NUMERIC NOT NULL, sascha@1192: y NUMERIC NOT NULL, sascha@1192: z NUMERIC NOT NULL sascha@1192: ); sascha@1192: sascha@1192: CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; sascha@1192: CREATE TABLE cross_section_points ( sascha@1192: id int PRIMARY KEY NOT NULL, sascha@1192: cross_section_id int NOT NULL REFERENCES cross_sections(id), sascha@1192: point3d_id int NOT NULL REFERENCES points3d(id), sascha@1192: col_pos int NOT NULL, sascha@1192: UNIQUE (cross_section_id, point3d_id, col_pos), sascha@1192: UNIQUE (cross_section_id, col_pos) sascha@1192: ); sascha@1192: sascha@1192: COMMIT; sascha@1192: ingo@1191: 2011-06-28 Ingo Weinzierl ingo@1191: ingo@1191: Tagged RELEASE 2.4 ingo@1191: ingo@772: 2011-06-27 Ingo Weinzierl ingo@772: ingo@772: * Changes: Prepared changes for the upcoming release. ingo@772: sascha@771: 2011-06-26 Sascha L. Teichmann sascha@771: sascha@771: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, sascha@771: src/main/java/de/intevation/flys/importer/AnnotationClassifier.java, sascha@771: src/main/java/de/intevation/flys/importer/AtFileParser.java, sascha@771: src/main/java/de/intevation/flys/importer/ValueKey.java, sascha@771: src/main/java/de/intevation/flys/importer/WstParser.java: sascha@771: Removed trailing whitespace. sascha@771: sascha@770: 2011-06-26 Sascha L. Teichmann sascha@770: sascha@770: * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: sascha@770: Removed superfluous imports. sascha@770: sascha@769: 2011-06-26 Sascha L. Teichmann sascha@769: sascha@769: * src/main/java/de/intevation/flys/model/River.java: sascha@769: Added a method maxOverlap to determine the gauge which has sascha@769: the max common length to a given interval. This is for sascha@769: numerical stability in slightly overlapping gauge ranges. sascha@769: sascha@768: 2011-06-26 Sascha L. Teichmann sascha@768: sascha@768: * src/main/java/de/intevation/flys/model/River.java: When sascha@768: looking up a gauge by km containment use precision of 1e-6. sascha@768: sascha@767: 2011-06-22 Sascha L. Teichmann sascha@767: sascha@767: * src/main/java/de/intevation/flys/model/River.java: sascha@767: Added method to find gauge by its name. sascha@767: sascha@766: 2011-06-19 Sascha L. Teichmann sascha@766: sascha@766: * doc/annotation-types.xml: Fixed some rules. sascha@766: sascha@766: * src/main/java/de/intevation/flys/importer/Importer.java, sascha@766: src/main/java/de/intevation/flys/importer/InfoGewParser.java, sascha@766: src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@766: Call the right constructors now. sascha@766: sascha@766: * src/main/java/de/intevation/flys/importer/ImportAnnotationType.java: sascha@766: Added getter/setter for name property. sascha@766: sascha@766: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: sascha@766: Print duplicated at WARN level not as DEBUG. sascha@766: sascha@766: * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: sascha@766: Fixed XPath expression to build the internal lookup structures sascha@766: correctly. sascha@766: sascha@765: 2011-06-19 Sascha L. Teichmann sascha@765: sascha@765: Added classification of annotation types. Needs testing! sascha@765: sascha@765: * doc/annotation-types.xml: New. Rules to classify the different sascha@765: types of annotations. The classification works like this: sascha@765: sascha@765: There are unique types like 'Bruecke', 'Pegel' and so on. sascha@765: They are defined in the /annotation/type section and sascha@765: identified by their name. One of the types can be set sascha@765: as the default type if no rule applies. sascha@765: sascha@765: In the /annotation/pattern section are two types of pattern. sascha@765: sascha@765: 1 - file pattern: If a KM file is opened its filename is sascha@765: matched against the regular expressions of these sascha@765: patterns. If a match is found the corresponding type sascha@765: is used as the default type in the open file. sascha@765: If no match is found the global default type is used sascha@765: as the default type. sascha@765: sascha@765: 2 - line patterns: For each line of an open KM file these sascha@765: patterns are applied to find a match. If a match is sascha@765: found the corresponding type is used as the type of sascha@765: the annotation. If no match is found the default sascha@765: file default is assumed to be the right type. For sascha@765: the file default see 1. sascha@765: sascha@765: * src/main/java/de/intevation/flys/importer/Importer.java: sascha@765: To activate the annotation type classification set sascha@765: the system property sascha@765: sascha@765: 'flys.backend.importer.annotation.types' sascha@765: sascha@765: to the path of a XML looking like the annotation-types.xml sascha@765: file. If the system property is not set no classification sascha@765: is done. sascha@765: sascha@765: * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: sascha@765: New. Implements the classification. sascha@765: sascha@765: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, sascha@765: src/main/java/de/intevation/flys/importer/InfoGewParser.java, sascha@765: src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@765: Looped through the annotation type classification. sascha@765: sascha@765: 2011-06-18 Sascha L. Teichmann sascha@764: sascha@764: * src/main/java/de/intevation/flys/model/River.java: sascha@764: Added method to find gauge by a position lying in its range. sascha@764: sascha@763: 2011-06-14 Sascha L. Teichmann sascha@763: sascha@763: First part of flys/issue18 sascha@763: sascha@763: * doc/schema/postgresql.sql: Add new table 'annotation_types'. sascha@763: To update existing databases: sascha@763: BEGIN; sascha@763: CREATE SEQUENCE ANNOTATION_TYPES_ID_SEQ; sascha@763: CREATE TABLE annotation_types ( sascha@763: id int PRIMARY KEY NOT NULL, sascha@763: name VARCHAR(256) NOT NULL UNIQUE sascha@763: ); sascha@763: ALTER TABLE annotations ADD COLUMN type_id int REFERENCES annotation_types(id); sascha@763: COMMIT; sascha@763: sascha@763: * doc/schema/postgresql-cleanup.sql: Removed. Hopeless out-dated. sascha@763: sascha@763: * src/main/java/de/intevation/flys/model/AnnotationType.java: sascha@763: New. Hibernate model to access the type. sascha@763: sascha@763: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@763: Register the new backend type. sascha@763: sascha@763: * src/main/java/de/intevation/flys/model/Annotation.java: sascha@763: References the annotation type. sascha@763: sascha@763: * src/main/java/de/intevation/flys/importer/ImportAnnotationType.java: sascha@763: New. Model to help import the annotation type. sascha@763: sascha@763: * src/main/java/de/intevation/flys/importer/ImportAnnotation.java: sascha@763: Uses the import type. sascha@763: sascha@763: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: sascha@763: Set the annotation type to 'null'. TODO: Do the classification! sascha@763: sascha@762: 2011-06-14 Sascha L. Teichmann sascha@762: sascha@762: * src/main/java/de/intevation/flys/importer/AtFileParser.java: sascha@762: Fix for flys/issue110. start index was shifted by one. sascha@762: sascha@761: 2011-06-14 Sascha L. Teichmann sascha@761: sascha@761: * src/main/java/de/intevation/flys/importer/ImportAnnotation.java: sascha@761: Forgot to store reference to edge. sascha@761: sascha@760: 2011-06-14 Sascha L. Teichmann sascha@760: sascha@760: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@760: Register backend model. sascha@760: sascha@760: * src/main/java/de/intevation/flys/importer/ImportEdge.java: New. Model sascha@760: for importing the edges. sascha@760: sascha@760: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: sascha@760: Parses the edges of an annotation, too. sascha@760: sascha@758: 2011-06-14 Sascha L. Teichmann sascha@758: sascha@758: * doc/schema/postgresql.sql: Added table edges to model 'Kanten' of an annotation. sascha@758: To update existing databases: sascha@758: BEGIN; sascha@758: CREATE SEQUENCE EDGES_ID_SEQ; sascha@758: CREATE TABLE edges ( sascha@758: id int PRIMARY KEY NOT NULL, sascha@758: top NUMERIC, sascha@758: bottom NUMERIC); sascha@758: ALTER TABLE annotations ADD COLUMN edge_id int REFERENCES edges(id); sascha@758: COMMIT; sascha@758: sascha@758: * src/main/java/de/intevation/flys/model/Edge.java: New. A 'Kanten'-Model. sascha@758: * src/main/java/de/intevation/flys/model/Annotation.java: References the sascha@758: edges. sascha@758: sascha@757: 2011-06-08 Sascha L. Teichmann sascha@757: sascha@757: * src/main/java/de/intevation/flys/model/River.java: sascha@757: Added method to find gauge only by station position. sascha@757: sascha@756: 2011-05-24 Sascha L. Teichmann sascha@756: sascha@756: * src/main/java/de/intevation/flys/model/River.java: sascha@756: Make search for gauges independent of from/to order. sascha@756: sascha@755: 2011-05-24 Sascha L. Teichmann sascha@755: sascha@755: * doc/schema/postgresql.sql: Added a new view to select qs of a WST. sascha@755: To update existing databases: sascha@755: sascha@755: CREATE VIEW wst_q_values AS sascha@755: SELECT wc.position AS column_pos, sascha@755: wqr.q AS q, sascha@755: r.a AS a, sascha@755: r.b AS b, sascha@755: wc.wst_id AS wst_id sascha@755: FROM wst_column_q_ranges wcqr sascha@755: JOIN wst_q_ranges wqr ON wcqr.wst_q_range_id = wqr.id sascha@755: JOIN ranges r ON wqr.range_id = r.id sascha@755: JOIN wst_columns wc ON wcqr.wst_column_id = wc.id sascha@755: ORDER BY wc.position, wcqr.wst_column_id, r.a; sascha@755: sascha@754: 2011-05-24 Sascha L. Teichmann sascha@754: sascha@754: * doc/schema/postgresql.sql: Added a new view to select ws of a WST. sascha@754: To update existing databases: sascha@754: sascha@754: CREATE VIEW wst_w_values AS sascha@754: SELECT wcv."position" AS km, sascha@754: wcv.w AS w, sascha@754: wc."position" AS column_pos, sascha@754: w.id AS wst_id sascha@754: FROM wst_column_values wcv sascha@754: JOIN wst_columns wc ON wcv.wst_column_id = wc.id sascha@754: JOIN wsts w ON wc.wst_id = w.id sascha@754: ORDER BY wcv."position", wc."position"; sascha@754: sascha@753: 2011-05-23 Sascha L. Teichmann sascha@753: sascha@753: flys/issue76 sascha@753: sascha@753: * src/main/java/de/intevation/flys/importer/WstParser.java: sascha@753: Close gaps between q ranges. sascha@753: ingo@752: 2011-05-20 Ingo Weinzierl ingo@752: ingo@752: Tagged RELEASE 2.3.1 ingo@752: ingo@752: 2011-05-13 Ingo Weinzierl ingo@752: ingo@752: Tagged RELEASE 2.3 ingo@752: ingo@506: 2011-05-13 Ingo Weinzierl ingo@506: ingo@506: * Changes: Changes for release 2.3 - see Changes file to get to know about ingo@506: the version numbers of this software. ingo@506: sascha@505: 2011-05-10 Sascha L. Teichmann sascha@505: sascha@505: * doc/schema/postgresql.sql: Added a column which tells sascha@505: if a river counts its km up or downwards. sascha@505: To update existing databases: sascha@505: sascha@505: ALTER TABLE rivers ADD COLUMN km_up BOOLEAN NOT NULL DEFAULT true; sascha@505: sascha@505: * src/main/java/de/intevation/flys/model/River.java: sascha@505: Adjust Hibernate mapping of new column. sascha@505: sascha@504: 2011-05-10 Sascha L. Teichmann sascha@504: sascha@504: * src/main/java/de/intevation/flys/importer/AtFileParser.java: sascha@504: Fixed flys/issue11 and flys51. sascha@504: sascha@503: 2011-05-09 Sascha L. Teichmann sascha@503: sascha@503: * src/main/java/de/intevation/flys/importer/ValueKey.java: sascha@503: Add some unsharp comparison (eps = 1e-6) to avoid sascha@503: numerical problems. sascha@503: sascha@503: * src/main/java/de/intevation/flys/importer/IdValueKey.java: sascha@503: Removed. Not need any longer. sascha@503: sascha@503: * src/main/java/de/intevation/flys/importer/ImporterSession.java: sascha@503: Use unsharp lookup. sascha@503: sascha@503: * src/main/java/de/intevation/flys/importer/ImportWst.java, sascha@503: src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@503: Flush more often. Hopefully this reduces hibernate sync sascha@503: problems?! sascha@503: sascha@502: 2011-05-09 Sascha L. Teichmann sascha@502: sascha@502: * src/main/java/de/intevation/flys/importer/ImporterSession.java: sascha@502: Fixed silly bug. Set flush mode back to auto because sascha@502: manual flushing causes some undetermined problems. sascha@502: sascha@501: 2011-05-09 Sascha L. Teichmann sascha@501: sascha@501: * src/main/java/de/intevation/flys/importer/ImporterSession.java: sascha@501: Do not load _all_ values from discharge tables and sascha@501: wst columns. This is extremly slow and will lead sascha@501: to OOM if more rivers are imported. Now only the sascha@501: last 20 columns und discharge tables are cached. sascha@501: sascha@501: * src/main/java/de/intevation/flys/importer/ValueKey.java: sascha@501: New. Key for caching discharge table values and wst sascha@501: column values. sascha@501: sascha@501: * src/main/java/de/intevation/flys/importer/IdValueKey.java: sascha@501: Fixed bug in equals(). sascha@501: sascha@501: * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: sascha@501: Removed too eloquent debug output. sascha@501: sascha@500: 2011-05-09 Sascha L. Teichmann sascha@500: sascha@500: * src/main/java/de/intevation/flys/importer/IdValueKey.java: sascha@500: Use BigDecimals as representation for the numeric components sascha@500: which prevents running into unique constraint problems sascha@500: caused by imprecision. sascha@500: sascha@500: * src/main/java/de/intevation/flys/importer/ImportRange.java, sascha@500: src/main/java/de/intevation/flys/importer/ImporterSession.java: sascha@500: Ranges are now cached globally, too. sascha@500: sascha@500: * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: sascha@500: Improved logging. sascha@500: sascha@500: * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java: sascha@500: Removed superfluous imports. sascha@500: sascha@499: 2011-05-08 Sascha L. Teichmann sascha@499: sascha@499: * src/main/java/de/intevation/flys/importer/StaFileParser.java: sascha@499: Only accept main value types 'Q', 'W', 'D' and 'T' by default. sascha@499: '-' is not handled any more because it causes too much constraint sascha@499: problems. You can overwrite the imported type with the sascha@499: system property flys.backend.main.value.types" (default "QWTD") sascha@499: sascha@499: * src/main/java/de/intevation/flys/importer/ImporterSession.java: sascha@499: Set session flush mode to manual. Hopefully this improves the sascha@499: performance a bit. sascha@499: sascha@499: * src/main/java/de/intevation/flys/importer/ImportWst.java, sascha@499: src/main/java/de/intevation/flys/importer/ImportGauge.java, sascha@499: src/main/java/de/intevation/flys/importer/ImportWstColumn.java, sascha@499: src/main/java/de/intevation/flys/importer/ImportRange.java, sascha@499: src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: sascha@499: Improved logging. sascha@499: sascha@498: 2011-05-08 Sascha L. Teichmann sascha@498: sascha@498: * src/main/java/de/intevation/flys/importer/WstColumnValueKey.java: Deleted sascha@498: * src/main/java/de/intevation/flys/importer/IdValueKey.java: Reinserted sascha@498: here in a more generalized form. sascha@498: sascha@498: * src/main/java/de/intevation/flys/importer/ImporterSession.java: sascha@498: Cache the discharge table value, too. sascha@498: sascha@498: * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java: sascha@498: Use the global cache. sascha@498: sascha@497: 2011-05-08 Sascha L. Teichmann sascha@497: sascha@497: * src/main/java/de/intevation/flys/importer/ImporterSession.java: sascha@497: New. Centralized caching in the thread local context. Importing sascha@497: the Elbe leads to OOM because the column values of the sascha@497: WST files where loaded separately for every file. sascha@497: sascha@497: * src/main/java/de/intevation/flys/importer/ImportPosition.java, sascha@497: src/main/java/de/intevation/flys/importer/Importer.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportAnnotation.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportWstQRange.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportWst.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportMainValue.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportMainValueType.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportRiver.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportGauge.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportWstColumn.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportRange.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportDischargeTable.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportAttribute.java, sascha@497: src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: sascha@497: Adjusted to use the new global context. sascha@497: sascha@496: 2011-05-08 Sascha L. Teichmann sascha@496: sascha@496: * doc/schema/postgresql.sql: Dropped constraint which sascha@496: forces discharge tables to have a unique time interval sascha@496: for a given gauge and kind. sascha@496: sascha@496: There are AT files (historical Mosel/Perl/Perl/1967-1981.at sascha@496: and Mosel/Perl/1967-1981-1.at) which violate this sascha@496: constraint. Its a technical question to the customer sascha@496: how to handle these cases. sascha@496: sascha@496: To adjust existing databases: sascha@496: sascha@496: ALTER TABLE discharge_tables DROP CONSTRAINT discharge_tables_gauge_id_key; sascha@496: sascha@496: 2011-05-08 Sascha L. Teichmann sascha@495: sascha@495: * src/main/java/de/intevation/flys/importer/WstParser.java: sascha@495: There are wst files where column names are not unique. sascha@495: Make them unique by appending (1), (2) and so on. sascha@495: sascha@493: 2011-05-05 Sascha L. Teichmann sascha@493: sascha@494: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@494: Import the "HW-Schutzanlagen", too. sascha@494: sascha@494: 2011-05-05 Sascha L. Teichmann sascha@494: sascha@494: Make import of historical discharge tables work. sascha@493: sascha@493: * doc/schema/postgresql.sql: Added forgotten column 'description'. sascha@493: sascha@493: !!! You have to drop your database !!! sascha@493: sascha@493: * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: sascha@493: src/main/java/de/intevation/flys/model/DischargeTable.java: sascha@493: Add the forgotten description property. sascha@493: sascha@493: * src/main/java/de/intevation/flys/importer/AtFileParser.java: sascha@493: Fixed problems with date recognition. sascha@493: sascha@493: * src/main/java/de/intevation/flys/importer/ImportGauge.java: sascha@493: Prefix the description of the historical discharge tables sascha@493: with "Histor.Abflusstafeln". sascha@493: sascha@493: * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: sascha@493: Fixed silly programming error. sascha@493: sascha@492: 2011-05-05 Sascha L. Teichmann sascha@492: sascha@492: * src/main/java/de/intevation/flys/importer/AtFileParser.java: sascha@492: Inject 'kind' attribute. sascha@492: sascha@492: * src/main/java/de/intevation/flys/importer/ImportGauge.java: sascha@492: Traverse the "Histor.Abflusstafeln" for the historical sascha@492: discharge tables. too. TODO: Store them in the database. sascha@492: sascha@492: * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: sascha@492: Added convinience constructor to set the kind of the sascha@492: discharge table. sascha@492: sascha@491: 2011-05-05 Sascha L. Teichmann sascha@491: sascha@491: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@491: Prefix "Zusätzliche Längsschnitte" with "Zus.Längsschnitte" sascha@491: in description. sascha@491: sascha@490: 2011-05-05 Sascha L. Teichmann sascha@490: sascha@490: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@490: Import 'Hochwasser-Marken', too. sascha@490: sascha@490: * src/main/java/de/intevation/flys/importer/WstParser.java: sascha@490: Removed superfluous import. sascha@490: sascha@489: 2011-05-05 Sascha L. Teichmann sascha@489: sascha@489: * src/main/java/de/intevation/flys/importer/WstParser.java: sascha@489: Ignore lines that contain km positions which were found sascha@489: before in the same file. sascha@489: ingo@488: 2011-05-05 Ingo Weinzierl ingo@488: ingo@488: * src/main/java/de/intevation/flys/model/River.java: Added a method that ingo@488: returns all gauges of the river intersected by a given start and end ingo@488: point. ingo@488: sascha@487: 2011-05-03 Sascha L. Teichmann sascha@487: sascha@487: * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: sascha@487: Forgot to fetch peer from result set. sascha@487: sascha@486: 2011-05-03 Sascha L. Teichmann sascha@486: sascha@486: * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: sascha@486: New. Importer model help fetching the database peer. sascha@486: sascha@486: * src/main/java/de/intevation/flys/model/TimeInterval.java: sascha@486: Add convinience constructor with start and stop time. sascha@486: sascha@486: * src/main/java/de/intevation/flys/importer/AtFileParser.java: sascha@486: Attach a time interval to a discharge table if we find one. sascha@486: sascha@486: * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: sascha@486: Store the reference to the importer model of the sascha@486: time interval of the discharge table. sascha@486: sascha@485: 2011-05-03 Sascha L. Teichmann sascha@485: sascha@485: * src/main/java/de/intevation/flys/importer/AtFileParser.java: sascha@485: Try to extract time ranges from at files. sascha@485: sascha@484: 2011-05-03 Sascha L. Teichmann sascha@484: sascha@484: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@484: Parse and store "amtliche Linien" wst files. sascha@484: sascha@483: 2011-05-03 Sascha L. Teichmann sascha@483: sascha@483: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@483: Parse and store fixation wst files as well. sascha@483: sascha@482: 2011-05-03 Sascha L. Teichmann sascha@482: sascha@482: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@482: Parse the "zusaetzliche Laengsschnitte", too. sascha@482: sascha@482: * src/main/java/de/intevation/flys/importer/ImportWst.java: sascha@482: Add getter/setter for column 'kind'. sascha@482: sascha@481: 2011-05-02 Sascha L. Teichmann sascha@481: sascha@481: * src/main/java/de/intevation/flys/importer/WstParser.java: sascha@481: Fixed flys/issue19: Do not take km column in wst file as a water level. sascha@481: ingo@480: 2011-05-02 Ingo Weinzierl ingo@480: ingo@480: * src/main/java/de/intevation/flys/model/Gauge.java: Introduced a 'scale' ingo@480: that is used to adjust the range of min/max W values. ingo@480: sascha@479: 2011-05-01 Sascha L. Teichmann sascha@479: sascha@479: * src/main/java/de/intevation/flys/importer/WstParser.java: sascha@479: Removed superfluous import. sascha@479: ingo@478: 2011-04-20 Ingo Weinzierl ingo@478: ingo@478: * src/main/java/de/intevation/flys/importer/WstColumnValueKey.java: ingo@478: New. This class is used as distinct key of a WstColumnValue - e.g. as ingo@478: key in a map. ingo@478: ingo@478: * src/main/java/de/intevation/flys/importer/ImportWst.java: A ingo@478: WstColumnValue cache is build up while initialization. This cache ingo@478: contains all WstColumnValues that exist in the database. ingo@478: ingo@478: * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: New ingo@478: constructor that takes the WstColumnValues cache. It is used to ingo@478: initialize new ImportWstColumnValue objects. ingo@478: ingo@478: * src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java: ingo@478: Speedup: A ImportWstColumnValue has a WstColumnValues cache that ingo@478: contains all WstColumnValues existing in the database. This makes it ingo@478: unnecessary to call an sql statement for each WstColumnValue to ingo@478: determine its existence in the database. ingo@478: sascha@476: 2011-04-18 Sascha L. Teichmann sascha@476: sascha@476: * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: sascha@476: Added a view 'wst_value_table' which aggregates the data sascha@476: to build w/q value tables. sascha@476: sascha@477: To update existing databases: sascha@477: sascha@477: BEGIN; sascha@477: CREATE VIEW wst_value_table AS sascha@477: SELECT wcv.position AS position, sascha@477: w, sascha@477: (SELECT q sascha@477: FROM wst_column_q_ranges wcqr sascha@477: JOIN wst_q_ranges wqr sascha@477: ON wcqr.wst_q_range_id = wqr.id sascha@477: JOIN ranges r sascha@477: ON r.id = wqr.range_id sascha@477: WHERE wcqr.wst_column_id = wc.id sascha@477: AND wcv.position BETWEEN r.a AND r.b) AS q, sascha@477: wc.position AS column_pos, sascha@477: w.id AS wst_id sascha@477: FROM wst_column_values wcv sascha@477: JOIN wst_columns wc sascha@477: ON wcv.wst_column_id = wc.id sascha@477: JOIN wsts w sascha@477: ON wc.wst_id = w.id sascha@477: ORDER BY wcv.position ASC, sascha@477: wc.position DESC; sascha@477: COMMIT; sascha@477: sascha@475: 2011-04-18 Sascha L. Teichmann sascha@475: sascha@475: * src/main/java/de/intevation/flys/model/Wst.java: sascha@475: Add forgotten one to many relation Wst -> WstColumn. sascha@475: sascha@474: 2011-04-18 Sascha L. Teichmann sascha@474: sascha@474: * src/main/java/de/intevation/flys/importer/ImportWst.java, sascha@474: src/main/java/de/intevation/flys/importer/WstParser.java: sascha@474: Import of q ranges of wst files was totally broken. :-/ sascha@474: You have to reimport all your data. sascha@474: sascha@473: 2011-04-18 Sascha L. Teichmann sascha@473: sascha@473: * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: sascha@473: Forgot kind parameter in peer fetching query. sascha@473: ingo@472: 2011-04-18 Ingo Weinzierl ingo@472: ingo@472: * src/main/java/de/intevation/flys/model/River.java:: ingo@472: Added a new method to determine the gauge based on a given start and end ingo@472: point of the river. ingo@472: sascha@471: 2011-04-15 Sascha L. Teichmann sascha@471: sascha@471: * doc/schema/postgresql.sql: Added 'position' column to wst_columns sascha@471: to allow order them by there column position in the original sascha@471: wst file. sascha@471: sascha@471: Update existing database with: sascha@471: sascha@471: BEGIN; sascha@471: ALTER TABLE wst_columns ADD COLUMN position int; sascha@471: UPDATE wst_columns w SET sascha@471: position = id - (SELECT min(id) FROM wst_columns WHERE wst_id = w.wst_id); sascha@471: ALTER TABLE wst_columns ADD CONSTRAINT wst_columns_wst_id_position_key sascha@471: UNIQUE (wst_id, position); sascha@471: COMMIT; sascha@471: sascha@471: * src/main/java/de/intevation/flys/model/Wst.java, sascha@471: src/main/java/de/intevation/flys/model/WstColumn.java: sascha@471: Adjusted models. sascha@471: sascha@471: * src/main/java/de/intevation/flys/importer/ImportWst.java, sascha@471: src/main/java/de/intevation/flys/importer/ImportWstColumn.java: sascha@471: Adjusted importer. sascha@471: sascha@470: 2011-04-15 Sascha L. Teichmann sascha@470: sascha@470: * doc/schema/postgresql.sql: Forget ',' in schema. sascha@470: sascha@469: 2011-04-15 Sascha L. Teichmann sascha@469: sascha@469: * src/main/java/de/intevation/flys/model/Wst.java (determineMinMaxQ): sascha@469: Fixed index problem when an empty list is returned. sascha@469: ingo@468: 2011-04-15 Ingo Weinzierl ingo@468: ingo@468: * src/main/java/de/intevation/flys/model/Wst.java: A Wst is now able to ingo@468: return its min and max Q values. ingo@468: ingo@468: * src/main/java/de/intevation/flys/model/Gauge.java: A Gauge is now able ingo@468: to return its min and max W values. ingo@468: sascha@467: 2011-04-15 Sascha L. Teichmann sascha@467: sascha@467: * doc/schema/postgresql.sql: Added new column 'kind' in sascha@467: discharge tables and wst to distinguish between different sascha@467: kinds like 'Haupt-WST', 'zusaetzliche Laengsschnitte', sascha@467: 'amtliche Daten' and so on. sascha@467: sascha@467: Update existing databases with: sascha@467: BEGIN; sascha@467: ALTER TABLE discharge_tables ADD COLUMN kind int NOT NULL DEFAULT 0; sascha@467: ALTER TABLE wsts ADD COLUMN kind int NOT NULL DEFAULT 0; sascha@469: COMMIT; sascha@467: sascha@467: * src/main/java/de/intevation/flys/model/DischargeTable.java sascha@467: src/main/java/de/intevation/flys/model/Wst.java, sascha@467: src/main/java/de/intevation/flys/importer/ImportWst.java, sascha@467: src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: sascha@467: Adjusted the models. sascha@467: ingo@466: 2011-04-15 Ingo Weinzierl ingo@466: ingo@466: * src/main/java/de/intevation/flys/backend/SessionHolder.java: Moved to ingo@466: this module from flys-artifacts. This is necessary to get access to the ingo@466: current session in this module as well. ingo@466: ingo@465: 2011-04-14 Ingo Weinzierl ingo@465: ingo@465: * src/main/java/de/intevation/flys/model/River.java: Added a method that ingo@465: returns the min and max distance of a river. ingo@465: sascha@464: 2011-04-03 Sascha L. Teichmann sascha@464: sascha@464: * src/**/*.java: Removed trailing whitespace. sascha@464: ingo@463: 2011-03-30 Ingo Weinzierl ingo@463: ingo@463: Tagged RELEASE 0.1 ingo@463: sascha@205: 2011-03-28 Sascha L. Teichmann sascha@205: sascha@205: * src/main/java/de/intevation/flys/model/Range.java: sascha@205: Forgot to save the last change before commit. sascha@205: sascha@204: 2011-03-28 Sascha L. Teichmann sascha@204: sascha@204: * src/main/java/de/intevation/flys/model/Range.java: sascha@204: Added methods to find out if two ranges intersects. sascha@204: sascha@203: 2011-03-24 Sascha L. Teichmann sascha@203: sascha@203: * src/main/java/de/intevation/flys/model/Gauge.java: sascha@203: Added an one to many relation to the discharge tables of a gauge. sascha@203: sascha@202: 2011-03-22 Sascha L. Teichmann sascha@202: sascha@202: Finished import of WSTs. sascha@202: sascha@202: TODO 1: Speed it up! It takes on a high end machine over 7(!) sascha@202: minutes only for the data of the Saar. sascha@202: TODO 2: Double precision floating point representations produced sascha@202: by the the parsers leed to unique constraint violations sascha@202: in the backend on a second run. So the import is currently sascha@202: only working on freshly initialized data bases. sascha@202: More consequent working with BigDecimal and some sascha@202: rounding may be of help here. sascha@202: sascha@202: * src/main/java/de/intevation/flys/model/WstColumnValue.java: sascha@202: Added convinience constructors. sascha@202: sascha@202: * src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java: sascha@202: Added getPeer() method. sascha@202: sascha@202: * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: sascha@202: Add a list of the ImportWstColumnValues produced by the WST parser. sascha@202: sascha@202: * src/main/java/de/intevation/flys/importer/WstParser.java: Add sascha@202: the (km, w) values to the ImportWstColumns. sascha@202: sascha@201: 2011-03-22 Sascha L. Teichmann sascha@201: sascha@201: * src/main/java/de/intevation/flys/importer/WstParser.java: sascha@201: Build models for wsts, wst columns and q ranges and sascha@201: store them in the backend. TODO: store the w values. sascha@201: sascha@201: * src/main/java/de/intevation/flys/model/WstQRange.java sascha@201: src/main/java/de/intevation/flys/model/Wst.java, sascha@201: src/main/java/de/intevation/flys/model/Range.java, sascha@201: src/main/java/de/intevation/flys/model/WstColumnQRange.java, sascha@201: src/main/java/de/intevation/flys/model/WstColumn.java: sascha@201: Added convinience constructors. sascha@201: sascha@201: * src/main/java/de/intevation/flys/importer/ImportWstQRange.java, sascha@201: src/main/java/de/intevation/flys/importer/ImportWst.java, sascha@201: src/main/java/de/intevation/flys/importer/ImportRiver.java, sascha@201: src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, sascha@201: src/main/java/de/intevation/flys/importer/ImportWstColumn.java, sascha@201: src/main/java/de/intevation/flys/importer/ImportRange.java: sascha@201: Added getPeer() methods. sascha@201: sascha@200: 2011-03-22 Sascha L. Teichmann sascha@200: sascha@200: * src/main/java/de/intevation/flys/importer/WstParser.java: sascha@200: The unit extraction in the WST parser of desktop FLYS sascha@200: is broken! Add a hack here to repair this for our sascha@200: importer. Desktop FLYS needs a fix, too! sascha@200: sascha@199: 2011-03-22 Sascha L. Teichmann sascha@199: sascha@199: * src/main/java/de/intevation/flys/importer/WstParser.java: sascha@199: Ported some stuff ver from WSTSource.java of desktop flys to sascha@199: parse WST files. TODO: create instances of the import models. sascha@199: sascha@199: * src/main/java/de/intevation/flys/utils/StringUtil.java: sascha@199: Copied from desktop flys. Used for some string operations sascha@199: in WST parser. sascha@199: sascha@199: * src/main/java/de/intevation/flys/importer/Importer.java: sascha@199: Added system property 'flys.backend.importer.dry.run'. sascha@199: Set to true only the parsing is done and no writing sascha@199: to the backend. Default: false. sascha@199: sascha@199: * src/main/java/de/intevation/flys/App.java, sascha@199: src/main/java/de/intevation/flys/model/MainValueType.java: sascha@199: Removed needless imports. sascha@199: ingo@198: 2011-03-22 Ingo Weinzierl ingo@198: ingo@198: * src/main/java/de/intevation/flys/model/DischargeTableValue.java, ingo@198: src/main/java/de/intevation/flys/model/DischargeTable.java: Added new ingo@198: constructors. ingo@198: ingo@198: * src/main/java/de/intevation/flys/importer/AtFileParser.java: New. This ingo@198: parser is used to '*.at' files. ingo@198: ingo@198: * src/main/java/de/intevation/flys/importer/ImportGauge.java: Added code to ingo@198: import discharge tables. ingo@198: ingo@198: * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java, ingo@198: src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: New. ingo@198: Helper models for import discharge tables. ingo@198: sascha@197: 2011-03-22 Sascha L. Teichmann sascha@197: sascha@197: * src/main/java/de/intevation/flys/importer/WstParser.java, sascha@197: src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@197: Added stub for WST parser. sascha@197: sascha@196: 2011-03-22 Sascha L. Teichmann sascha@196: sascha@196: * src/main/java/de/intevation/flys/importer/ImportWstQRange.java, sascha@196: src/main/java/de/intevation/flys/importer/ImportWst.java, sascha@196: src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java, sascha@196: src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, sascha@196: src/main/java/de/intevation/flys/importer/ImportWstColumn.java: sascha@196: Added importer helper model stubs for WST imports. sascha@196: sascha@195: 2011-03-21 Sascha L. Teichmann sascha@195: sascha@195: Second part of parsing/storing main values. Should be finished now. sascha@195: sascha@195: * src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java, sascha@195: src/main/java/de/intevation/flys/importer/ImportMainValue.java: sascha@195: New. Helper models for import main values, sascha@195: sascha@195: * src/main/java/de/intevation/flys/model/MainValue.java, sascha@195: src/main/java/de/intevation/flys/model/NamedMainValue.java: sascha@195: Added convinience constructors. sascha@195: sascha@195: * src/main/java/de/intevation/flys/importer/ImportGauge.java: sascha@195: Write main values to backend, too. sascha@195: sascha@195: * src/main/java/de/intevation/flys/importer/StaFileParser.java: sascha@195: Build importer models for main values. sascha@195: sascha@195: * src/main/java/de/intevation/flys/importer/ImportMainValueType.java: sascha@195: Data was called 'value'. Now it is 'name' to fit the sascha@195: schema. sascha@195: sascha@194: 2011-03-21 Sascha L. Teichmann sascha@194: sascha@194: * doc/schema/postgresql.sql: Fixed wrong unique constraint. sascha@194: sascha@194: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@194: Added some logging when storing gauges. sascha@194: sascha@193: 2011-03-21 Sascha L. Teichmann sascha@193: sascha@193: * src/main/java/de/intevation/flys/model/Gauge.java: sascha@193: Add forgotten column river_id. sascha@193: sascha@193: * src/main/java/de/intevation/flys/importer/ImportGauge.java: sascha@193: Small HQL fix. sascha@193: sascha@192: 2011-03-21 Sascha L. Teichmann sascha@192: sascha@192: * src/main/java/de/intevation/flys/model/Gauge.java: sascha@192: Added convinience contructor. sascha@192: sascha@192: * src/main/java/de/intevation/flys/importer/ImportGauge.java: sascha@192: Fixed getPeer() method. sascha@192: sascha@192: * src/main/java/de/intevation/flys/importer/StaFileParser.java: sascha@192: Fixed parsing of STA files. sascha@192: sascha@191: 2011-03-21 Sascha L. Teichmann sascha@191: sascha@191: * src/main/java/de/intevation/flys/importer/ImportRiver.java, sascha@191: src/main/java/de/intevation/flys/importer/ImportGauge.java: sascha@191: Propagate river into storing of gauges. sascha@191: sascha@191: 2011-03-21 Sascha L. Teichmann sascha@190: sascha@190: * src/main/java/de/intevation/flys/importer/Importer.java: sascha@190: Added code to store rivers not only annotations. sascha@190: sascha@190: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@190: Added stub code to write gauges. sascha@190: sascha@189: 2011-03-17 Sascha L. Teichmann sascha@189: sascha@189: First part of parsing main values. sascha@189: sascha@189: * src/main/java/de/intevation/flys/App.java: Commented out sascha@189: creation of dummy rivers. sascha@189: sascha@189: * src/main/java/de/intevation/flys/model/NamedMainValues.java: sascha@189: Moved to NamedMainValue. sascha@189: sascha@189: * src/main/java/de/intevation/flys/model/NamedMainValue.java: sascha@189: New. Formerly NamedMainValues. sascha@189: sascha@189: * src/main/java/de/intevation/flys/model/MainValue.java: sascha@189: New. Forgotten part of the model. sascha@189: sascha@189: * src/main/java/de/intevation/flys/model/MainValueType.java: sascha@189: Data is String not BigDecimal sascha@189: sascha@189: * src/main/java/de/intevation/flys/model/Range.java: Removed sascha@189: contructor with double arguments. Using BigDecimal now. sascha@189: sascha@189: * src/main/java/de/intevation/flys/importer/PegelGltParser.java: sascha@189: Propagate BigDecimal usage. sascha@189: sascha@189: * src/main/java/de/intevation/flys/importer/Importer.java: sascha@189: Removed needless import. Added TODO sascha@189: sascha@189: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@189: Parse the dependencies of the gauges, too. sascha@189: sascha@189: * src/main/java/de/intevation/flys/importer/StaFileParser.java: sascha@189: New. Parser for STA files. sascha@189: sascha@189: * src/main/java/de/intevation/flys/importer/ImportGauge.java: sascha@189: Call STA file parser. sascha@189: sascha@189: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, sascha@189: src/main/java/de/intevation/flys/importer/ImportRange.java: sascha@189: Uses BigDecimal now. sascha@189: sascha@189: * src/main/java/de/intevation/flys/importer/ImportAttribute.java: sascha@189: Fixed wrong type cast in equals. sascha@189: sascha@189: * src/main/java/de/intevation/flys/importer/ImportMainValueType.java: sascha@189: New. Helper model for importing main value types. sascha@189: sascha@189: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@189: Register forgotten MainValue model. sascha@189: sascha@188: 2011-03-17 Sascha L. Teichmann sascha@188: sascha@188: Store annotations in backend. sascha@188: sascha@188: * src/main/java/de/intevation/flys/model/Annotation.java: sascha@188: New convinience constructor. sascha@188: sascha@188: * src/main/java/de/intevation/flys/model/River.java: sascha@188: Added toString() method. sascha@188: sascha@188: * src/main/java/de/intevation/flys/model/Range.java: sascha@188: Fixed nasty mistake in @OneToOne annotatation. sascha@188: New convinience constructors. sascha@188: sascha@188: * src/main/java/de/intevation/flys/importer/ImportPosition.java sascha@188: src/main/java/de/intevation/flys/importer/ImportAnnotation.java, sascha@188: src/main/java/de/intevation/flys/importer/ImportRange.java sascha@188: src/main/java/de/intevation/flys/importer/ImportAttribute.java: sascha@188: Make storing to backend work. It's a bit too slow. :-/ sascha@188: sascha@188: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@188: Fetch peer from backend. Added method to store annotations. sascha@188: * src/main/java/de/intevation/flys/importer/Importer.java: sascha@188: Stored annotations into backend. More eloquent SQL exception sascha@188: handling. sascha@188: sascha@187: 2011-03-17 Sascha L. Teichmann sascha@187: sascha@187: * src/main/java/de/intevation/flys/model/Attribute.java, sascha@187: src/main/java/de/intevation/flys/model/Position.java: sascha@187: Added convinience constructors. sascha@187: sascha@187: * src/main/java/de/intevation/flys/importer/ImportPosition.java, sascha@187: src/main/java/de/intevation/flys/importer/ImportAttribute.java: sascha@187: Bound them to there backend peers. sascha@187: sascha@186: 2011-03-17 Sascha L. Teichmann sascha@186: sascha@186: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: sascha@186: New. Added parser to read *.KM files. sascha@186: sascha@186: * src/main/java/de/intevation/flys/importer/ImportPosition.java, sascha@186: src/main/java/de/intevation/flys/importer/PegelGltParser.java, sascha@186: src/main/java/de/intevation/flys/importer/ImportRiver.java, sascha@186: src/main/java/de/intevation/flys/importer/ImportAnnotation.java, sascha@186: src/main/java/de/intevation/flys/importer/ImportRange.java, sascha@186: src/main/java/de/intevation/flys/importer/InfoGewParser.java, sascha@186: src/main/java/de/intevation/flys/importer/ImportAttribute.java: sascha@186: Adjusted to load the annotations from *.KM files. sascha@186: sascha@185: 2011-03-17 Sascha L. Teichmann sascha@185: sascha@185: * src/main/java/de/intevation/flys/importer/ImportPosition.java, sascha@185: src/main/java/de/intevation/flys/importer/ImportRange.java, sascha@185: src/main/java/de/intevation/flys/importer/ImportAttribute.java, sascha@185: src/main/java/de/intevation/flys/importer/ImportAnnotation.java: sascha@185: New helper models for import. sascha@185: sascha@185: * src/main/java/de/intevation/flys/importer/PegelGltParser.java, sascha@185: src/main/java/de/intevation/flys/importer/ImportGauge.java: sascha@185: Use new models. sascha@185: sascha@184: 2011-03-17 Sascha L. Teichmann sascha@184: sascha@184: * src/main/java/de/intevation/flys/importer/PegelGltParser.java: sascha@184: New. Parser for PEGEL.GLT files. sascha@184: sascha@184: * src/main/java/de/intevation/flys/importer/ImportGauge.java: sascha@184: New. Import model for gauges. sascha@184: sascha@184: * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: sascha@184: Removed needless imports. sascha@184: sascha@184: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@184: Added method to parse the gauges. sascha@184: sascha@184: * src/main/java/de/intevation/flys/importer/InfoGewParser.java: sascha@184: Trigger pegel glt file parsing. sascha@184: sascha@183: 2011-03-17 Sascha L. Teichmann sascha@183: sascha@183: * src/main/java/de/intevation/flys/importer/Importer.java: sascha@183: Used thread local pattern to make sharing of session easier. sascha@183: sascha@182: 2011-03-17 Sascha L. Teichmann sascha@182: sascha@182: * src/main/java/de/intevation/flys/importer/Importer.java: sascha@182: Fixed error in HQL statement. sascha@182: sascha@181: 2011-03-17 Sascha L. Teichmann sascha@181: sascha@181: * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: sascha@181: Commented out a debug block because it leaks the db password. sascha@181: sascha@180: 2011-03-16 Sascha L. Teichmann sascha@180: sascha@180: * src/main/java/de/intevation/flys/importer/InfoGewParser.java: sascha@180: Expose imported rivers. sascha@180: sascha@180: * src/main/java/de/intevation/flys/importer/InfoGewParser.java: sascha@180: Store imported rivers into database. Needs testing! sascha@180: sascha@179: 2011-03-16 Sascha L. Teichmann sascha@179: sascha@179: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@179: Default connection parameters are now overwritable with sascha@179: system properties (defaults in brackets): sascha@179: - user name: flys.backend.user (flys) sascha@179: - user password: flys.backend.password (flys) sascha@179: - db dialect: flys.backend.dialect (org.hibernate.dialect.PostgreSQLDialect) sascha@179: - db driver: flys.backend.driver (org.postgresql.Driver) sascha@179: - db url: flys.backend.url (jdbc:postgresql://localhost:5432/flys) sascha@179: sascha@178: 2011-03-16 Sascha L. Teichmann sascha@178: sascha@178: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@178: Expose createSessionFactory() as public to be usable without sascha@178: a artifact database running. sascha@178: sascha@177: 2011-03-16 Sascha L. Teichmann sascha@177: sascha@177: * src/main/java/de/intevation/flys/utils/FileTools.java: sascha@177: Tools for handling with filenames. Currently there is sascha@177: a repair(File) method with repairs letter case errors sascha@177: which is useful when reading windows filenames on a sascha@177: un*x platform. sascha@177: sascha@177: * src/main/java/de/intevation/flys/importer/Importer.java: sascha@177: Standalone app to read data from the file system and sascha@177: store it in a database. Currently it does not store sascha@177: anything. It only loads info gew files. sascha@177: sascha@177: * src/main/java/de/intevation/flys/importer/InfoGewParser.java: sascha@177: Info gew parser. sascha@177: sascha@177: * src/main/java/de/intevation/flys/importer/ImportRiver.java: sascha@177: Helper model of a river used produced by parsing the sascha@177: info gew files. sascha@177: sascha@176: 2011-03-15 Sascha L. Teichmann sascha@176: sascha@176: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: sascha@176: New. SessionFactoryProvider.getSessionFactory() provides a sascha@176: SessionFactory to use the Hibernate O/R mapper for the FLYS backend. sascha@176: sascha@175: 2011-03-15 Sascha L. Teichmann sascha@175: sascha@175: * pom.xml: Added dependency to artifacts-commons to sascha@175: be able to use the global configuration of the artifact database. sascha@175: sascha@174: 2011-03-15 Sascha L. Teichmann sascha@174: sascha@174: * src/main/java/de/intevation/flys/App.java: Wire all POJOs sascha@174: to corresponding factory. sascha@174: sascha@174: * src/main/java/de/intevation/flys/model/*.java: Generate sascha@174: all foreign key constraints. TODO: name them correctly sascha@174: because the machine generated names are ugly and do sascha@174: not fit the PostgreSQL names. sascha@174: sascha@174: * doc/schema/postgresql.sql: Small quantifier fix in descriptions sascha@174: of wst columns. sascha@174: sascha@173: 2011-03-14 Sascha L. Teichmann sascha@173: sascha@173: * doc/schema/postgresql.sql: Fixed wrong spelled sascha@173: column references in foreign keys introduces with sascha@173: last change. sascha@173: sascha@172: 2011-03-14 Sascha L. Teichmann sascha@172: sascha@172: * src/main/java/de/intevation/flys/model/*.java: Added sascha@172: column annotations for simple fields. TODO: foreign keys. sascha@172: sascha@171: 2011-03-14 Sascha L. Teichmann sascha@171: sascha@171: * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: sascha@171: Fixed inconsistent table names. sascha@171: sascha@171: * src/main/java/de/intevation/flys/model/*.java: Added sascha@171: entity and id annotations. sascha@171: sascha@170: 2011-03-14 Sascha L. Teichmann sascha@170: sascha@170: * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: sascha@170: Added missing sequences. sascha@170: sascha@170: * doc/schema/sqlite.sql: Deleted. Not longer supported. sascha@170: sascha@169: 2011-03-11 Sascha L. Teichmann sascha@169: sascha@169: * doc/schema/postgresql-cleanup.sql: Forgot to add. sascha@169: sascha@169: * src/main/java/de/intevation/flys/App.java: Use sascha@169: Apache Commons DBCP as Hibernate connection provide. sascha@169: sascha@169: * src/main/java/de/intevation/flys/model/River.java: sascha@169: Added a constructor with string argument. Set the sascha@169: sequence increment to 1 (eat up 100 at a time before). sascha@169: sascha@169: * pom.xml: Added PostgreSQL 8.4 driver as runtime dependency. sascha@169: sascha@168: 2011-03-11 Sascha L. Teichmann sascha@168: sascha@168: * doc/schema/postgresql-cleanup.sql: New. Tear down schema sascha@168: for a postgres database. sascha@168: sascha@168: * doc/schema/postgresql.sql: Added squence for sascha@168: auto generating ids in river table. Cleaned up schema. sascha@168: sascha@168: * src/main/java/de/intevation/flys/App.java: Simple sascha@168: test app to interact with hibernate. Needs to be removed sascha@168: because its only a toy. sascha@168: sascha@168: * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: sascha@168: New. Binds Apache Commons to Hibernate. sascha@168: sascha@168: * pom.xml: Added dependencies to log4j, commons dbcp, sascha@168: JPA of hibernate. sascha@168: sascha@168: * src/main/java/de/intevation/flys/model/River.java: Added sascha@168: JPA annotations. sascha@168: sascha@168: * src/main/java/de/intevation/flys/model/*.java: Replaced sascha@168: Long with Integer because column ids are only four bytes wide. sascha@168: sascha@167: 2011-03-11 Sascha L. Teichmann sascha@167: sascha@167: * doc/schema/sqlite.sql, doc/schema/postgresql.sql: Fixed sascha@167: smaller issues in ddl. sascha@167: sascha@167: * src/main/java/de/intevation/flys/model/*.java: Added POJOs sascha@167: of to be mapped. TODO: Map them! sascha@167: sascha@167: * pom.xml: Added plugin config for hibernate. sascha@167: sascha@166: 2011-03-09 Sascha L. Teichmann sascha@166: sascha@166: * pom.xml: Added dependency (and corresponding repository) to sascha@166: Hibernate Core 3.6.1 Final sascha@166: sascha@165: 2011-03-09 Sascha L. Teichmann sascha@165: sascha@165: * pom.xml, src/**: Created a new empty maven project: sascha@165: $ mvn archetype:create \ sascha@165: -DgroupId=de.intevation.flys \ sascha@165: -DartifactId=flys-backend sascha@165: sascha@164: 2011-03-09 Sascha L. Teichmann sascha@164: sascha@164: * README: New. Some setup instructions. sascha@164: sascha@164: * doc/schema/postgresql.sql: New. Schema converted to PostgreSQL sascha@164: sascha@164: * doc/schema/sqlite.sql: Fixed defect foreign key constraints. sascha@164: sascha@163: 2011-03-09 Sascha L. Teichmann sascha@163: sascha@163: * doc/schema/sqlite.sql: Factorized time intervals out into sascha@163: a separated table. sascha@163: sascha@162: 2011-01-22 Sascha L. Teichmann sascha@162: sascha@162: * contrib/import-kms.py, contrib/import-gew.py: Initial scripts sascha@162: to import data into SQLite database. They still need some work. sascha@162: sascha@162: 2011-02-10 Sascha L. Teichmann : sascha@161: sascha@161: * doc/schema/sqlite.sql: Added initial schema for sascha@161: FLYS database.