--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/13 22:12:58 2288
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/16 14:25:18 2311
@@ -9,11 +9,13 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+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 {
@@ -33,22 +35,30 @@
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("");
+ sb.append("\n");
if (result.status == Status.STATUS_OK) {
sb.append("ok");
@@ -57,11 +67,21 @@
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("");
- sb.append("").append(result.address.extAfstand).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.osm).append("");
+ sb.append("").append(result.google).append("");
+
} else {
sb.append("error");
@@ -72,12 +92,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) );
-
}
}