--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/15 11:55:20 2299
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/24 11:48:58 2364
@@ -9,19 +9,26 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import dk.daoas.daoadresseservice.admin.ServiceConfig;
import dk.daoas.daoadresseservice.beans.Address;
import dk.daoas.daoadresseservice.beans.SearchResult;
import dk.daoas.daoadresseservice.beans.SearchResult.Status;
/**
- * Servlet implementation class SearchServlet
+ * Denne servlet forventer at Tomcat connector'en er konfigureret med
+ * URIEncoding="UTF-8"
*/
@WebServlet(urlPatterns = { "/SearchServlet", "/search" }, loadOnStartup = 1)
public class SearchServlet extends HttpServlet {
+ ServiceConfig config;
+
@Override
public void init() throws ServletException {
super.init();
+
+ config = (ServiceConfig) this.getServletContext().getAttribute("config");
+
System.out.println("SearchServlet loaded");
}
@@ -38,9 +45,11 @@
AdressSearch search = (AdressSearch) this.getServletContext().getAttribute("search");
if (search == null) {
response.setContentType("text/xml; charset=UTF-8");
- response.getWriter().print(
+ response.getWriter().print(
+ "" +
"error" +
- "Service not ready"
+ "Service not ready" +
+ ""
);
return;
@@ -48,7 +57,6 @@
String brugerid = request.getParameter("brugerid");
String postnr = request.getParameter("postnr");
- //String adresseStr = getUtf8( request.getParameter("adresse") );
String adresseStr = request.getParameter("adresse");
SearchResult result = search.search(postnr, adresseStr);
@@ -76,7 +84,12 @@
Address t = result.address.extTarget;
sb.append("").append(t.vejnavn + " " + t.husnr + t.husnrbogstav + ", " + t.postnr).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 {