diff flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java @ 2809:f283212966e8

Finished work on MINFO bed heights (single). flys-backend/trunk@4221 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Thu, 12 Apr 2012 10:42:46 +0000
parents 33f40b23edd8
children 04eeb45df27b
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Wed Apr 11 13:12:52 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Thu Apr 12 10:42:46 2012 +0000
@@ -13,6 +13,8 @@
 import java.io.File;
 import java.io.IOException;
 
+import java.sql.SQLException;
+
 import org.apache.log4j.Logger;
 
 import de.intevation.artifacts.common.utils.FileTools;
@@ -32,6 +34,7 @@
 
 import org.hibernate.Session;
 import org.hibernate.Query;
+import org.hibernate.exception.ConstraintViolationException;
 
 public class ImportRiver
 {
@@ -232,7 +235,9 @@
         File epochDir     = new File(bedHeightDir, BED_HEIGHT_EPOCH_DIR);
 
         parseBedHeightSingles(singlesDir);
-        parseBedHeightEpochs(epochDir);
+        //parseBedHeightEpochs(epochDir);
+
+        log.info("Finished parsing bed heights.");
     }
 
 
@@ -702,10 +707,24 @@
 
             if (bedHeightSingles != null) {
                 for (ImportBedHeightSingle single: bedHeightSingles) {
-                    log.debug("name: " + single.getDescription());
-                    single.storeDependencies(river);
+                    String desc = single.getDescription();
+
+                    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!");
+                    }
                 }
             }
+            else {
+                log.info("No single bed heights to store.");
+            }
 
             if (bedHeightEpochs != null) {
                 for (ImportBedHeightEpoch epoch: bedHeightEpochs) {
@@ -713,6 +732,9 @@
                     epoch.storeDependencies(river);
                 }
             }
+            else {
+                log.info("No epoch bed heights to store.");
+            }
         }
     }
 

http://dive4elements.wald.intevation.org