--- 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/05/13 09:36:42 2545
@@ -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");
@@ -64,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");
@@ -79,6 +81,16 @@
if (brugerid == null) {
brugerid = request.getRemoteHost();
}
+
+ if (omdeling == null || omdeling.equals("") ) {
+ omdeling = "H";
+ }
+
+ if ( omdeling.equals("H") == false && omdeling.equals("S") == false ) {
+ response.setContentType("text/xml; charset=UTF-8");
+ response.getWriter().print( generateErrorXML("Ugyldig omdelingsdag - Kun H og S er gyldig") );
+ return;
+ }
SearchResult result = search.search(postnr, adresseStr);
@@ -94,10 +106,21 @@
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 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("");
+
+ if (omdeling.equals("H")) { //Hverdag
+ sb.append("").append( rute ).append("");
+ sb.append("").append( koreliste ).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("");