--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/01/28 22:14:42	2876
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/02/04 08:32:08	2911
@@ -15,6 +15,7 @@
 import dk.daoas.adressevedligehold.beans.Address;
 import dk.daoas.adressevedligehold.beans.Address.AddressState;
 import dk.daoas.adressevedligehold.db.DatabaseLayerImplementation;
+import dk.daoas.adressevedligehold.tasks.TaskLogger;
 import dk.daoas.adressevedligehold.util.DeduplicateHelper;
 import dk.daoas.adressevedligehold.util.MiscUtils;
 import dk.daoas.adressevedligehold.util.TimingHelper;
@@ -28,6 +29,8 @@
 
 public class AddressManager {
 	
+	private TaskLogger logger = TaskLogger.getInstance();
+	
 	
 	List<Address> addressList;
 	
@@ -84,7 +87,7 @@
 			list.trimToSize();
 		}
 		
-		System.out.println("AddressManager ready, elapsed " + timer.getElapsed() + "ms");
+		logger.info("AddressManager ready, elapsed " + timer.getElapsed() + "ms");
 		
 		
 	}
@@ -181,8 +184,8 @@
 				continue;
 			}
 			
-			System.out.println(addr.state + ": " + addr.toStringExtended() );
-			System.out.println(addr.getRuteString() );
+			logger.info(addr.state + ": " + addr.toStringExtended() );
+			logger.info(addr.getRuteString() );
 			
 			if (count++ > 50)
 				return;
@@ -190,7 +193,7 @@
 	}
 	
 	public void writeBackChanges() {
-		System.out.println("Writing back changes");
+		logger.info("Writing back changes");
 		TimingHelper timer = new TimingHelper();
 		
 		List<Address> updates = new ArrayList<Address>(1024*1024);
@@ -212,7 +215,7 @@
 
 		
 		
-		System.out.println("Writeback done: elapsed " + timer.getElapsed() + "ms.");
+		logger.info("Writeback done: elapsed " + timer.getElapsed() + "ms.");
 	}
 	
 	
@@ -227,7 +230,10 @@
 	private void visitSingle(AddressSourceEntry entry) {
 		TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid );
 		if (gade == null) {
-			unknownStreets.putIfAbsent(entry.gadeid, entry.vejnavn);
+			if (! unknownStreets.containsKey(entry.gadeid)) {
+				unknownStreets.put(entry.gadeid, entry.vejnavn);				
+			}
+			
 			createFromEntry(entry); // if we get here there was no match - so we need to create it
 			return;
 		}
@@ -254,8 +260,11 @@
 		
 		TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid );
 		if (gade == null) {
-			unknownStreets.putIfAbsent(entry.gadeid, entry.vejnavn);
-			System.out.println("[Range] Ukendt gadeID " + entry);
+			if (! unknownStreets.containsKey(entry.gadeid)) {
+				unknownStreets.put(entry.gadeid, entry.vejnavn);				
+			}
+			
+			logger.info("[Range] Ukendt gadeID " + entry);
 			return;
 		}
 		
@@ -295,7 +304,7 @@
 	private void updateAddress(Address addr, AddressSourceEntry entry) {
 		if ( addr.distributor != null && addr.distributor.equals(entry.distributor) == false) {
 			rejectedEntries.add(entry);
-			System.out.println("Afviser " + entry);
+			logger.info("Afviser " + entry);
 			return;
 		}
 		
@@ -317,7 +326,7 @@
 					}
 				}				
 			} else {
-				System.out.println( "Double visit monday " + addr);
+				logger.info( "Double visit monday " + addr);
 			}
 
 		}
@@ -339,7 +348,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit tuesday " + addr);
+				logger.info( "Double visit tuesday " + addr);
 			}				
 		}
 
@@ -359,7 +368,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit wednesday " + addr);
+				logger.info( "Double visit wednesday " + addr);
 			}		
 		}
 
@@ -381,7 +390,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit thursday " + addr);
+				logger.info( "Double visit thursday " + addr);
 			}					
 		}
 
@@ -402,7 +411,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit friday " + addr);
+				logger.info( "Double visit friday " + addr);
 			}	
 		}
 
@@ -424,7 +433,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit saturday " + addr);
+				logger.info( "Double visit saturday " + addr);
 			}					
 		}
 
@@ -445,7 +454,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit sunday " + addr);
+				logger.info( "Double visit sunday " + addr);
 			}					
 		}
 		
@@ -473,6 +482,10 @@
 	
 	
 	private void createFromEntry(AddressSourceEntry entry) {
+		if (entry.husnr >= 1000) { //husnumre i DK må kun være på 3 cifre
+			return;
+		}
+		
 		if (entry.husnr == 999) {
 			return;
 		}
@@ -483,6 +496,10 @@
 			return;
 		}
 		
+		if (entry.gadeid == 0) {
+			return;
+		}
+		
 		String gadeidStr = Integer.toString(entry.gadeid);
 		if (gadeidStr.length() != 9) {
 			return;
@@ -493,7 +510,7 @@
 		
 		
 		
-		System.out.println("Opretter adresse ud fra " + entry);
+		logger.info("Opretter adresse ud fra " + entry);
 		
 		Address a = new Address();
 		a.state = AddressState.CREATED;
@@ -607,11 +624,11 @@
 			bane = 204;
 			break;
 		default:
-			throw new RuntimeException("Ukendt distributor" + a.distributor); //Silence findBugs
+			throw new RuntimeException("Ukendt distributor: " + a.distributor); //Silence findBugs
 		}
 		
 		if (bane == null) {
-			throw new RuntimeException("Ukendt bane for postnr" + a.postnr);
+			throw new RuntimeException("Ukendt bane for postnr: " + a.postnr);
 		}
 		
 		if (a.dbkBane != bane) {