/[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 2784 by torben, Thu Nov 26 12:50:05 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 170  public class SearchServlet extends HttpS Line 173  public class SearchServlet extends HttpS
173                  sb.append("<soendag>").append(ruteSondag).append("  ").append(korelisteSondag).append("</soendag>");                  sb.append("<soendag>").append(ruteSondag).append("  ").append(korelisteSondag).append("</soendag>");
174                                    
175                                    
176                    sb.append("<nearestlitra>").append(result.nearestLitra).append("</nearestlitra>");
177                    
178                  sb.append("<levenshtein>").append(result.levenshtein).append("</levenshtein>");                  sb.append("<levenshtein>").append(result.levenshtein).append("</levenshtein>");
179                  sb.append("<levenshteindistance>").append(result.levenshteinDistance).append("</levenshteindistance>");                  sb.append("<levenshteindistance>").append(result.levenshteinDistance).append("</levenshteindistance>");
180                                    
181                    sb.append("<metaphone>").append(result.metaphone).append("</metaphone>");
182                    sb.append("<metaphonevej>").append(result.metaphoneVej).append("</metaphonevej>");
183                    
184                  sb.append("<osm>").append(result.osm).append("</osm>");                  sb.append("<osm>").append(result.osm).append("</osm>");
185                  sb.append("<osmvej>").append(result.osmVej).append("</osmvej>");                  sb.append("<osmvej>").append(result.osmVej).append("</osmvej>");
186                                    
# Line 189  public class SearchServlet extends HttpS Line 197  public class SearchServlet extends HttpS
197                                    
198          }          }
199                    
200          private String generateErrorXML(String msg) {          public static String generateErrorXML(String msg) {
201                  StringBuilder sb = new StringBuilder();                  StringBuilder sb = new StringBuilder();
202                  sb.append("<result>");                  sb.append("<result>");
203                  sb.append("<status>error</status>");                  sb.append("<status>error</status>");
Legend:
Removed from v.2665  
changed lines
  Added in v.2784
  ViewVC Help
Powered by ViewVC 1.1.20