--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/03/24 12:38:21	2490
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/03/24 17:19:16	2491
@@ -27,6 +27,7 @@
 import dk.daoas.daoadresseservice.beans.SearchResult;
 import dk.daoas.daoadresseservice.beans.SearchResult.Status;
 import dk.daoas.daoadresseservice.db.DatabaseLayer;
+import dk.daoas.daoadresseservice.util.DeduplicateHelper;
 
 public class AddressSearch {
 
@@ -209,6 +210,8 @@
 		
 		/* Mapper mellem db Row ID og adresse noden */
 		Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() );
+		DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>();
+		DeduplicateHelper<String> husnrHelper = new DeduplicateHelper<String>();
 		
 		for (Address a : alleAdresser) {
 			idAddressMap.put(a.id, a);
@@ -219,6 +222,7 @@
 				postnrVeje = new ConcurrentHashMap<String,Integer>();
 				searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje);
 			}
+				
 			
 			String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
 			Integer gadeident = postnrVeje.get(vasketVejnavn);
@@ -230,6 +234,8 @@
 				Set<String> aliaser = findVejAliaser(a.vejnavn);
 				for(String alias : aliaser) {
 					String vasketAlias = AddressUtils.vaskVejnavn(alias);
+					vasketAlias = aliasHelper.getInstance(vasketAlias);
+					
 					postnrVeje.put(vasketAlias, gadeident);	
 				}				
 			}
@@ -240,6 +246,7 @@
 				searchGadeidentAdresser.put(gadeident, gade);
 			}
 			String husnrSearch = "" + a.husnr + a.husnrbogstav;
+			husnrSearch = husnrHelper.getInstance(husnrSearch);
 			gade.put(husnrSearch, a);			
 		}
 		
@@ -283,6 +290,9 @@
 		System.out.println("Build, stage2 elapsed: " + (start3-start2) );
 		System.out.println("Build -- stage 3 udvidet dækning");
 		
+		DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>();
+		DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>();
+		
 		List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist();
 		for (ExtendedBean eb : extDao) {
 			
@@ -307,7 +317,9 @@
 
 			boolean covered = false;
 			if (targetAddress.distributor.equals("DAO")) {
-				orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress);				
+				orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress);	
+				orgAddress.rute = ruteHelper.getInstance(orgAddress.rute);
+				
 				if (orgAddress.rute != null) {
 					orgAddress.koreliste = targetAddress.koreliste;
 					covered = true;
@@ -315,7 +327,9 @@
 			}
 			
 			if (targetAddress.distributor.equals("BK")) {
-				orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress);				
+				orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress);
+				orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste);
+				
 				if (orgAddress.koreliste != null) {
 					orgAddress.rute = targetAddress.rute;
 					covered = true;