--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/14 09:31:46	2292
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/25 09:52:34	2375
@@ -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,47 +8,81 @@
 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;
 
 /**
- * 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 {
 	
+	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 {
-//long start1 = System.currentTimeMillis();
+
 		AdressSearch search = (AdressSearch) this.getServletContext().getAttribute("search");
-		request.setCharacterEncoding("UTF-8");
+		if (search == null) {
+			response.setContentType("text/xml; charset=UTF-8");
+			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();
+		}
 
-//long start2 = System.currentTimeMillis();
 		SearchResult result = search.search(postnr, adresseStr);
 		
-//long start3 = System.currentTimeMillis();
 		
 		StringBuilder sb = new StringBuilder();
-		sb.append("<result>");
+		sb.append("<result>\n");
 		
 		if (result.status == Status.STATUS_OK) {
 			sb.append("<status>ok</status>");
@@ -58,8 +91,10 @@
 			sb.append("<kommunekode>").append(result.address.kommunekode).append("</kommunekode>");
 			sb.append("<vejkode>").append(result.address.vejkode).append("</vejkode>");
 			sb.append("<dbkbane>").append(result.address.dbkBane).append("</dbkbane>");
+			sb.append("\n");
 			
 			//Extra information
+			sb.append("<vejnavn>").append(result.address.vejnavn).append("</vejnavn>");
 			sb.append("<daekning>").append(result.address.daekningsType).append("</daekning>");
 			sb.append("<distributor>").append(result.address.distributor).append("</distributor>");
 			if (result.address.daekningsType == DaekningsType.DAEKNING_UDVIDET) {
@@ -68,7 +103,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 {
@@ -79,14 +119,20 @@
 		
 		response.setContentType("text/xml; charset=UTF-8");
 		response.getWriter().print( sb );
+		
+		logPersistance.saveRequestLog(brugerid, postnr, adresseStr, result);
+		
+	}
 	
-/*
-long start4 = System.currentTimeMillis();		
-System.out.println("Servlet2:" + (start2-start1) );
-System.out.println("Servlet3:" + (start3-start1) );
-System.out.println("Servlet4:" + (start4-start1) );
-*/
+	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();
+		 
 	}
 
 }