--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/13 15:15:13 2282
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/24 11:18:47 2359
@@ -9,18 +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");
}
@@ -33,17 +41,30 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
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 = getUtf8( request.getParameter("adresse") );
+ String adresseStr = request.getParameter("adresse");
SearchResult result = search.search(postnr, adresseStr);
+
StringBuilder sb = new StringBuilder();
- sb.append("");
+ sb.append("\n");
if (result.status == Status.STATUS_OK) {
sb.append("ok");
@@ -52,11 +73,25 @@
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.osmVej).append("");
+
+ sb.append("").append(result.google).append("");
+ sb.append("").append(result.googleVej).append("");
+
} else {
sb.append("error");
@@ -67,8 +102,6 @@
response.setContentType("text/xml; charset=UTF-8");
response.getWriter().print( sb );
-
-
}
}