--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/14 10:42:35 2294
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/16 14:25:18 2311
@@ -14,7 +14,8 @@
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 {
@@ -34,19 +35,27 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-//long start1 = System.currentTimeMillis();
+
AdressSearch search = (AdressSearch) this.getServletContext().getAttribute("search");
- request.setCharacterEncoding("UTF-8");
+ if (search == null) {
+ response.setContentType("text/xml; charset=UTF-8");
+ response.getWriter().print(
+ "" +
+ "error" +
+ "Service not ready" +
+ ""
+ );
+ return;
+
+ }
String brugerid = request.getParameter("brugerid");
String postnr = request.getParameter("postnr");
//String adresseStr = getUtf8( request.getParameter("adresse") );
String adresseStr = request.getParameter("adresse");
-//long start2 = System.currentTimeMillis();
SearchResult result = search.search(postnr, adresseStr);
-//long start3 = System.currentTimeMillis();
StringBuilder sb = new StringBuilder();
sb.append("\n");
@@ -70,6 +79,7 @@
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.google).append("");
@@ -81,13 +91,6 @@
response.setContentType("text/xml; charset=UTF-8");
response.getWriter().print( sb );
-
-/*
-long start4 = System.currentTimeMillis();
-System.out.println("Servlet2:" + (start2-start1) );
-System.out.println("Servlet3:" + (start3-start1) );
-System.out.println("Servlet4:" + (start4-start1) );
-*/
}