--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/26 15:47:07 2389
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java 2015/03/20 13:57:47 2457
@@ -52,7 +52,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,38 +86,53 @@
if (result.status == Status.STATUS_OK) {
sb.append("ok");
- sb.append("").append(result.address.rute).append("");
- sb.append("").append(result.address.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("").append(result.address.vejnavn).append("");
- sb.append("").append(result.address.daekningsType).append("");
- sb.append("").append(result.address.distributor).append("");
- if (result.address.daekningsType == DaekningsType.DAEKNING_UDVIDET) {
- sb.append("").append(result.address.extAfstand).append("");
-
- Address t = result.address.extTarget;
- sb.append("").append(t.vejnavn + " " + t.husnr + t.husnrbogstav + ", " + t.postnr).append("");
- }
-
-
- sb.append("").append(result.levenshtein).append("");
-
- sb.append("").append(result.osm).append("");
- sb.append("").append(result.osmVej).append("");
-
- sb.append("").append(result.google).append("");
- sb.append("").append(result.googleVej).append("");
-
-
} else {
sb.append("error");
- sb.append("").append( result.status ).append("");
}
+
+ sb.append("").append( result.status ).append("");
+ sb.append("").append(result.address.rute).append("");
+ sb.append("").append(result.address.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.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) {
+ sb.append("").append(result.address.extAfstand).append("");
+
+ Address t = result.address.extTarget;
+ sb.append("").append(t.vejnavn + " " + t.husnr + t.husnrbogstav + ", " + t.postnr).append("");
+ }
+
+
+ sb.append("").append(result.levenshtein).append("");
+
+ sb.append("").append(result.osm).append("");
+ sb.append("").append(result.osmVej).append("");
+
+ sb.append("").append(result.google).append("");
+ sb.append("").append(result.googleVej).append("");
+
+
sb.append("");
response.setContentType("text/xml; charset=UTF-8");