--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java	2015/10/15 14:30:28	2751
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java	2016/01/14 13:07:37	2812
@@ -54,9 +54,13 @@
 
 
 	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) {
+			System.out.println("Recieved request while loading data");
+			
 			response.setContentType("text/xml; charset=UTF-8");
 			response.getWriter().print( generateErrorXML("Service not ready") );
 			return;			
@@ -67,6 +71,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 +98,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();
@@ -162,7 +177,8 @@
 			sb.append("<extafstand>").append(result.address.extAfstand).append("</extafstand>");
 			
 			Address t = result.address.extTarget;
-			sb.append("<extaddr>").append(t.vejnavn + " " + t.husnr + t.husnrbogstav + ", " + t.postnr).append("</extaddr>");
+			sb.append("<extaddr>").append(t.vejnavn + " " + t.husnr + t.husnrbogstav).append("</extaddr>");
+			sb.append("<extpost>").append(t.postnr).append("</extpost>");
 			sb.append("<extpos>").append(t.latitude).append(",").append(t.longitude).append("</extpos>");
 		}
 		
@@ -171,9 +187,18 @@
 		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>");
 		
@@ -190,7 +215,7 @@
 		
 	}
 	
-	private String generateErrorXML(String msg) {
+	public static String generateErrorXML(String msg) {
 		StringBuilder sb = new StringBuilder();
 		sb.append("<result>");
 		sb.append("<status>error</status>");