--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressTask.java 2016/02/03 18:45:33 2903
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressTask.java 2016/02/16 13:15:25 2954
@@ -1,13 +1,15 @@
-package dk.daoas.adressevedligehold;
+package dk.daoas.adressevedligehold.fileupload;
import org.apache.commons.lang3.exception.ExceptionUtils;
+import dk.daoas.adressevedligehold.MailSender;
+import dk.daoas.adressevedligehold.ReloadHelper;
+import dk.daoas.adressevedligehold.afstandandenrute.AfstandAndenRuteTask;
import dk.daoas.adressevedligehold.tasks.Task;
import dk.daoas.adressevedligehold.tasks.TaskLogger;
import dk.daoas.adressevedligehold.util.TimingHelper;
/*
- * TODO: trigger indlæsning
*
*/
@@ -66,15 +68,21 @@
addrManager.dumpChanged();
}
- AddressReport report = new AddressReport(addrManager, entryCount, ugedage, source, timer, writeBack);
+ AddressReport report = new AddressReport(addrManager, entryCount, ugedage, source, timer, writeBack, addrManager.getDuplicateCount() );
report.sendRapport();
if (writeBack) {
ReloadHelper.triggerReload( "Indlaesning/" + source.getDistributor() );
+
+
+ if (source.calculateDistances()) {
+ Task tsk = new AfstandAndenRuteTask(source.getDistributor(), AfstandAndenRuteTask.INCREMENTAL);
+ manager.submitTask( tsk );
+ }
}
-
+
} catch(Exception e) {
@@ -83,7 +91,7 @@
body += "
";
body += "Exception:
";
body += ExceptionUtils.getStackTrace(e);
- AddressReport.sendMail(subject, body);
+ MailSender.sendMail(subject, body);
throw e; //rethrow exception
} finally {