--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/15 17:10:34 2306
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/24 20:38:56 2372
@@ -9,24 +9,34 @@
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;
+import dk.daoas.daoadresseservice.db.LogPersistance;
/**
- * 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 {
+ private static final long serialVersionUID = 1L;
+ LogPersistance logPersistance;
+ ServiceConfig config;
+
@Override
public void init() throws ServletException {
super.init();
+
+ config = (ServiceConfig) this.getServletContext().getAttribute("config");
+ logPersistance = new LogPersistance();
+
System.out.println("SearchServlet loaded");
}
+
-
- private static final long serialVersionUID = 1L;
String getUtf8(String str) throws UnsupportedEncodingException {
return new String( str.getBytes("iso-8859-1"), "UTF-8");
@@ -50,7 +60,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);
@@ -78,8 +87,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 {
@@ -91,6 +104,8 @@
response.setContentType("text/xml; charset=UTF-8");
response.getWriter().print( sb );
+ logPersistance.saveRequestLog(brugerid, postnr, adresseStr, result);
+
}
}