diff flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobExecutor.java @ 1650:aaf8d32f85bd

Improved Facet creation for floodmaps - WSPLGEN and barriers Facets are only created if the calculation was successful. flys-artifacts/trunk@2837 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 27 Sep 2011 12:40:42 +0000
parents e7d5452a7381
children ef2300b450bf
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobExecutor.java	Tue Sep 27 11:33:45 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobExecutor.java	Tue Sep 27 12:40:42 2011 +0000
@@ -79,8 +79,6 @@
                 }
                 catch (InterruptedException iee) { /* do nothing */ }
 
-                job.getCallContext().afterBackground(CallContext.STORE);
-
                 logger.info("WSPLGEN exit value: " + process.exitValue());
                 logger.info(
                     "WSPLGEN throw " +
@@ -89,7 +87,15 @@
                     "WSPLGEN throw " +
                     errorObserver.numWarnings() + " warnings.");
 
-                MapfileGenerator.getInstance().update();
+                if (process.exitValue() < 2 && errorObserver.numErrors() == 0) {
+                    FacetCreator fc = job.getFacetCreator();
+                    fc.createWSPLGENFacet();
+                    fc.finish();
+
+                    MapfileGenerator.getInstance().update();
+                }
+
+                job.getCallContext().afterBackground(CallContext.STORE);
 
                 return;
             }

http://dive4elements.wald.intevation.org