--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/27 10:19:15 2397
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java 2015/04/08 10:06:14 2506
@@ -8,6 +8,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.StringUtils;
+
import dk.daoas.daoadresseservice.admin.ServiceConfig;
import dk.daoas.daoadresseservice.beans.Address;
import dk.daoas.daoadresseservice.beans.SearchResult;
@@ -52,7 +54,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") );
@@ -89,18 +91,34 @@
} else {
sb.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("").append( result.status ).append("");
- sb.append("").append(result.address.rute).append("");
- sb.append("").append(result.address.koreliste).append("");
+ sb.append("").append( rute ).append("");
+ sb.append("").append( koreliste ).append("");
sb.append("").append(result.address.kommunekode).append("");
sb.append("").append(result.address.vejkode).append("");
sb.append("").append(result.address.dbkBane).append("");
sb.append("\n");
//Extra information
+ sb.append("");
+ sb.append("").append( result.splitResult.vej).append("");
+ sb.append("").append( result.splitResult.husnr).append("");
+ sb.append("").append( result.splitResult.litra).append("");
+ sb.append("").append( result.splitResult.etage).append(""); //sal
+ sb.append("").append( result.splitResult.lejlighed).append(""); //side
+ sb.append("");
+
+
sb.append("").append( result.gadeident ).append("");
- sb.append("").append(result.address.vejnavn).append("");
+ sb.append("").append(result.vej).append("");
+
+ sb.append("").append(result.address.latitude).append("");
+ sb.append("").append(result.address.longitude).append("");
+
sb.append("").append(result.address.daekningsType).append("");
sb.append("").append(result.address.distributor).append("");
if (result.address.daekningsType == DaekningsType.DAEKNING_UDVIDET) {
@@ -108,7 +126,8 @@
Address t = result.address.extTarget;
sb.append("").append(t.vejnavn + " " + t.husnr + t.husnrbogstav + ", " + t.postnr).append("");
- }
+ }
+
sb.append("").append(result.levenshtein).append("");