--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java	2015/05/21 08:06:16	2550
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java	2015/11/26 14:25:41	2785
@@ -54,6 +54,8 @@
 
 
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		
+		response.setHeader("Access-Control-Allow-Origin", "*"); //Allow  ajax calls from everywhere
 
 		AddressSearch search = (AddressSearch) this.getServletContext().getAttribute("search");
 		if (search == null) {
@@ -67,6 +69,9 @@
 		String adresseStr = request.getParameter("adresse");
 		String omdeling = request.getParameter("omdeling");
 		
+		
+		String naermesteHusnrStr = request.getParameter("naermestehusnr");
+		
 		if (postnr == null) {
 			response.setContentType("text/xml; charset=UTF-8");
 			response.getWriter().print( generateErrorXML("Mangler postnr parameter") );
@@ -91,8 +96,16 @@
 			response.getWriter().print( generateErrorXML("Ugyldig omdelingsdag - Kun H, L og S er gyldig") );
 			return;			
 		}
+		boolean naermesteHusnr;		
+		if (naermesteHusnrStr == null || naermesteHusnrStr.equals("")) {
+			naermesteHusnr = false;
+		} else {
+			naermesteHusnr = Integer.parseInt( naermesteHusnrStr ) > 0;
+		}
+		
+		
 
-		SearchResult result = search.search(postnr, adresseStr);
+		SearchResult result = search.search(postnr, adresseStr, naermesteHusnr);
 		
 		
 		StringBuilder sb = new StringBuilder();
@@ -115,17 +128,24 @@
 			
 		sb.append("<error>").append( result.status ).append("</error>");
 		
-		if (omdeling.equals("H")) { //Hverdag
-			sb.append("<distrikt>").append( rute ).append("</distrikt>");
-			sb.append("<koreliste>").append( koreliste ).append("</koreliste>");
-		} else if (omdeling.equals("L")){
-			sb.append("<distrikt>").append( ruteLordag ).append("</distrikt>");
-			sb.append("<koreliste>").append( korelisteLordag ).append("</koreliste>");			
-		} else {
-			sb.append("<distrikt>").append( ruteSondag ).append("</distrikt>");
-			sb.append("<koreliste>").append( korelisteSondag ).append("</koreliste>");			
+		
+		
+		String valgtRute = rute; //Default til hverdags oplysningerne
+		String valgtKoreliste = koreliste;
+		
+
+		if (omdeling.equals("L") && ruteLordag.equals("") == false){
+			valgtRute = ruteLordag;
+			valgtKoreliste = korelisteLordag;			
+		} 
+		if (omdeling.equals("S") && ruteSondag.equals("") == false) {
+			valgtRute = ruteSondag;
+			valgtKoreliste = korelisteSondag;			
 		}
 		
+		sb.append("<distrikt>").append( valgtRute ).append("</distrikt>");
+		sb.append("<koreliste>").append( valgtKoreliste ).append("</koreliste>");
+		
 		
 		sb.append("<kommunekode>").append(result.address.kommunekode).append("</kommunekode>");
 		sb.append("<vejkode>").append(result.address.vejkode).append("</vejkode>");
@@ -156,6 +176,7 @@
 			
 			Address t = result.address.extTarget;
 			sb.append("<extaddr>").append(t.vejnavn + " " + t.husnr + t.husnrbogstav + ", " + t.postnr).append("</extaddr>");
+			sb.append("<extpos>").append(t.latitude).append(",").append(t.longitude).append("</extpos>");
 		}
 		
 		sb.append("<hverdag>").append(rute).append("  ").append(koreliste).append("</hverdag>");
@@ -163,7 +184,17 @@
 		sb.append("<soendag>").append(ruteSondag).append("  ").append(korelisteSondag).append("</soendag>");
 		
 		
+		
+		sb.append("<nearesthusnr>").append(result.nearestHusnr).append("</nearesthusnr>");
+		sb.append("<anvendthusnr>").append(result.anvendtHusnr).append("</anvendthusnr>");
+		sb.append("<nearestlitra>").append(result.nearestLitra).append("</nearestlitra>");
+		
+
 		sb.append("<levenshtein>").append(result.levenshtein).append("</levenshtein>");
+		sb.append("<levenshteindistance>").append(result.levenshteinDistance).append("</levenshteindistance>");
+		
+		sb.append("<metaphone>").append(result.metaphone).append("</metaphone>");
+		sb.append("<metaphonevej>").append(result.metaphoneVej).append("</metaphonevej>");
 		
 		sb.append("<osm>").append(result.osm).append("</osm>");
 		sb.append("<osmvej>").append(result.osmVej).append("</osmvej>");
@@ -177,11 +208,11 @@
 		response.setContentType("text/xml; charset=UTF-8");
 		response.getWriter().print( sb );
 		
-		logPersistance.saveRequestLog(brugerid, postnr, adresseStr, result);
+		logPersistance.saveRequestLog(search.getDatabaseLayer(), brugerid, postnr, adresseStr, omdeling, result);
 		
 	}
 	
-	private String generateErrorXML(String msg) {
+	public static String generateErrorXML(String msg) {
 		StringBuilder sb = new StringBuilder();
 		sb.append("<result>");
 		sb.append("<status>error</status>");