--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/24 20:38:56 2372
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/SearchServlet.java 2015/02/25 09:43:58 2374
@@ -1,7 +1,6 @@
package dk.daoas.daoadresseservice;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
@@ -35,12 +34,6 @@
System.out.println("SearchServlet loaded");
}
-
-
-
- String getUtf8(String str) throws UnsupportedEncodingException {
- return new String( str.getBytes("iso-8859-1"), "UTF-8");
- }
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -48,19 +41,28 @@
AdressSearch search = (AdressSearch) this.getServletContext().getAttribute("search");
if (search == null) {
response.setContentType("text/xml; charset=UTF-8");
- response.getWriter().print(
- "" +
- "error" +
- "Service not ready" +
- ""
- );
- return;
-
+ response.getWriter().print( generateErrorXML("Service not ready") );
+ return;
}
String brugerid = request.getParameter("brugerid");
String postnr = request.getParameter("postnr");
String adresseStr = request.getParameter("adresse");
+
+ if (postnr == null) {
+ response.setContentType("text/xml; charset=UTF-8");
+ response.getWriter().print( generateErrorXML("Mangler postnr parameter") );
+ return;
+ }
+
+ if (adresseStr == null) {
+ response.setContentType("text/xml; charset=UTF-8");
+ response.getWriter().print( generateErrorXML("Mangler adresse parameter") );
+ return;
+ }
+ if (brugerid == null) {
+ brugerid = request.getRemoteHost();
+ }
SearchResult result = search.search(postnr, adresseStr);
@@ -107,5 +109,16 @@
logPersistance.saveRequestLog(brugerid, postnr, adresseStr, result);
}
+
+ private String generateErrorXML(String msg) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("");
+ sb.append("error");
+ sb.append("").append(msg).append("");
+ sb.append("");
+
+ return sb.toString();
+
+ }
}