/[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 2274 by torben, Fri Feb 13 11:48:23 2015 UTC revision 2292 by torben, Sat Feb 14 09:31:46 2015 UTC
# Line 9  import javax.servlet.http.HttpServlet; Line 9  import javax.servlet.http.HttpServlet;
9  import javax.servlet.http.HttpServletRequest;  import javax.servlet.http.HttpServletRequest;
10  import javax.servlet.http.HttpServletResponse;  import javax.servlet.http.HttpServletResponse;
11    
12  import dk.daoas.daoadresseservice.SearchResult.Status;  import dk.daoas.daoadresseservice.beans.Address;
13    import dk.daoas.daoadresseservice.beans.SearchResult;
14    import dk.daoas.daoadresseservice.beans.SearchResult.Status;
15    
16  /**  /**
17   * Servlet implementation class SearchServlet   * Servlet implementation class SearchServlet
18   */   */
19  @WebServlet({ "/SearchServlet", "/search" })  @WebServlet(urlPatterns = { "/SearchServlet", "/search" }, loadOnStartup = 1)
20  public class SearchServlet extends HttpServlet {  public class SearchServlet extends HttpServlet {
21            
22            @Override
23            public void init() throws ServletException {
24                    super.init();
25                    System.out.println("SearchServlet loaded");
26            }
27    
28    
29          private static final long serialVersionUID = 1L;          private static final long serialVersionUID = 1L;
30                    
31          String getUtf8(String str) throws UnsupportedEncodingException {          String getUtf8(String str) throws UnsupportedEncodingException {
# Line 24  public class SearchServlet extends HttpS Line 34  public class SearchServlet extends HttpS
34                
35    
36          protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {          protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
37    //long start1 = System.currentTimeMillis();
38                  AdressSearch search = (AdressSearch) this.getServletContext().getAttribute("search");                  AdressSearch search = (AdressSearch) this.getServletContext().getAttribute("search");
39                  request.setCharacterEncoding("UTF-8");                  request.setCharacterEncoding("UTF-8");
40                                    
41                  String brugerid = request.getParameter("brugerid");                  String brugerid = request.getParameter("brugerid");
42                  String postnr = request.getParameter("postnr");                  String postnr = request.getParameter("postnr");
43                  String adresseStr = getUtf8( request.getParameter("adresse") );                  //String adresseStr = getUtf8( request.getParameter("adresse") );
44                                    String adresseStr = request.getParameter("adresse");
                 //System.out.println (">" + postnr + " | " + adresseStr);  
45    
46    //long start2 = System.currentTimeMillis();
47                  SearchResult result = search.search(postnr, adresseStr);                  SearchResult result = search.search(postnr, adresseStr);
48                                    
49    //long start3 = System.currentTimeMillis();
50                    
51                  StringBuilder sb = new StringBuilder();                  StringBuilder sb = new StringBuilder();
52                  sb.append("<result>");                  sb.append("<result>");
53                                    
# Line 46  public class SearchServlet extends HttpS Line 59  public class SearchServlet extends HttpS
59                          sb.append("<vejkode>").append(result.address.vejkode).append("</vejkode>");                          sb.append("<vejkode>").append(result.address.vejkode).append("</vejkode>");
60                          sb.append("<dbkbane>").append(result.address.dbkBane).append("</dbkbane>");                          sb.append("<dbkbane>").append(result.address.dbkBane).append("</dbkbane>");
61                                                    
62                            //Extra information
63                            sb.append("<daekning>").append(result.address.daekningsType).append("</daekning>");
64                            sb.append("<distributor>").append(result.address.distributor).append("</distributor>");
65                            if (result.address.daekningsType == DaekningsType.DAEKNING_UDVIDET) {
66                                    sb.append("<extafstand>").append(result.address.extAfstand).append("</extafstand>");
67                                    
68                                    Address t = result.address.extTarget;
69                                    sb.append("<extaddr>").append(t.vejnavn + " " + t.husnr + t.husnrbogstav + ", " + t.postnr).append("</extaddr>");
70                            }
71                            sb.append("<google>").append(result.google).append("</google>");
72                            
73                            
74                  } else {                  } else {
75                          sb.append("<status>error</status>");                          sb.append("<status>error</status>");
76                          sb.append("<error>").append( result.status ).append("</error>");                          sb.append("<error>").append( result.status ).append("</error>");
# Line 54  public class SearchServlet extends HttpS Line 79  public class SearchServlet extends HttpS
79                                    
80                  response.setContentType("text/xml; charset=UTF-8");                  response.setContentType("text/xml; charset=UTF-8");
81                  response.getWriter().print( sb );                  response.getWriter().print( sb );
82                            
83                    /*
84    long start4 = System.currentTimeMillis();              
85    System.out.println("Servlet2:" + (start2-start1) );
86    System.out.println("Servlet3:" + (start3-start1) );
87    System.out.println("Servlet4:" + (start4-start1) );
88    */
89                                    
90          }          }
91    
Legend:
Removed from v.2274  
changed lines
  Added in v.2292
  ViewVC Help
Powered by ViewVC 1.1.20