--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/01/27 20:45:49	2854
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/01/28 16:12:28	2868
@@ -33,7 +33,7 @@
 	
 	Map<Integer, TreeMap<Short, ArrayList<Address>> > searchStructure;
 	
-	ArrayList<AddressSourceEntry> afvisteEntries = new ArrayList<AddressSourceEntry>();
+	ArrayList<AddressSourceEntry> rejectedEntries = new ArrayList<AddressSourceEntry>();
 	
 	Map<Short,Short> dbkBaneMap = new TreeMap<Short,Short>();
 	
@@ -233,15 +233,17 @@
 			createFromEntry(entry); // if we get here there was no match - so we need to create it
 			return;
 		}
-		
+		boolean found = false;
 		for (Address addr : litraList) {
 			if (addr.husnrbogstav.equals(entry.litra) ) {
 				updateAddress(addr, entry);
-				return; //Done for now - no need to look at the rest of the list
+				found = true; // 1 visit should be enough but as long as there's duplicates on gadeid+husnr+litra we will visit them all
+				//when the issue with duplicates is resolved this should be reverted to a return or break
 			}
 		}
-		
-		createFromEntry(entry); // if we get here there was no match - so we need to create it
+		if (found == false) {
+			createFromEntry(entry); // if we get here there was no match - so we need to create it
+		}
 	}
 	
 	private void visitRange(AddressSourceEntry entry) {
@@ -287,7 +289,7 @@
 	
 	private void updateAddress(Address addr, AddressSourceEntry entry) {
 		if ( addr.distributor != null && addr.distributor.equals(entry.distributor) == false) {
-			afvisteEntries.add(entry);
+			rejectedEntries.add(entry);
 			System.out.println("Afviser " + entry);
 			return;
 		}
@@ -444,7 +446,7 @@
 		
 		
 		
-		addr.visited = true;
+		//addr.visited = true;
 		if (addr.state == AddressState.NOT_CHANGED) {
 			if (addr.distributor == null) {
 				addr.state = AddressState.OPENED;
@@ -472,6 +474,9 @@
 		if (entry.kommunekode == 0 || entry.vejkode == 0) {
 			return;
 		}
+		if (entry.kommunekode < 100) {
+			return;
+		}
 		if (Short.parseShort(Integer.toString(entry.gadeid).substring(0, 4)) != entry.postnr) {
 			return; //gadeid / postnr mismatch
 		}
@@ -491,7 +496,7 @@
 		a.husnr = entry.husnr;
 		a.husnrbogstav = entry.litra;
 		a.postnr = entry.postnr;
-		a.visited = true;
+		//a.visited = true;
 		
 		if (entry.ugedage.mandag) {
 			a.ruteMandag = entry.rute;
@@ -590,7 +595,9 @@
 			break;
 		case "NS":
 			bane = 204;
-			break;			
+			break;
+		default:
+			throw new RuntimeException("Ukendt distributor" + a.distributor); //Silence findBugs
 		}
 		
 		if (bane == null) {
@@ -611,8 +618,8 @@
 	
 	
 	
-	public int getAfvistAntal() {
-		return afvisteEntries.size();
+	public int getRejectedCount() {
+		return rejectedEntries.size();
 	}
 	
 }