--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java	2015/03/13 12:57:01	2442
+++ 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");
@@ -89,16 +92,28 @@
 		} else {
 			sb.append("<status>error</status>");
 		}
+		
+		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(result.address.rute).append("</distrikt>");
-		sb.append("<koreliste>").append(result.address.koreliste).append("</koreliste>");
+		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>");
 		
@@ -112,7 +127,8 @@
 			
 			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>");