--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/02/25 09:52:34	2375
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java	2015/05/11 08:13:04	2540
@@ -8,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;
@@ -22,14 +23,16 @@
 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");
@@ -52,7 +55,7 @@
 
 	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( generateErrorXML("Service not ready") );
@@ -86,35 +89,56 @@
 		
 		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
+			
+		sb.append("<error>").append( result.status ).append("</error>");
+		sb.append("<distrikt>").append( rute ).append("</distrikt>");
+		sb.append("<koreliste>").append( 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("<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("<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("<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");