--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java 2015/04/08 10:06:14 2506
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java 2015/11/26 12:50:05 2784
@@ -10,7 +10,6 @@
import org.apache.commons.lang3.StringUtils;
-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;
@@ -24,14 +23,16 @@
public class SearchServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
- LogPersistance logPersistance;
- ServiceConfig config;
+
+
+ private transient LogPersistance logPersistance;
+ //transient ServiceConfig config;
@Override
public void init() throws ServletException {
super.init();
- config = (ServiceConfig) this.getServletContext().getAttribute("config");
+ //config = (ServiceConfig) this.getServletContext().getAttribute("config");
logPersistance = new LogPersistance();
System.out.println("SearchServlet loaded");
@@ -53,6 +54,8 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+ response.setHeader("Access-Control-Allow-Origin", "*"); //Allow ajax calls from everywhere
AddressSearch search = (AddressSearch) this.getServletContext().getAttribute("search");
if (search == null) {
@@ -64,6 +67,7 @@
String brugerid = request.getParameter("brugerid");
String postnr = request.getParameter("postnr");
String adresseStr = request.getParameter("adresse");
+ String omdeling = request.getParameter("omdeling");
if (postnr == null) {
response.setContentType("text/xml; charset=UTF-8");
@@ -79,6 +83,16 @@
if (brugerid == null) {
brugerid = request.getRemoteHost();
}
+
+ if (omdeling == null || omdeling.equals("") ) {
+ omdeling = "H";
+ }
+
+ if ( omdeling.equals("H") == false && omdeling.equals("L") == false && omdeling.equals("S") == false ) {
+ response.setContentType("text/xml; charset=UTF-8");
+ response.getWriter().print( generateErrorXML("Ugyldig omdelingsdag - Kun H, L og S er gyldig") );
+ return;
+ }
SearchResult result = search.search(postnr, adresseStr);
@@ -94,10 +108,34 @@
String rute = StringUtils.defaultString(result.address.rute); //Sikre at der ikke sendes "null" tilbage
String koreliste = StringUtils.defaultString(result.address.koreliste); //Sikre at der ikke sendes "null" tilbage
+
+ String ruteLordag = StringUtils.defaultString(result.address.ruteLordag); //Sikre at der ikke sendes "null" tilbage
+ String korelisteLordag = StringUtils.defaultString(result.address.korelisteLordag); //Sikre at der ikke sendes "null" tilbage
+
+ String ruteSondag = StringUtils.defaultString(result.address.ruteSondag); //Sikre at der ikke sendes "null" tilbage
+ String korelisteSondag = StringUtils.defaultString(result.address.korelisteSondag); //Sikre at der ikke sendes "null" tilbage
sb.append("").append( result.status ).append("");
- sb.append("").append( rute ).append("");
- sb.append("").append( koreliste ).append("");
+
+
+
+ String valgtRute = rute; //Default til hverdags oplysningerne
+ String valgtKoreliste = koreliste;
+
+
+ if (omdeling.equals("L") && ruteLordag.equals("") == false){
+ valgtRute = ruteLordag;
+ valgtKoreliste = korelisteLordag;
+ }
+ if (omdeling.equals("S") && ruteSondag.equals("") == false) {
+ valgtRute = ruteSondag;
+ valgtKoreliste = korelisteSondag;
+ }
+
+ sb.append("").append( valgtRute ).append("");
+ sb.append("").append( valgtKoreliste ).append("");
+
+
sb.append("").append(result.address.kommunekode).append("");
sb.append("").append(result.address.vejkode).append("");
sb.append("").append(result.address.dbkBane).append("");
@@ -112,6 +150,7 @@
sb.append("").append( result.splitResult.lejlighed).append(""); //side
sb.append("");
+ sb.append("").append( result.vasketVejnavn ).append("");
sb.append("").append( result.gadeident ).append("");
sb.append("").append(result.vej).append("");
@@ -119,17 +158,28 @@
sb.append("").append(result.address.latitude).append("");
sb.append("").append(result.address.longitude).append("");
- sb.append("").append(result.address.daekningsType).append("");
+ sb.append("").append(result.address.daekningsType).append("");
sb.append("").append(result.address.distributor).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(t.latitude).append(",").append(t.longitude).append("");
}
-
+
+ sb.append("").append(rute).append(" ").append(koreliste).append("");
+ sb.append("").append(ruteLordag).append(" ").append(korelisteLordag).append("");
+ sb.append("").append(ruteSondag).append(" ").append(korelisteSondag).append("");
+
+
+ sb.append("").append(result.nearestLitra).append("");
sb.append("").append(result.levenshtein).append("");
+ sb.append("").append(result.levenshteinDistance).append("");
+
+ sb.append("").append(result.metaphone).append("");
+ sb.append("").append(result.metaphoneVej).append("");
sb.append("").append(result.osm).append("");
sb.append("").append(result.osmVej).append("");
@@ -143,11 +193,11 @@
response.setContentType("text/xml; charset=UTF-8");
response.getWriter().print( sb );
- logPersistance.saveRequestLog(brugerid, postnr, adresseStr, result);
+ logPersistance.saveRequestLog(search.getDatabaseLayer(), brugerid, postnr, adresseStr, omdeling, result);
}
- private String generateErrorXML(String msg) {
+ public static String generateErrorXML(String msg) {
StringBuilder sb = new StringBuilder();
sb.append("");
sb.append("error");