--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java 2016/02/03 18:45:33 2903
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java 2016/02/13 06:29:18 2940
@@ -31,6 +31,7 @@
private TaskLogger logger = TaskLogger.getInstance();
+ private int duplicateCount;
List
addressList;
@@ -91,7 +92,8 @@
}
-
+
+ @SuppressWarnings("PMD.CollapsibleIfStatements")
public void closeUnvisitedAddresses(String distributor, EntryUgedage ugedage) {
for (Address addr : addressList) {
if (addr.distributor == null)
@@ -184,8 +186,8 @@
continue;
}
- System.out.println(addr.state + ": " + addr.toStringExtended() );
- System.out.println(addr.getRuteString() );
+ logger.info(addr.state + ": " + addr.toStringExtended() );
+ logger.info(addr.getRuteString() );
if (count++ > 50)
return;
@@ -256,6 +258,7 @@
}
}
+ @SuppressWarnings("PMD.CollapsibleIfStatements")
private void visitRange(AddressSourceEntry entry) {
TreeMap> gade = searchStructure.get( entry.gadeid );
@@ -326,7 +329,9 @@
}
}
} else {
+ duplicateCount++;
logger.info( "Double visit monday " + addr);
+ return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
}
}
@@ -348,7 +353,9 @@
}
}
} else {
+ duplicateCount++;
logger.info( "Double visit tuesday " + addr);
+ return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
}
}
@@ -368,7 +375,9 @@
}
}
} else {
+ duplicateCount++;
logger.info( "Double visit wednesday " + addr);
+ return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
}
}
@@ -390,7 +399,9 @@
}
}
} else {
+ duplicateCount++;
logger.info( "Double visit thursday " + addr);
+ return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
}
}
@@ -411,7 +422,9 @@
}
}
} else {
+ duplicateCount++;
logger.info( "Double visit friday " + addr);
+ return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
}
}
@@ -433,7 +446,9 @@
}
}
} else {
+ duplicateCount++;
logger.info( "Double visit saturday " + addr);
+ return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
}
}
@@ -454,7 +469,9 @@
}
}
} else {
+ duplicateCount++;
logger.info( "Double visit sunday " + addr);
+ return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
}
}
@@ -482,9 +499,25 @@
private void createFromEntry(AddressSourceEntry entry) {
+ if (entry.husnr >= 1000) { //husnumre i DK må kun være på 3 cifre
+ return;
+ }
+
if (entry.husnr == 999) {
return;
}
+
+ if (entry.litra.length() > 1) { //litra må kun være på 1 tegn
+ return;
+ }
+ if (entry.litra.length() == 1) {
+ char litra = entry.litra.charAt(0);
+ if ( Character.isLetter(litra) == false ) {
+ return;
+ }
+
+ }
+
if (entry.kommunekode == 0 || entry.vejkode == 0) {
return;
}
@@ -495,7 +528,7 @@
if (entry.gadeid == 0) {
return;
}
-
+
String gadeidStr = Integer.toString(entry.gadeid);
if (gadeidStr.length() != 9) {
return;
@@ -508,68 +541,38 @@
logger.info("Opretter adresse ud fra " + entry);
- Address a = new Address();
- a.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;
- }
+ Address addr = new Address();
+ addr.state = AddressState.CREATED;
- updateDbkBane(a);
+ addr.distributor = entry.distributor;
+ addr.gadeid = entry.gadeid;
+ addr.kommunekode = entry.kommunekode;
+ addr.vejkode = entry.vejkode;
+ addr.vejnavn = entry.vejnavn;
+ addr.husnr = entry.husnr;
+ addr.husnrbogstav = entry.litra;
+ addr.postnr = entry.postnr;
- // Nu er det nye adresse object oprettet - nu skal det gemmes i søge strukturen og totallisten
+ updateAddress(addr, entry);
- TreeMap> gade = searchStructure.get( a.gadeid );
+
+ // Nu er det nye adresse object oprettet - nu skal det gemmes i søge strukturen og totallisten
+ TreeMap> gade = searchStructure.get( addr.gadeid );
if (gade == null) {
gade = new TreeMap>();
- searchStructure.put(a.gadeid, gade);
+ searchStructure.put(addr.gadeid, gade);
}
- ArrayList litraList = gade.get(a.husnr);
+ ArrayList litraList = gade.get(addr.husnr);
if (litraList == null) {
litraList = new ArrayList();
- gade.put(a.husnr, litraList);
+ gade.put(addr.husnr, litraList);
}
- litraList.add(a);
- addressList.add(a);
+ litraList.add(addr);
+ addressList.add(addr);
}
@@ -643,7 +646,9 @@
return Collections.unmodifiableMap( unknownStreets );
}
-
+ public int getDuplicateCount() {
+ return duplicateCount;
+ }
public int getRejectedCount() {
return rejectedEntries.size();