--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java 2015/02/13 16:15:49 2286 +++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java 2015/02/14 08:43:45 2289 @@ -26,6 +26,8 @@ public SearchResult search(String postnrStr, String adresse) { +//long start1 = System.currentTimeMillis(); + int postnr=0; try { @@ -33,6 +35,7 @@ } catch (Exception E) { return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); } +//long start2 = System.currentTimeMillis(); Map postnrVeje = searchPostnrVejnavnGadeid.get(postnr); @@ -40,23 +43,29 @@ return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); } +//long start3 = System.currentTimeMillis(); + SplitResult split = AddressUtils.splitAdresse(adresse); - String vasketVejnavn = AddressUtils.vaskVejnavn( split.vej ); + String vasketVejnavn = AddressUtils.vaskVejnavn( split.vej ); if (split.husnr.length() == 0) { return new SearchResult(Status.ERROR_MISSING_HOUSENUMBER); } +//long start4 = System.currentTimeMillis(); Long gadeident = postnrVeje.get(vasketVejnavn); if (gadeident == null) { return new SearchResult(Status.ERROR_UNKNOWN_STREETNAME); - } + } +//long start5 = System.currentTimeMillis(); Map gade = searchGadeidentAdresser.get(gadeident); //Denne søgning må ikke fejle +//long start6 = System.currentTimeMillis(); String husnrSearch = "" + split.husnr + split.litra; Address addr = gade.get(husnrSearch); +//long start7 = System.currentTimeMillis(); if (addr == null) { return new SearchResult(Status.ERROR_UNKNOWN_ADDRESSPOINT); } @@ -68,6 +77,16 @@ if (addr.distributor.equals("LUKKET")) { return new SearchResult(Status.STATUS_NOT_COVERED); //Skal vi have en special status til Lukkede adresser ? } + +/* +System.out.println("Search2: " + (start2-start1) ); +System.out.println("Search3: " + (start3-start1) ); +System.out.println("Search4: " + (start4-start1) ); +System.out.println("Search5: " + (start5-start1) ); +System.out.println("Search6: " + (start6-start1) ); +System.out.println("Search7: " + (start7-start1) ); +*/ + return new SearchResult(addr);