--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java	2015/02/15 10:14:07	2297
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java	2015/02/15 11:00:48	2298
@@ -28,16 +28,15 @@
 	
 	
 	public SearchResult search(String postnrStr, String adresse)  {
-//long start1 = System.currentTimeMillis();
 		
 		int postnr=0;
+		boolean google = false;
 		
 		try {
 			postnr = Integer.parseInt(postnrStr);
 		} catch (Exception E) {
 			return new SearchResult(Status.ERROR_UNKNOWN_POSTAL);
 		}		
-//long start2 = System.currentTimeMillis();
 		
 		Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(postnr);			
 		
@@ -45,7 +44,6 @@
 			return new SearchResult(Status.ERROR_UNKNOWN_POSTAL);
 		}
 		
-//long start3 = System.currentTimeMillis();
 		
 		SplitResult split = AddressUtils.splitAdresse(adresse);
 		String vasketVejnavn = AddressUtils.vaskVejnavn( split.vej );				
@@ -53,21 +51,25 @@
 		if (split.husnr.length() == 0) {
 			return new SearchResult(Status.ERROR_MISSING_HOUSENUMBER);			
 		}
-//long start4 = System.currentTimeMillis();
 		
 		Long gadeident =  postnrVeje.get(vasketVejnavn);
+		if ( gadeident == null) {
+			String googleVej = GeocodeHelper.googleHelper(postnr, split.vej );
+			String googleVasket = AddressUtils.vaskVejnavn( googleVej );
+			gadeident =  postnrVeje.get(googleVasket);
+			google = true;
+		}
+		
 		if (gadeident == null) {
 			return new SearchResult(Status.ERROR_UNKNOWN_STREETNAME);
 		}
-//long start5 = System.currentTimeMillis();
 		
 		Map<String, Address> gade =  searchGadeidentAdresser.get(gadeident); //Denne søgning må ikke fejle
 		
-//long start6 = System.currentTimeMillis();
 		
 		String husnrSearch = "" + split.husnr + split.litra;
 		Address addr = gade.get(husnrSearch);
-//long start7 = System.currentTimeMillis();
+
 		if (addr == null) {
 			return new SearchResult(Status.ERROR_UNKNOWN_ADDRESSPOINT);
 		}
@@ -78,20 +80,11 @@
 		
 		if (addr.distributor.equals("LUKKET")) {
 			return new SearchResult(Status.STATUS_NOT_COVERED); //Skal vi have en special status til Lukkede adresser ?
-		}
-		
-/*
-System.out.println("Search2: " + (start2-start1) );
-System.out.println("Search3: " + (start3-start1) );
-System.out.println("Search4: " + (start4-start1) );
-System.out.println("Search5: " + (start5-start1) );
-System.out.println("Search6: " + (start6-start1) );
-System.out.println("Search7: " + (start7-start1) );
-*/
-
-				
+		}		
 		
-		return new SearchResult(addr);
+		SearchResult res = new SearchResult(addr);
+		res.google = google;
+		return res;
 	}