Mercurial > dive4elements > river
diff flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java @ 5416:4ee97d914501
Morpho-Importer: Do not mask database exceptions as broken files
author | Tom Gottfried <tom.gottfried@intevation.de> |
---|---|
date | Tue, 26 Mar 2013 09:39:34 +0100 |
parents | dba703edfff1 |
children | 473edafe4cb1 |
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java Tue Mar 26 09:40:05 2013 +0100 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java Tue Mar 26 09:39:34 2013 +0100 @@ -1237,15 +1237,8 @@ log.debug("name: " + desc); - try { - single.storeDependencies(river); - } - catch (SQLException sqle) { - log.error("File '" + desc + "' is broken!"); - } - catch (ConstraintViolationException cve) { - log.error("File '" + desc + "' is broken!"); - } + single.storeDependencies(river); + } } else { @@ -1265,15 +1258,8 @@ log.debug("name: " + desc); - try { - epoch.storeDependencies(river); - } - catch (SQLException sqle) { - log.error("File '" + desc + "' is broken!"); - } - catch (ConstraintViolationException cve) { - log.error("File '" + desc + "' is broken!"); - } + epoch.storeDependencies(river); + } } else { @@ -1292,15 +1278,8 @@ log.debug("name: " + desc); - try { - density.storeDependencies(river); - } - catch (SQLException sqle) { - log.error("File '" + desc + "' is broken!"); - } - catch (ConstraintViolationException cve) { - log.error("File '" + desc + "' is broken!"); - } + density.storeDependencies(river); + } } } @@ -1312,15 +1291,9 @@ River river = getPeer(); for (ImportMorphWidth width: morphologicalWidths) { - try { - width.storeDependencies(river); - } - catch (SQLException sqle) { - log.error("Error while parsing file for morph. width.", sqle); - } - catch (ConstraintViolationException cve) { - log.error("Error while parsing file for morph. width.", cve); - } + + width.storeDependencies(river); + } } } @@ -1332,27 +1305,15 @@ River river = getPeer(); for (ImportFlowVelocityModel flowVelocityModel: flowVelocityModels){ - try { - flowVelocityModel.storeDependencies(river); - } - catch (SQLException sqle) { - log.error("Error while storing flow velocity model.", sqle); - } - catch (ConstraintViolationException cve) { - log.error("Error while storing flow velocity model.", cve); - } + + flowVelocityModel.storeDependencies(river); + } for (ImportFlowVelocityMeasurement m: flowVelocityMeasurements) { - try { - m.storeDependencies(river); - } - catch (SQLException sqle) { - log.error("Error while storing flow velocity measurement.", sqle); - } - catch (ConstraintViolationException cve) { - log.error("Error while storing flow velocity measurement.", cve); - } + + m.storeDependencies(river); + } } } @@ -1365,15 +1326,9 @@ River river = getPeer(); for (ImportSedimentYield sedimentYield: sedimentYields) { - try { - sedimentYield.storeDependencies(river); - } - catch (SQLException sqle) { - log.error("Error while storing sediment yield.", sqle); - } - catch (ConstraintViolationException cve) { - log.error("Error while storing sediment yield.", cve); - } + + sedimentYield.storeDependencies(river); + } } } @@ -1388,18 +1343,12 @@ int count = 0; for (ImportMeasurementStation station: measurementStations) { - try { - boolean success = station.storeDependencies(river); - if (success) { - count++; - } - } - catch (SQLException sqle) { - log.error("Error while storing measurement station.", sqle); - } - catch (ConstraintViolationException cve) { - log.error("Error while storing measurement station.", cve); - } + + boolean success = station.storeDependencies(river); + if (success) { + count++; + } + } log.info("stored " + count + " measurement stations."); @@ -1416,16 +1365,10 @@ int count = 0; for (ImportSQRelation sqRelation: sqRelations) { - try { - sqRelation.storeDependencies(river); - count++; - } - catch (SQLException sqle) { - log.error("Error while storing sq relation.", sqle); - } - catch (ConstraintViolationException cve) { - log.error("Error while storing sq relation.", cve); - } + + sqRelation.storeDependencies(river); + count++; + } log.info("stored " + count + " sq relations.");