--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/15 11:55:20	2299
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/23 14:39:49	2346
@@ -9,19 +9,26 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import dk.daoas.daoadresseservice.admin.ServiceConfig;
 import dk.daoas.daoadresseservice.beans.Address;
 import dk.daoas.daoadresseservice.beans.SearchResult;
 import dk.daoas.daoadresseservice.beans.SearchResult.Status;
 
 /**
- * Servlet implementation class SearchServlet
+ * Denne servlet forventer at Tomcat connector'en er konfigureret med 
+ * URIEncoding="UTF-8"
  */
 @WebServlet(urlPatterns = { "/SearchServlet", "/search" }, loadOnStartup = 1)
 public class SearchServlet extends HttpServlet {
 	
+	ServiceConfig config;
+	
 	@Override
 	public void init() throws ServletException {
 		super.init();
+		
+		config = (ServiceConfig) this.getServletContext().getAttribute("config");
+		
 		System.out.println("SearchServlet loaded");
 	}
 
@@ -38,9 +45,11 @@
 		AdressSearch search = (AdressSearch) this.getServletContext().getAttribute("search");
 		if (search == null) {
 			response.setContentType("text/xml; charset=UTF-8");
-			response.getWriter().print( 
+			response.getWriter().print(
+					"<result>" +
 					"<status>error</status>" + 
-					"<error>Service not ready</error>"
+					"<error>Service not ready</error>" +
+					"</result>"
 					);
 			return;
 			
@@ -51,7 +60,7 @@
 		//String adresseStr = getUtf8( request.getParameter("adresse") );
 		String adresseStr = request.getParameter("adresse");
 
-		SearchResult result = search.search(postnr, adresseStr);
+		SearchResult result = search.search(config, postnr, adresseStr);
 		
 		
 		StringBuilder sb = new StringBuilder();
@@ -76,6 +85,7 @@
 				Address t = result.address.extTarget;
 				sb.append("<extaddr>").append(t.vejnavn + " " + t.husnr + t.husnrbogstav + ", " + t.postnr).append("</extaddr>");
 			}
+			sb.append("<osm>").append(result.osm).append("</osm>");
 			sb.append("<google>").append(result.google).append("</google>");