--- 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/26 15:47:07	2389
@@ -1,7 +1,6 @@
 package dk.daoas.daoadresseservice;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -9,9 +8,11 @@
 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;
+import dk.daoas.daoadresseservice.db.LogPersistance;
 
 /**
  * Denne servlet forventer at Tomcat connector'en er konfigureret med 
@@ -20,39 +21,62 @@
 @WebServlet(urlPatterns = { "/SearchServlet", "/search" }, loadOnStartup = 1)
 public class SearchServlet extends HttpServlet {
 	
+	private static final long serialVersionUID = 1L;
+	LogPersistance logPersistance;		
+	ServiceConfig config;
+	
 	@Override
 	public void init() throws ServletException {
 		super.init();
+		
+		config = (ServiceConfig) this.getServletContext().getAttribute("config");
+		logPersistance = new LogPersistance();
+		
 		System.out.println("SearchServlet loaded");
 	}
 
-
-	private static final long serialVersionUID = 1L;
-	
-	String getUtf8(String str) throws UnsupportedEncodingException {
-		 return new String( str.getBytes("iso-8859-1"), "UTF-8");
+	@Override
+	public void destroy() {
+		super.destroy();
+		
+		if (logPersistance != null) {
+			logPersistance.shutdown();
+		}
+		System.out.println("SearchServlet destroyed");
 	}
-       
+
+
+
+
+
 
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
 		AdressSearch search = (AdressSearch) this.getServletContext().getAttribute("search");
 		if (search == null) {
 			response.setContentType("text/xml; charset=UTF-8");
-			response.getWriter().print(
-					"<result>" +
-					"<status>error</status>" + 
-					"<error>Service not ready</error>" +
-					"</result>"
-					);
-			return;
-			
+			response.getWriter().print( generateErrorXML("Service not ready") );
+			return;			
 		}
 		
 		String brugerid = request.getParameter("brugerid");
 		String postnr = request.getParameter("postnr");
-		//String adresseStr = getUtf8( request.getParameter("adresse") );
 		String adresseStr = request.getParameter("adresse");
+		
+		if (postnr == null) {
+			response.setContentType("text/xml; charset=UTF-8");
+			response.getWriter().print( generateErrorXML("Mangler postnr parameter") );
+			return;			
+		}
+		
+		if (adresseStr == null) {
+			response.setContentType("text/xml; charset=UTF-8");
+			response.getWriter().print( generateErrorXML("Mangler adresse parameter") );
+			return;			
+		}
+		if (brugerid == null) {
+			brugerid = request.getRemoteHost();
+		}
 
 		SearchResult result = search.search(postnr, adresseStr);
 		
@@ -79,8 +103,15 @@
 				Address t = result.address.extTarget;
 				sb.append("<extaddr>").append(t.vejnavn + " " + t.husnr + t.husnrbogstav + ", " + t.postnr).append("</extaddr>");
 			}
+			
+			
+			sb.append("<levenshtein>").append(result.levenshtein).append("</levenshtein>");
+			
 			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 {
@@ -92,6 +123,19 @@
 		response.setContentType("text/xml; charset=UTF-8");
 		response.getWriter().print( sb );
 		
+		logPersistance.saveRequestLog(brugerid, postnr, adresseStr, result);
+		
+	}
+	
+	private String generateErrorXML(String msg) {
+		StringBuilder sb = new StringBuilder();
+		sb.append("<result>");
+		sb.append("<status>error</status>"); 
+		sb.append("<error>").append(msg).append("</error>");
+		sb.append("</result>");
+		
+		return sb.toString();
+		 
 	}
 
 }