--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/13 14:17:43	2277
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/14 09:31:46	2292
@@ -9,13 +9,23 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import dk.daoas.daoadresseservice.SearchResult.Status;
+import dk.daoas.daoadresseservice.beans.Address;
+import dk.daoas.daoadresseservice.beans.SearchResult;
+import dk.daoas.daoadresseservice.beans.SearchResult.Status;
 
 /**
  * Servlet implementation class SearchServlet
  */
 @WebServlet(urlPatterns = { "/SearchServlet", "/search" }, loadOnStartup = 1)
 public class SearchServlet extends HttpServlet {
+	
+	@Override
+	public void init() throws ServletException {
+		super.init();
+		System.out.println("SearchServlet loaded");
+	}
+
+
 	private static final long serialVersionUID = 1L;
 	
 	String getUtf8(String str) throws UnsupportedEncodingException {
@@ -24,17 +34,20 @@
        
 
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+//long start1 = System.currentTimeMillis();
 		AdressSearch search = (AdressSearch) this.getServletContext().getAttribute("search");
 		request.setCharacterEncoding("UTF-8");
 		
 		String brugerid = request.getParameter("brugerid");
 		String postnr = request.getParameter("postnr");
-		String adresseStr = getUtf8( request.getParameter("adresse") );
-		
-		//System.out.println (">" + postnr + " | " + adresseStr);
+		//String adresseStr = getUtf8( request.getParameter("adresse") );
+		String adresseStr = request.getParameter("adresse");
 
+//long start2 = System.currentTimeMillis();
 		SearchResult result = search.search(postnr, adresseStr);
 		
+//long start3 = System.currentTimeMillis();
+		
 		StringBuilder sb = new StringBuilder();
 		sb.append("<result>");
 		
@@ -49,7 +62,14 @@
 			//Extra information
 			sb.append("<daekning>").append(result.address.daekningsType).append("</daekning>");
 			sb.append("<distributor>").append(result.address.distributor).append("</distributor>");
-			sb.append("<extafstand>").append(result.address.extAfstand).append("</extafstand>");
+			if (result.address.daekningsType == DaekningsType.DAEKNING_UDVIDET) {
+				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("<google>").append(result.google).append("</google>");
+			
 			
 		} else {
 			sb.append("<status>error</status>");
@@ -59,8 +79,13 @@
 		
 		response.setContentType("text/xml; charset=UTF-8");
 		response.getWriter().print( sb );
-		
-		
+	
+/*
+long start4 = System.currentTimeMillis();		
+System.out.println("Servlet2:" + (start2-start1) );
+System.out.println("Servlet3:" + (start3-start1) );
+System.out.println("Servlet4:" + (start4-start1) );
+*/
 		
 	}