Mercurial > dive4elements > river
changeset 6297:f812bd5fe2bf
Weird merge.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 12 Jun 2013 12:00:17 +0200 |
| parents | 4c2025ec109f (diff) 33ccce4a3aae (current diff) |
| children | 16182a08ccf7 |
| files | backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java |
| diffstat | 2 files changed, 24 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Wed Jun 12 11:52:19 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Wed Jun 12 12:00:17 2013 +0200 @@ -458,7 +458,7 @@ <dc:if test="dc:has-result()"> <floodmap> <dc:for-each> - <dc:variable name="combined_desc" expr="concat($facet_description, ' ', $a_creation, ' ', $collection_name)"/> + <dc:variable name="combined_desc" expr="concat($facet_description, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"/> <dc:element name="${facet_name}"> <dc:attribute name="description" value="${combined_desc}"/> <dc:attribute name="factory" value="winfo"/> @@ -477,7 +477,7 @@ <dc:filter expr="$out_name = 'cross_section'"> <dc:if test="dc:has-result()"> <waterlevels> - <dc:group expr="concat($river, ' ', $a_creation)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation))"> <dc:comment>Aheinecke: Why is this grouping different from the rest?</dc:comment> <longitudinal_section_columns description="{dc:group-key()}"> <dc:for-each> @@ -501,7 +501,7 @@ <dc:filter expr="$out_name = 'longitudinal_section'"> <dc:if test="dc:has-result()"> <waterlevels> - <dc:group expr="concat($river, ' ', $a_creation)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation))"> <dc:comment>Aheinecke: Why is this grouping different from the rest?</dc:comment> <longitudinal_section_columns description="{dc:group-key()}"> <dc:for-each> @@ -529,7 +529,7 @@ starts-with($facet_name, 'fix_reference_events_ls'))"> <dc:if test="dc:has-result()"> <waterlevels> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -557,7 +557,7 @@ starts-with($facet_name, 'fix_sector_average_dwt'))"> <dc:if test="dc:has-result()"> <waterlevels> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -582,7 +582,7 @@ starts-with($facet_name, 'fix_deviation_dwt'))"> <dc:if test="dc:has-result()"> <waterlevels> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -605,7 +605,7 @@ <dc:filter expr="$out_name = 'fix_derivate_curve' and $facet_name = 'fix_derivate_curve'"> <dc:if test="dc:has-result()"> <waterlevels> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -632,7 +632,7 @@ $facet_name = 'fix_wq_curve')"> <dc:if test="dc:has-result()"> <waterlevels> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -675,7 +675,7 @@ <dc:filter expr="$out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w'"> <dc:if test="dc:has-result()"> <waterlevels> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ', @@ -720,7 +720,7 @@ $facet_name = 'bed_longitudinal_section.bed_diameter_sublayer')"> <dc:if test="dc:has-result()"> <bed_quality_bed> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <quality-bed description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -744,7 +744,7 @@ $facet_name = 'bed_longitudinal_section.bedload_diameter'"> <dc:if test="dc:has-result()"> <bed_quality_load> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <quality-load description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -769,7 +769,7 @@ $facet_name = 'bed_longitudinal_section.sediment_density_sublayer')"> <dc:if test="dc:has-result()"> <bed_quality_density> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <density description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -794,7 +794,7 @@ $facet_name = 'bed_longitudinal_section.porosity_sublayer')"> <dc:if test="dc:has-result()"> <bed_quality_porosity> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <porosity description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -821,7 +821,7 @@ $facet_name = 'flow_velocity.mainchannel.filtered')"> <dc:if test="dc:has-result()"> <flow-velocity> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <flow description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -844,7 +844,7 @@ <dc:filter expr="$out_name = 'sedimentload_ls' and starts-with($facet_name, 'sedimentload')"> <dc:if test="dc:has-result()"> <sediment-load> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <load description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -868,7 +868,7 @@ (starts-with($facet_name, 'bedheight_difference.year') or starts-with($facet_name, 'bedheight_difference.epoch'))"> <dc:if test="dc:has-result()"> <bedheight-differences> - <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <difference description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -891,7 +891,7 @@ <dc:filter expr="$out_name = 'discharge_longitudinal_section' and $facet_name = 'discharge_longitudinal_section.w"> <dc:if test="dc:has-result()"> <waterlevels-discharge> - <dc:group expr="concat($oid, ' ', $river, ' ', $a_id, ' ', $a_creation, ' ', $collection_name)"> + <dc:group expr="concat($oid, ' ', $river, ' ', $a_id, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> <discharge description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}">
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java Wed Jun 12 11:52:19 2013 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java Wed Jun 12 12:00:17 2013 +0200 @@ -116,13 +116,12 @@ ImportBedHeight obj = newImportBedHeight(file.getName().replaceAll("\\.csv", "")); - LineNumberReader in = null; + LineNumberReader in = + new LineNumberReader( + new InputStreamReader( + new FileInputStream(file), ENCODING)); + try { - in = - new LineNumberReader( - new InputStreamReader( - new FileInputStream(file), ENCODING)); - String line = null; while ((line = in.readLine()) != null) { if ((line = line.trim()).length() == 0) { @@ -141,9 +140,7 @@ bedHeights.add(obj); } finally { - if (in != null) { - in.close(); - } + in.close(); } } @@ -333,7 +330,7 @@ String tmp = m.group(1).replace(";", "").trim(); BedHeightType bht = BedHeightType.fetchBedHeightTypeForType( - tmp, ImporterSession.getInstance().getDatabaseSession()); + tmp, ImporterSession.getInstance().getDatabaseSession()); if (bht != null) { obj.setType(new ImportBedHeightType(bht));