--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/02/04 08:39:26	2912
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressManager.java	2016/03/31 08:17:44	2995
@@ -1,4 +1,4 @@
-package dk.daoas.adressevedligehold;
+package dk.daoas.adressevedligehold.fileupload;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -11,26 +11,24 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import dk.daoas.adressevedligehold.AddressSourceEntry.EntryType;
 import dk.daoas.adressevedligehold.beans.Address;
 import dk.daoas.adressevedligehold.beans.Address.AddressState;
-import dk.daoas.adressevedligehold.db.DatabaseLayerImplementation;
+import dk.daoas.adressevedligehold.db.DatabaseCoverageUpdate;
+import dk.daoas.adressevedligehold.fileupload.AddressSourceEntry.EntryType;
 import dk.daoas.adressevedligehold.tasks.TaskLogger;
 import dk.daoas.adressevedligehold.util.DeduplicateHelper;
 import dk.daoas.adressevedligehold.util.MiscUtils;
 import dk.daoas.adressevedligehold.util.TimingHelper;
 
 /*
- * TODO: håndtering af entry dupletter ! (+ rapportering af dem)
-
-
- 
+ *  
  */
 
 public class AddressManager {
 	
 	private TaskLogger logger = TaskLogger.getInstance();
 	
+	private int duplicateCount;
 	
 	List<Address> addressList;
 	
@@ -43,7 +41,7 @@
 	Map<Short,Short> dbkBaneMap = new TreeMap<Short,Short>();
 	
 	public AddressManager() throws SQLException {
-		DatabaseLayerImplementation db = new DatabaseLayerImplementation();
+		DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
 		
 		searchStructure = new TreeMap<Integer, TreeMap<Short, ArrayList<Address>> >();
 		
@@ -91,7 +89,8 @@
 		
 		
 	}
-	
+
+	@SuppressWarnings("PMD.CollapsibleIfStatements")	
 	public void closeUnvisitedAddresses(String distributor, EntryUgedage ugedage) {
 		for (Address addr : addressList) {
 			if (addr.distributor == null)
@@ -208,7 +207,7 @@
 			}
 		}
 		
-		DatabaseLayerImplementation db = new DatabaseLayerImplementation();
+		DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
 		
 		db.updateAddresses(updates);
 		db.saveNewAddresses(inserts);
@@ -230,9 +229,10 @@
 	private void visitSingle(AddressSourceEntry entry) {
 		TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid );
 		if (gade == null) {
+			/* No need to register unknown streets, since we create all entries that we can
 			if (! unknownStreets.containsKey(entry.gadeid)) {
 				unknownStreets.put(entry.gadeid, entry.vejnavn);				
-			}
+			}*/
 			
 			createFromEntry(entry); // if we get here there was no match - so we need to create it
 			return;
@@ -256,6 +256,7 @@
 		}
 	}
 	
+	@SuppressWarnings("PMD.CollapsibleIfStatements")	
 	private void visitRange(AddressSourceEntry entry) {
 		
 		TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid );
@@ -326,7 +327,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 +351,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 +373,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 +397,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 +420,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 +444,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 +467,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
 			}					
 		}
 		
@@ -486,7 +501,7 @@
 			return;
 		}
 		
-		if (entry.husnr == 999) {
+		if (entry.husnr == 999 || entry.husnr == 998) { //frasorter de to højest gyldige husnr - det er typisk special adresser
 			return;
 		}
 		
@@ -508,6 +523,10 @@
 			return;
 		}
 		
+		if (entry.vejkode > 9999) {
+			return;
+		}
+		
 		if (entry.gadeid == 0) {
 			return;
 		}
@@ -524,68 +543,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<Short, ArrayList<Address>> gade = searchStructure.get( a.gadeid );
+		
+		// Nu er det nye adresse object oprettet - nu skal det gemmes i søge strukturen og totallisten		
+		TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( addr.gadeid );
 		
 		if (gade == null) {
 			gade = new TreeMap<Short,ArrayList<Address>>();
-			searchStructure.put(a.gadeid, gade);
+			searchStructure.put(addr.gadeid, gade);
 		}
 		
-		ArrayList<Address> litraList = gade.get(a.husnr);
+		ArrayList<Address> litraList = gade.get(addr.husnr);
 		if (litraList == null) {
 			litraList = new ArrayList<Address>();
-			gade.put(a.husnr, litraList);
+			gade.put(addr.husnr, litraList);
 		}
 		
-		litraList.add(a);
-		addressList.add(a);
+		litraList.add(addr);
+		addressList.add(addr);
 				
 	}
 	
@@ -659,7 +648,9 @@
 		return Collections.unmodifiableMap( unknownStreets );
 	}
 	
-	
+	public int getDuplicateCount() {
+		return duplicateCount;
+	}
 	
 	public int getRejectedCount() {
 		return rejectedEntries.size();