/[projects]/dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java
ViewVC logotype

Diff of /dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2665 by torben, Tue Aug 25 08:46:29 2015 UTC revision 2772 by torben, Mon Nov 16 13:43:17 2015 UTC
# Line 54  public class SearchServlet extends HttpS Line 54  public class SearchServlet extends HttpS
54    
55    
56          protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {          protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
57                    
58                    String origin = request.getHeader("Origin");
59                    response.setHeader("Access-Control-Allow-Origin", origin); //Allow  ajax calls from everywhere
60    
61                  AddressSearch search = (AddressSearch) this.getServletContext().getAttribute("search");                  AddressSearch search = (AddressSearch) this.getServletContext().getAttribute("search");
62                  if (search == null) {                  if (search == null) {
# Line 163  public class SearchServlet extends HttpS Line 166  public class SearchServlet extends HttpS
166                                                    
167                          Address t = result.address.extTarget;                          Address t = result.address.extTarget;
168                          sb.append("<extaddr>").append(t.vejnavn + " " + t.husnr + t.husnrbogstav + ", " + t.postnr).append("</extaddr>");                          sb.append("<extaddr>").append(t.vejnavn + " " + t.husnr + t.husnrbogstav + ", " + t.postnr).append("</extaddr>");
169                            sb.append("<extpos>").append(t.latitude).append(",").append(t.longitude).append("</extpos>");
170                  }                  }
171                                    
172                  sb.append("<hverdag>").append(rute).append("  ").append(koreliste).append("</hverdag>");                  sb.append("<hverdag>").append(rute).append("  ").append(koreliste).append("</hverdag>");
# Line 189  public class SearchServlet extends HttpS Line 193  public class SearchServlet extends HttpS
193                                    
194          }          }
195                    
196          private String generateErrorXML(String msg) {          public static String generateErrorXML(String msg) {
197                  StringBuilder sb = new StringBuilder();                  StringBuilder sb = new StringBuilder();
198                  sb.append("<result>");                  sb.append("<result>");
199                  sb.append("<status>error</status>");                  sb.append("<status>error</status>");
Legend:
Removed from v.2665  
changed lines
  Added in v.2772
  ViewVC Help
Powered by ViewVC 1.1.20