--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/24 20:38:56	2372
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java	2015/05/21 08:06:16	2550
@@ -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,7 +8,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import dk.daoas.daoadresseservice.admin.ServiceConfig;
+import org.apache.commons.lang3.StringUtils;
+
 import dk.daoas.daoadresseservice.beans.Address;
 import dk.daoas.daoadresseservice.beans.SearchResult;
 import dk.daoas.daoadresseservice.beans.SearchResult.Status;
@@ -23,44 +23,74 @@
 public class SearchServlet extends HttpServlet {
 	
 	private static final long serialVersionUID = 1L;
-	LogPersistance logPersistance;		
-	ServiceConfig config;
+	
+	
+	private transient LogPersistance logPersistance;		
+	//transient ServiceConfig config;
 	
 	@Override
 	public void init() throws ServletException {
 		super.init();
 		
-		config = (ServiceConfig) this.getServletContext().getAttribute("config");
+		//config = (ServiceConfig) this.getServletContext().getAttribute("config");
 		logPersistance = new LogPersistance();
 		
 		System.out.println("SearchServlet loaded");
 	}
-	
 
-	
-	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");
+		AddressSearch search = (AddressSearch) 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 = request.getParameter("adresse");
+		String omdeling = request.getParameter("omdeling");
+		
+		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();
+		}
+		
+		if (omdeling == null || omdeling.equals("") ) {
+			omdeling = "H";
+		}
+		
+		if ( omdeling.equals("H") == false && omdeling.equals("L") == false && omdeling.equals("S") == false ) {
+			response.setContentType("text/xml; charset=UTF-8");
+			response.getWriter().print( generateErrorXML("Ugyldig omdelingsdag - Kun H, L og S er gyldig") );
+			return;			
+		}
 
 		SearchResult result = search.search(postnr, adresseStr);
 		
@@ -70,35 +100,78 @@
 		
 		if (result.status == Status.STATUS_OK) {
 			sb.append("<status>ok</status>");
-			sb.append("<distrikt>").append(result.address.rute).append("</distrikt>");
-			sb.append("<koreliste>").append(result.address.koreliste).append("</koreliste>");
-			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) {
-				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("<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 {
 			sb.append("<status>error</status>");
-			sb.append("<error>").append( result.status ).append("</error>");
 		}
+		
+		String rute = StringUtils.defaultString(result.address.rute); //Sikre at der ikke sendes "null" tilbage
+		String koreliste = StringUtils.defaultString(result.address.koreliste); //Sikre at der ikke sendes "null" tilbage
+
+		String ruteLordag = StringUtils.defaultString(result.address.ruteLordag); //Sikre at der ikke sendes "null" tilbage
+		String korelisteLordag = StringUtils.defaultString(result.address.korelisteLordag); //Sikre at der ikke sendes "null" tilbage
+		
+		String ruteSondag = StringUtils.defaultString(result.address.ruteSondag); //Sikre at der ikke sendes "null" tilbage
+		String korelisteSondag = StringUtils.defaultString(result.address.korelisteSondag); //Sikre at der ikke sendes "null" tilbage
+			
+		sb.append("<error>").append( result.status ).append("</error>");
+		
+		if (omdeling.equals("H")) { //Hverdag
+			sb.append("<distrikt>").append( rute ).append("</distrikt>");
+			sb.append("<koreliste>").append( koreliste ).append("</koreliste>");
+		} else if (omdeling.equals("L")){
+			sb.append("<distrikt>").append( ruteLordag ).append("</distrikt>");
+			sb.append("<koreliste>").append( korelisteLordag ).append("</koreliste>");			
+		} else {
+			sb.append("<distrikt>").append( ruteSondag ).append("</distrikt>");
+			sb.append("<koreliste>").append( korelisteSondag ).append("</koreliste>");			
+		}
+		
+		
+		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("<split>");
+		sb.append("<vej>").append( result.splitResult.vej).append("</vej>");
+		sb.append("<husnr>").append( result.splitResult.husnr).append("</husnr>");
+		sb.append("<litra>").append( result.splitResult.litra).append("</litra>");
+		sb.append("<etage>").append( result.splitResult.etage).append("</etage>"); //sal
+		sb.append("<lejlighed>").append( result.splitResult.lejlighed).append("</lejlighed>"); //side
+		sb.append("</split>");
+		
+		sb.append("<vasketvejnavn>").append( result.vasketVejnavn ).append("</vasketvejnavn>");		
+		
+		sb.append("<gadeident>").append( result.gadeident ).append("</gadeident>");
+		sb.append("<vejnavn>").append(result.vej).append("</vejnavn>");
+		
+		sb.append("<latitude>").append(result.address.latitude).append("</latitude>");
+		sb.append("<longitude>").append(result.address.longitude).append("</longitude>");
+		
+		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) {
+			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("<hverdag>").append(rute).append("  ").append(koreliste).append("</hverdag>");
+		sb.append("<loerdag>").append(ruteLordag).append("  ").append(korelisteLordag).append("</loerdag>");
+		sb.append("<soendag>").append(ruteSondag).append("  ").append(korelisteSondag).append("</soendag>");
+		
+		
+		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>");
+						
+
 		sb.append("</result>");
 		
 		response.setContentType("text/xml; charset=UTF-8");
@@ -107,5 +180,16 @@
 		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();
+		 
+	}
 
 }