/[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 2773 by torben, Mon Nov 16 14:56:12 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                    response.setHeader("Access-Control-Allow-Origin", "*"); //Allow  ajax calls from everywhere
59    
60                  AddressSearch search = (AddressSearch) this.getServletContext().getAttribute("search");                  AddressSearch search = (AddressSearch) this.getServletContext().getAttribute("search");
61                  if (search == null) {                  if (search == null) {
# Line 163  public class SearchServlet extends HttpS Line 165  public class SearchServlet extends HttpS
165                                                    
166                          Address t = result.address.extTarget;                          Address t = result.address.extTarget;
167                          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>");
168                            sb.append("<extpos>").append(t.latitude).append(",").append(t.longitude).append("</extpos>");
169                  }                  }
170                                    
171                  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 192  public class SearchServlet extends HttpS
192                                    
193          }          }
194                    
195          private String generateErrorXML(String msg) {          public static String generateErrorXML(String msg) {
196                  StringBuilder sb = new StringBuilder();                  StringBuilder sb = new StringBuilder();
197                  sb.append("<result>");                  sb.append("<result>");
198                  sb.append("<status>error</status>");                  sb.append("<status>error</status>");

Legend:
Removed from v.2665  
changed lines
  Added in v.2773

  ViewVC Help
Powered by ViewVC 1.1.20