10 |
|
|
11 |
import org.apache.commons.lang3.StringUtils; |
import org.apache.commons.lang3.StringUtils; |
12 |
|
|
|
import dk.daoas.daoadresseservice.admin.ServiceConfig; |
|
13 |
import dk.daoas.daoadresseservice.beans.Address; |
import dk.daoas.daoadresseservice.beans.Address; |
14 |
import dk.daoas.daoadresseservice.beans.SearchResult; |
import dk.daoas.daoadresseservice.beans.SearchResult; |
15 |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
23 |
public class SearchServlet extends HttpServlet { |
public class SearchServlet extends HttpServlet { |
24 |
|
|
25 |
private static final long serialVersionUID = 1L; |
private static final long serialVersionUID = 1L; |
26 |
LogPersistance logPersistance; |
|
27 |
ServiceConfig config; |
|
28 |
|
private transient LogPersistance logPersistance; |
29 |
|
//transient ServiceConfig config; |
30 |
|
|
31 |
@Override |
@Override |
32 |
public void init() throws ServletException { |
public void init() throws ServletException { |
33 |
super.init(); |
super.init(); |
34 |
|
|
35 |
config = (ServiceConfig) this.getServletContext().getAttribute("config"); |
//config = (ServiceConfig) this.getServletContext().getAttribute("config"); |
36 |
logPersistance = new LogPersistance(); |
logPersistance = new LogPersistance(); |
37 |
|
|
38 |
System.out.println("SearchServlet loaded"); |
System.out.println("SearchServlet loaded"); |
65 |
String brugerid = request.getParameter("brugerid"); |
String brugerid = request.getParameter("brugerid"); |
66 |
String postnr = request.getParameter("postnr"); |
String postnr = request.getParameter("postnr"); |
67 |
String adresseStr = request.getParameter("adresse"); |
String adresseStr = request.getParameter("adresse"); |
68 |
|
String omdeling = request.getParameter("omdeling"); |
69 |
|
|
70 |
if (postnr == null) { |
if (postnr == null) { |
71 |
response.setContentType("text/xml; charset=UTF-8"); |
response.setContentType("text/xml; charset=UTF-8"); |
81 |
if (brugerid == null) { |
if (brugerid == null) { |
82 |
brugerid = request.getRemoteHost(); |
brugerid = request.getRemoteHost(); |
83 |
} |
} |
84 |
|
|
85 |
|
if (omdeling == null || omdeling.equals("") ) { |
86 |
|
omdeling = "H"; |
87 |
|
} |
88 |
|
|
89 |
|
if ( omdeling.equals("H") == false && omdeling.equals("S") == false ) { |
90 |
|
response.setContentType("text/xml; charset=UTF-8"); |
91 |
|
response.getWriter().print( generateErrorXML("Ugyldig omdelingsdag - Kun H og S er gyldig") ); |
92 |
|
return; |
93 |
|
} |
94 |
|
|
95 |
SearchResult result = search.search(postnr, adresseStr); |
SearchResult result = search.search(postnr, adresseStr); |
96 |
|
|
106 |
|
|
107 |
String rute = StringUtils.defaultString(result.address.rute); //Sikre at der ikke sendes "null" tilbage |
String rute = StringUtils.defaultString(result.address.rute); //Sikre at der ikke sendes "null" tilbage |
108 |
String koreliste = StringUtils.defaultString(result.address.koreliste); //Sikre at der ikke sendes "null" tilbage |
String koreliste = StringUtils.defaultString(result.address.koreliste); //Sikre at der ikke sendes "null" tilbage |
109 |
|
|
110 |
|
String ruteSondag = StringUtils.defaultString(result.address.ruteSondag); //Sikre at der ikke sendes "null" tilbage |
111 |
|
String korelisteSondag = StringUtils.defaultString(result.address.korelisteSondag); //Sikre at der ikke sendes "null" tilbage |
112 |
|
|
113 |
sb.append("<error>").append( result.status ).append("</error>"); |
sb.append("<error>").append( result.status ).append("</error>"); |
114 |
sb.append("<distrikt>").append( rute ).append("</distrikt>"); |
|
115 |
sb.append("<koreliste>").append( koreliste ).append("</koreliste>"); |
if (omdeling.equals("H")) { //Hverdag |
116 |
|
sb.append("<distrikt>").append( rute ).append("</distrikt>"); |
117 |
|
sb.append("<koreliste>").append( koreliste ).append("</koreliste>"); |
118 |
|
} else { |
119 |
|
sb.append("<distrikt>").append( ruteSondag ).append("</distrikt>"); |
120 |
|
sb.append("<koreliste>").append( korelisteSondag ).append("</koreliste>"); |
121 |
|
} |
122 |
|
|
123 |
|
|
124 |
sb.append("<kommunekode>").append(result.address.kommunekode).append("</kommunekode>"); |
sb.append("<kommunekode>").append(result.address.kommunekode).append("</kommunekode>"); |
125 |
sb.append("<vejkode>").append(result.address.vejkode).append("</vejkode>"); |
sb.append("<vejkode>").append(result.address.vejkode).append("</vejkode>"); |
126 |
sb.append("<dbkbane>").append(result.address.dbkBane).append("</dbkbane>"); |
sb.append("<dbkbane>").append(result.address.dbkBane).append("</dbkbane>"); |