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 |
|
|
92 |
|
|
93 |
|
|
94 |
} |
} |
95 |
|
|
96 |
|
@SuppressWarnings("PMD.CollapsibleIfStatements") |
97 |
public void closeUnvisitedAddresses(String distributor, EntryUgedage ugedage) { |
public void closeUnvisitedAddresses(String distributor, EntryUgedage ugedage) { |
98 |
for (Address addr : addressList) { |
for (Address addr : addressList) { |
99 |
if (addr.distributor == null) |
if (addr.distributor == null) |
258 |
} |
} |
259 |
} |
} |
260 |
|
|
261 |
|
@SuppressWarnings("PMD.CollapsibleIfStatements") |
262 |
private void visitRange(AddressSourceEntry entry) { |
private void visitRange(AddressSourceEntry entry) { |
263 |
|
|
264 |
TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid ); |
TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid ); |
329 |
} |
} |
330 |
} |
} |
331 |
} else { |
} else { |
332 |
|
duplicateCount++; |
333 |
logger.info( "Double visit monday " + addr); |
logger.info( "Double visit monday " + addr); |
334 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
335 |
} |
} |
336 |
|
|
337 |
} |
} |
353 |
} |
} |
354 |
} |
} |
355 |
} else { |
} else { |
356 |
|
duplicateCount++; |
357 |
logger.info( "Double visit tuesday " + addr); |
logger.info( "Double visit tuesday " + addr); |
358 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
359 |
} |
} |
360 |
} |
} |
361 |
|
|
375 |
} |
} |
376 |
} |
} |
377 |
} else { |
} else { |
378 |
|
duplicateCount++; |
379 |
logger.info( "Double visit wednesday " + addr); |
logger.info( "Double visit wednesday " + addr); |
380 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
381 |
} |
} |
382 |
} |
} |
383 |
|
|
399 |
} |
} |
400 |
} |
} |
401 |
} else { |
} else { |
402 |
|
duplicateCount++; |
403 |
logger.info( "Double visit thursday " + addr); |
logger.info( "Double visit thursday " + addr); |
404 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
405 |
} |
} |
406 |
} |
} |
407 |
|
|
422 |
} |
} |
423 |
} |
} |
424 |
} else { |
} else { |
425 |
|
duplicateCount++; |
426 |
logger.info( "Double visit friday " + addr); |
logger.info( "Double visit friday " + addr); |
427 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
428 |
} |
} |
429 |
} |
} |
430 |
|
|
446 |
} |
} |
447 |
} |
} |
448 |
} else { |
} else { |
449 |
|
duplicateCount++; |
450 |
logger.info( "Double visit saturday " + addr); |
logger.info( "Double visit saturday " + addr); |
451 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
452 |
} |
} |
453 |
} |
} |
454 |
|
|
469 |
} |
} |
470 |
} |
} |
471 |
} else { |
} else { |
472 |
|
duplicateCount++; |
473 |
logger.info( "Double visit sunday " + addr); |
logger.info( "Double visit sunday " + addr); |
474 |
|
return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters |
475 |
} |
} |
476 |
} |
} |
477 |
|
|
499 |
|
|
500 |
|
|
501 |
private void createFromEntry(AddressSourceEntry entry) { |
private void createFromEntry(AddressSourceEntry entry) { |
502 |
|
if (entry.husnr >= 1000) { //husnumre i DK må kun være på 3 cifre |
503 |
|
return; |
504 |
|
} |
505 |
|
|
506 |
if (entry.husnr == 999) { |
if (entry.husnr == 999) { |
507 |
return; |
return; |
508 |
} |
} |
509 |
|
|
510 |
|
if (entry.litra.length() > 1) { //litra må kun være på 1 tegn |
511 |
|
return; |
512 |
|
} |
513 |
|
if (entry.litra.length() == 1) { |
514 |
|
char litra = entry.litra.charAt(0); |
515 |
|
if ( Character.isLetter(litra) == false ) { |
516 |
|
return; |
517 |
|
} |
518 |
|
|
519 |
|
} |
520 |
|
|
521 |
if (entry.kommunekode == 0 || entry.vejkode == 0) { |
if (entry.kommunekode == 0 || entry.vejkode == 0) { |
522 |
return; |
return; |
523 |
} |
} |
528 |
if (entry.gadeid == 0) { |
if (entry.gadeid == 0) { |
529 |
return; |
return; |
530 |
} |
} |
531 |
|
|
532 |
String gadeidStr = Integer.toString(entry.gadeid); |
String gadeidStr = Integer.toString(entry.gadeid); |
533 |
if (gadeidStr.length() != 9) { |
if (gadeidStr.length() != 9) { |
534 |
return; |
return; |
541 |
|
|
542 |
logger.info("Opretter adresse ud fra " + entry); |
logger.info("Opretter adresse ud fra " + entry); |
543 |
|
|
544 |
Address a = new Address(); |
Address addr = new Address(); |
545 |
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; |
|
|
} |
|
546 |
|
|
547 |
updateDbkBane(a); |
addr.distributor = entry.distributor; |
548 |
|
addr.gadeid = entry.gadeid; |
549 |
|
addr.kommunekode = entry.kommunekode; |
550 |
|
addr.vejkode = entry.vejkode; |
551 |
|
addr.vejnavn = entry.vejnavn; |
552 |
|
addr.husnr = entry.husnr; |
553 |
|
addr.husnrbogstav = entry.litra; |
554 |
|
addr.postnr = entry.postnr; |
555 |
|
|
|
// Nu er det nye adresse object oprettet - nu skal det gemmes i søge strukturen og totallisten |
|
556 |
|
|
557 |
|
updateAddress(addr, entry); |
558 |
|
|
559 |
TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( a.gadeid ); |
|
560 |
|
// Nu er det nye adresse object oprettet - nu skal det gemmes i søge strukturen og totallisten |
561 |
|
TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( addr.gadeid ); |
562 |
|
|
563 |
if (gade == null) { |
if (gade == null) { |
564 |
gade = new TreeMap<Short,ArrayList<Address>>(); |
gade = new TreeMap<Short,ArrayList<Address>>(); |
565 |
searchStructure.put(a.gadeid, gade); |
searchStructure.put(addr.gadeid, gade); |
566 |
} |
} |
567 |
|
|
568 |
ArrayList<Address> litraList = gade.get(a.husnr); |
ArrayList<Address> litraList = gade.get(addr.husnr); |
569 |
if (litraList == null) { |
if (litraList == null) { |
570 |
litraList = new ArrayList<Address>(); |
litraList = new ArrayList<Address>(); |
571 |
gade.put(a.husnr, litraList); |
gade.put(addr.husnr, litraList); |
572 |
} |
} |
573 |
|
|
574 |
litraList.add(a); |
litraList.add(addr); |
575 |
addressList.add(a); |
addressList.add(addr); |
576 |
|
|
577 |
} |
} |
578 |
|
|
646 |
return Collections.unmodifiableMap( unknownStreets ); |
return Collections.unmodifiableMap( unknownStreets ); |
647 |
} |
} |
648 |
|
|
649 |
|
public int getDuplicateCount() { |
650 |
|
return duplicateCount; |
651 |
|
} |
652 |
|
|
653 |
public int getRejectedCount() { |
public int getRejectedCount() { |
654 |
return rejectedEntries.size(); |
return rejectedEntries.size(); |