--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/01/28 11:07:07	2862
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/02/04 08:39:26	2912
@@ -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,12 +29,16 @@
 
 public class AddressManager {
 	
+	private TaskLogger logger = TaskLogger.getInstance();
+	
 	
 	List<Address> addressList;
 	
 	Map<Integer, TreeMap<Short, ArrayList<Address>> > searchStructure;
 	
-	ArrayList<AddressSourceEntry> afvisteEntries = new ArrayList<AddressSourceEntry>();
+	ArrayList<AddressSourceEntry> rejectedEntries = new ArrayList<AddressSourceEntry>();
+	
+	Map<Integer,String> unknownStreets = new TreeMap<Integer, String>();
 	
 	Map<Short,Short> dbkBaneMap = new TreeMap<Short,Short>();
 	
@@ -82,7 +87,7 @@
 			list.trimToSize();
 		}
 		
-		System.out.println("AddressManager ready, elapsed " + timer.getElapsed() + "ms");
+		logger.info("AddressManager ready, elapsed " + timer.getElapsed() + "ms");
 		
 		
 	}
@@ -179,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;
@@ -188,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);
@@ -206,10 +211,11 @@
 		DatabaseLayerImplementation db = new DatabaseLayerImplementation();
 		
 		db.updateAddresses(updates);
+		db.saveNewAddresses(inserts);
 
 		
 		
-		System.out.println("Writeback done: elapsed " + timer.getElapsed() + "ms.");
+		logger.info("Writeback done: elapsed " + timer.getElapsed() + "ms.");
 	}
 	
 	
@@ -224,6 +230,10 @@
 	private void visitSingle(AddressSourceEntry entry) {
 		TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid );
 		if (gade == null) {
+			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;
 		}
@@ -233,22 +243,28 @@
 			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) {
 		
 		TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid );
 		if (gade == null) {
-			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;
 		}
 		
@@ -287,8 +303,8 @@
 	
 	private void updateAddress(Address addr, AddressSourceEntry entry) {
 		if ( addr.distributor != null && addr.distributor.equals(entry.distributor) == false) {
-			afvisteEntries.add(entry);
-			System.out.println("Afviser " + entry);
+			rejectedEntries.add(entry);
+			logger.info("Afviser " + entry);
 			return;
 		}
 		
@@ -310,7 +326,7 @@
 					}
 				}				
 			} else {
-				System.out.println( "Double visit monday " + addr);
+				logger.info( "Double visit monday " + addr);
 			}
 
 		}
@@ -332,7 +348,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit tuesday " + addr);
+				logger.info( "Double visit tuesday " + addr);
 			}				
 		}
 
@@ -352,7 +368,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit wednesday " + addr);
+				logger.info( "Double visit wednesday " + addr);
 			}		
 		}
 
@@ -374,7 +390,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit thursday " + addr);
+				logger.info( "Double visit thursday " + addr);
 			}					
 		}
 
@@ -395,7 +411,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit friday " + addr);
+				logger.info( "Double visit friday " + addr);
 			}	
 		}
 
@@ -417,7 +433,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit saturday " + addr);
+				logger.info( "Double visit saturday " + addr);
 			}					
 		}
 
@@ -438,7 +454,7 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit sunday " + addr);
+				logger.info( "Double visit sunday " + addr);
 			}					
 		}
 		
@@ -466,22 +482,47 @@
 	
 	
 	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;
 		}
+		
+		if (entry.litra.length() > 1) { //litra må kun være på 1 tegn
+			return;
+		}
+		if (entry.litra.length() == 1) {
+			char litra = entry.litra.charAt(0);
+			if ( Character.isLetter(litra) == false ) {
+				return;
+			}
+			
+		}
+		
 		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) {
+		
+		if (entry.gadeid == 0) {
+			return;
+		}
+				
+		String gadeidStr = Integer.toString(entry.gadeid);
+		if (gadeidStr.length() != 9) {
+			return;
+		}
+		if (Short.parseShort(gadeidStr.substring(0, 4)) != entry.postnr) {
 			return; //gadeid / postnr mismatch
 		}
 		
 		
 		
-		System.out.println("Opretter adresse ud fra " + entry);
+		logger.info("Opretter adresse ud fra " + entry);
 		
 		Address a = new Address();
 		a.state = AddressState.CREATED;
@@ -593,11 +634,13 @@
 			break;
 		case "NS":
 			bane = 204;
-			break;			
+			break;
+		default:
+			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) {
@@ -612,10 +655,14 @@
 		return Collections.unmodifiableList(addressList);
 	}
 	
+	public Map<Integer,String> getUnknownStreets() {
+		return Collections.unmodifiableMap( unknownStreets );
+	}
+	
 	
 	
-	public int getAfvistAntal() {
-		return afvisteEntries.size();
+	public int getRejectedCount() {
+		return rejectedEntries.size();
 	}
 	
 }