--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java	2015/02/23 12:54:22	2339
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java	2015/02/24 11:18:47	2359
@@ -12,7 +12,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import dk.daoas.daoadresseservice.AddressUtils.SplitResult;
+import dk.daoas.daoadresseservice.admin.ServiceConfig;
 import dk.daoas.daoadresseservice.beans.Address;
 import dk.daoas.daoadresseservice.beans.DataStatisticsBean;
 import dk.daoas.daoadresseservice.beans.ExtendedBean;
@@ -30,36 +30,48 @@
 	
 	private Map<String,Long> helperCache;
 	
-	private DataStatisticsBean stats = new DataStatisticsBean(); 
+	private DataStatisticsBean stats = new DataStatisticsBean();
+	
+	ServiceConfig config;
+	
+	public AdressSearch(ServiceConfig config) {
+		this.config = config;
+	}
 	
 	
 	public SearchResult search(String postnrStr, String adresse)  {
 		
+		SearchResult result = new SearchResult();
+		
 		int postnr=0;
-		boolean google = false;
-		boolean osm = false;
+
 		String helperSearchKey = "";
 		
 		try {
 			postnr = Integer.parseInt(postnrStr);
 		} catch (Exception E) {
-			return new SearchResult(Status.ERROR_UNKNOWN_POSTAL);
+			result.status = Status.ERROR_UNKNOWN_POSTAL;
+			return result;
 		}		
 		
 		Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(postnr);			
 		
 		if (postnrVeje == null) {
-			return new SearchResult(Status.ERROR_UNKNOWN_POSTAL);
+			result.status = Status.ERROR_UNKNOWN_POSTAL;
+			return result;
 		}
 		
 		
-		SplitResult split = AddressUtils.splitAdresse(adresse);
-		String vasketVejnavn = AddressUtils.vaskVejnavn( split.vej );				
+		result.splitReult = AddressUtils.splitAdresse(adresse);
+						
 		
-		if (split.husnr.length() == 0) {
-			return new SearchResult(Status.ERROR_MISSING_HOUSENUMBER);			
+		if (result.splitReult.husnr.length() == 0) {
+			result.status = Status.ERROR_MISSING_HOUSENUMBER;
+			return result;
 		}
 		
+		String vasketVejnavn = AddressUtils.vaskVejnavn( result.splitReult.vej );
+		
 		Long gadeident =  postnrVeje.get(vasketVejnavn);
 		
 		
@@ -70,59 +82,73 @@
 		
 		
 		if ( gadeident == null) {
-			String googleVej = GeocodeHelper.googleHelper(postnr, split.vej );
-			google = true;
-			
-			if (googleVej != null) {
-				String googleVasket = AddressUtils.vaskVejnavn( googleVej );
-				gadeident =  postnrVeje.get(googleVasket);
+			if (config.useGoogle) {
+				result.googleVej = GeocodeHelper.googleHelper(config, postnr, result.splitReult.vej );
+				result.google = true;
 				
-				if (gadeident != null) {
-					helperCache.put(helperSearchKey, gadeident);
+				if (result.googleVej != null) {
+					String googleVasket = AddressUtils.vaskVejnavn( result.googleVej );
+					gadeident =  postnrVeje.get(googleVasket);
+					
+					if (gadeident != null) {
+						helperCache.put(helperSearchKey, gadeident);
+					}
 				}
 			}
 		}
 		
 		if ( gadeident == null) {
-			String osmVej = GeocodeHelper.openstreetmapHelper(postnr, split.vej );
-			osm = true;
-			
-			if (osmVej != null) {
-				String osmVasket = AddressUtils.vaskVejnavn( osmVej );
-				gadeident =  postnrVeje.get(osmVasket);
+			if (config.useOpenStreetMaps) {
+				result.osmVej = GeocodeHelper.openstreetmapHelper(postnr, result.splitReult.vej );
+				result.osm = true;
 				
-				if (gadeident != null) {
-					helperCache.put(helperSearchKey, gadeident);
+				if (result.osmVej != null) {
+					String osmVasket = AddressUtils.vaskVejnavn( result.osmVej );
+					gadeident =  postnrVeje.get(osmVasket);
+					
+					if (gadeident != null) {
+						helperCache.put(helperSearchKey, gadeident);
+					}
 				}
 			}
 		}
 		
-		if (gadeident == null) {
-			return new SearchResult(Status.ERROR_UNKNOWN_STREETNAME);
+		if (gadeident == null) {			
+			result.status = Status.ERROR_UNKNOWN_STREETNAME; 
+			return result;
 		}
 		
-		Map<String, Address> gade =  searchGadeidentAdresser.get(gadeident); //Denne søgning må ikke fejle
+		Map<String, Address> gade = searchGadeidentAdresser.get(gadeident); 
+		if (gade == null) { //Denne søgning må ikke fejle
+			result.status = Status.ERROR_INTERNAL; 
+			return result;			
+		}
 		
 		
-		String husnrSearch = "" + split.husnr + split.litra;
+		String husnrSearch = "" + result.splitReult.husnr + result.splitReult.litra;
 		Address addr = gade.get(husnrSearch);
 
 		if (addr == null) {
-			return new SearchResult(Status.ERROR_UNKNOWN_ADDRESSPOINT);
+			result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; 
+			return result;
 		}
 		
+		result.address = addr;
+		
+		if (addr.distributor.equals("LUKKET")) {			
+			result.status = Status.STATUS_NOT_COVERED; //Skal vi have en special status til Lukkede adresser ?
+			return result;
+		}				
+		
 		if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) {
-			return new SearchResult(Status.STATUS_NOT_COVERED);
+			result.status = Status.STATUS_NOT_COVERED; 
+			return result;
 		}
+
 		
-		if (addr.distributor.equals("LUKKET")) {
-			return new SearchResult(Status.STATUS_NOT_COVERED); //Skal vi have en special status til Lukkede adresser ?
-		}		
-		
-		SearchResult res = new SearchResult(addr);
-		res.google = google;
-		res.osm = osm;
-		return res;
+		result.status = Status.STATUS_OK;
+
+		return result;
 	}