--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/26 15:47:07 2389
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java 2015/05/21 08:06:16 2550
@@ -8,7 +8,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import dk.daoas.daoadresseservice.admin.ServiceConfig;
+import org.apache.commons.lang3.StringUtils;
+
import dk.daoas.daoadresseservice.beans.Address;
import dk.daoas.daoadresseservice.beans.SearchResult;
import dk.daoas.daoadresseservice.beans.SearchResult.Status;
@@ -22,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");
@@ -52,7 +55,7 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- AdressSearch search = (AdressSearch) this.getServletContext().getAttribute("search");
+ AddressSearch search = (AddressSearch) this.getServletContext().getAttribute("search");
if (search == null) {
response.setContentType("text/xml; charset=UTF-8");
response.getWriter().print( generateErrorXML("Service not ready") );
@@ -62,6 +65,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");
@@ -77,6 +81,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);
@@ -86,38 +100,78 @@
if (result.status == Status.STATUS_OK) {
sb.append("ok");
- sb.append("").append(result.address.rute).append("");
- sb.append("").append(result.address.koreliste).append("");
- 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("");
- 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.levenshtein).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");
- sb.append("").append( result.status ).append("");
}
+
+ 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("");
+
+ if (omdeling.equals("H")) { //Hverdag
+ sb.append("").append( rute ).append("");
+ sb.append("").append( koreliste ).append("");
+ } else if (omdeling.equals("L")){
+ sb.append("").append( ruteLordag ).append("");
+ sb.append("").append( korelisteLordag ).append("");
+ } else {
+ sb.append("").append( ruteSondag ).append("");
+ sb.append("").append( korelisteSondag ).append("");
+ }
+
+
+ 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("");
+ sb.append("").append( result.splitResult.vej).append("");
+ sb.append("").append( result.splitResult.husnr).append("");
+ sb.append("").append( result.splitResult.litra).append("");
+ sb.append("").append( result.splitResult.etage).append(""); //sal
+ 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("");
+
+ 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.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(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.levenshtein).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("");
+
+
sb.append("");
response.setContentType("text/xml; charset=UTF-8");