31 |
|
|
32 |
private TaskLogger logger = TaskLogger.getInstance(); |
private TaskLogger logger = TaskLogger.getInstance(); |
33 |
|
|
34 |
|
private int duplicateCount; |
35 |
|
|
36 |
List<Address> addressList; |
List<Address> addressList; |
37 |
|
|
327 |
} |
} |
328 |
} |
} |
329 |
} else { |
} else { |
330 |
|
duplicateCount++; |
331 |
logger.info( "Double visit monday " + addr); |
logger.info( "Double visit monday " + addr); |
332 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
333 |
} |
} |
334 |
|
|
335 |
} |
} |
351 |
} |
} |
352 |
} |
} |
353 |
} else { |
} else { |
354 |
|
duplicateCount++; |
355 |
logger.info( "Double visit tuesday " + addr); |
logger.info( "Double visit tuesday " + addr); |
356 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
357 |
} |
} |
358 |
} |
} |
359 |
|
|
373 |
} |
} |
374 |
} |
} |
375 |
} else { |
} else { |
376 |
|
duplicateCount++; |
377 |
logger.info( "Double visit wednesday " + addr); |
logger.info( "Double visit wednesday " + addr); |
378 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
379 |
} |
} |
380 |
} |
} |
381 |
|
|
397 |
} |
} |
398 |
} |
} |
399 |
} else { |
} else { |
400 |
|
duplicateCount++; |
401 |
logger.info( "Double visit thursday " + addr); |
logger.info( "Double visit thursday " + addr); |
402 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
403 |
} |
} |
404 |
} |
} |
405 |
|
|
420 |
} |
} |
421 |
} |
} |
422 |
} else { |
} else { |
423 |
|
duplicateCount++; |
424 |
logger.info( "Double visit friday " + addr); |
logger.info( "Double visit friday " + addr); |
425 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
426 |
} |
} |
427 |
} |
} |
428 |
|
|
444 |
} |
} |
445 |
} |
} |
446 |
} else { |
} else { |
447 |
|
duplicateCount++; |
448 |
logger.info( "Double visit saturday " + addr); |
logger.info( "Double visit saturday " + addr); |
449 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
450 |
} |
} |
451 |
} |
} |
452 |
|
|
467 |
} |
} |
468 |
} |
} |
469 |
} else { |
} else { |
470 |
|
duplicateCount++; |
471 |
logger.info( "Double visit sunday " + addr); |
logger.info( "Double visit sunday " + addr); |
472 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
473 |
} |
} |
474 |
} |
} |
475 |
|
|
497 |
|
|
498 |
|
|
499 |
private void createFromEntry(AddressSourceEntry entry) { |
private void createFromEntry(AddressSourceEntry entry) { |
500 |
|
if (entry.husnr >= 1000) { //husnumre i DK må kun være på 3 cifre |
501 |
|
return; |
502 |
|
} |
503 |
|
|
504 |
if (entry.husnr == 999) { |
if (entry.husnr == 999) { |
505 |
return; |
return; |
506 |
} |
} |
507 |
|
|
508 |
|
if (entry.litra.length() > 1) { //litra må kun være på 1 tegn |
509 |
|
return; |
510 |
|
} |
511 |
|
if (entry.litra.length() == 1) { |
512 |
|
char litra = entry.litra.charAt(0); |
513 |
|
if ( Character.isLetter(litra) == false ) { |
514 |
|
return; |
515 |
|
} |
516 |
|
|
517 |
|
} |
518 |
|
|
519 |
if (entry.kommunekode == 0 || entry.vejkode == 0) { |
if (entry.kommunekode == 0 || entry.vejkode == 0) { |
520 |
return; |
return; |
521 |
} |
} |
526 |
if (entry.gadeid == 0) { |
if (entry.gadeid == 0) { |
527 |
return; |
return; |
528 |
} |
} |
529 |
|
|
530 |
String gadeidStr = Integer.toString(entry.gadeid); |
String gadeidStr = Integer.toString(entry.gadeid); |
531 |
if (gadeidStr.length() != 9) { |
if (gadeidStr.length() != 9) { |
532 |
return; |
return; |
539 |
|
|
540 |
logger.info("Opretter adresse ud fra " + entry); |
logger.info("Opretter adresse ud fra " + entry); |
541 |
|
|
542 |
Address a = new Address(); |
Address addr = new Address(); |
543 |
a.state = AddressState.CREATED; |
addr.state = AddressState.CREATED; |
|
|
|
|
a.distributor = entry.distributor; |
|
|
a.gadeid = entry.gadeid; |
|
|
a.kommunekode = entry.kommunekode; |
|
|
a.vejkode = entry.vejkode; |
|
|
a.vejnavn = entry.vejnavn; |
|
|
a.husnr = entry.husnr; |
|
|
a.husnrbogstav = entry.litra; |
|
|
a.postnr = entry.postnr; |
|
|
//a.visited = true; |
|
|
|
|
|
if (entry.ugedage.mandag) { |
|
|
a.ruteMandag = entry.rute; |
|
|
a.korelisteMandag = entry.koreliste; |
|
|
} |
|
|
if (entry.ugedage.tirsdag) { |
|
|
a.ruteTirsdag = entry.rute; |
|
|
a.korelisteTirsdag = entry.koreliste; |
|
|
} |
|
|
if (entry.ugedage.onsdag) { |
|
|
a.ruteOnsdag = entry.rute; |
|
|
a.korelisteOnsdag = entry.koreliste; |
|
|
} |
|
|
if (entry.ugedage.torsdag) { |
|
|
a.ruteTorsdag = entry.rute; |
|
|
a.korelisteTorsdag = entry.koreliste; |
|
|
} |
|
|
if (entry.ugedage.fredag) { |
|
|
a.ruteFredag = entry.rute; |
|
|
a.korelisteFredag = entry.koreliste; |
|
|
} |
|
|
if (entry.ugedage.lordag) { |
|
|
a.ruteLordag = entry.rute; |
|
|
a.korelisteLordag = entry.koreliste; |
|
|
} |
|
|
if (entry.ugedage.sondag) { |
|
|
a.ruteSondag = entry.rute; |
|
|
a.korelisteLordag = entry.koreliste; |
|
|
} |
|
544 |
|
|
545 |
updateDbkBane(a); |
addr.distributor = entry.distributor; |
546 |
|
addr.gadeid = entry.gadeid; |
547 |
|
addr.kommunekode = entry.kommunekode; |
548 |
|
addr.vejkode = entry.vejkode; |
549 |
|
addr.vejnavn = entry.vejnavn; |
550 |
|
addr.husnr = entry.husnr; |
551 |
|
addr.husnrbogstav = entry.litra; |
552 |
|
addr.postnr = entry.postnr; |
553 |
|
|
|
// Nu er det nye adresse object oprettet - nu skal det gemmes i søge strukturen og totallisten |
|
554 |
|
|
555 |
|
updateAddress(addr, entry); |
556 |
|
|
557 |
TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( a.gadeid ); |
|
558 |
|
// Nu er det nye adresse object oprettet - nu skal det gemmes i søge strukturen og totallisten |
559 |
|
TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( addr.gadeid ); |
560 |
|
|
561 |
if (gade == null) { |
if (gade == null) { |
562 |
gade = new TreeMap<Short,ArrayList<Address>>(); |
gade = new TreeMap<Short,ArrayList<Address>>(); |
563 |
searchStructure.put(a.gadeid, gade); |
searchStructure.put(addr.gadeid, gade); |
564 |
} |
} |
565 |
|
|
566 |
ArrayList<Address> litraList = gade.get(a.husnr); |
ArrayList<Address> litraList = gade.get(addr.husnr); |
567 |
if (litraList == null) { |
if (litraList == null) { |
568 |
litraList = new ArrayList<Address>(); |
litraList = new ArrayList<Address>(); |
569 |
gade.put(a.husnr, litraList); |
gade.put(addr.husnr, litraList); |
570 |
} |
} |
571 |
|
|
572 |
litraList.add(a); |
litraList.add(addr); |
573 |
addressList.add(a); |
addressList.add(addr); |
574 |
|
|
575 |
} |
} |
576 |
|
|
644 |
return Collections.unmodifiableMap( unknownStreets ); |
return Collections.unmodifiableMap( unknownStreets ); |
645 |
} |
} |
646 |
|
|
647 |
|
public int getDuplicateCount() { |
648 |
|
return duplicateCount; |
649 |
|
} |
650 |
|
|
651 |
public int getRejectedCount() { |
public int getRejectedCount() { |
652 |
return rejectedEntries.size(); |
return rejectedEntries.size(); |