--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/16 14:25:18	2311
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/24 11:48:58	2364
@@ -9,6 +9,7 @@
 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;
@@ -20,9 +21,14 @@
 @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");
 	}
 
@@ -51,7 +57,6 @@
 		
 		String brugerid = request.getParameter("brugerid");
 		String postnr = request.getParameter("postnr");
-		//String adresseStr = getUtf8( request.getParameter("adresse") );
 		String adresseStr = request.getParameter("adresse");
 
 		SearchResult result = search.search(postnr, adresseStr);
@@ -79,8 +84,12 @@
 				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("<osmvej>").append(result.osmVej).append("</osmvej>");
+			
 			sb.append("<google>").append(result.google).append("</google>");
+			sb.append("<googlevej>").append(result.googleVej).append("</googlevej>");
 			
 			
 		} else {