--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/db/DatabaseLayerImplementation.java	2016/01/19 10:02:51	2821
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/db/DatabaseLayerImplementation.java	2016/10/10 12:56:57	3122
@@ -21,7 +21,7 @@
 
 public class DatabaseLayerImplementation implements DatabaseLayer {
 	
-	static boolean DEBUG = true;
+	public static final boolean DEBUG = false;
 	
 	@Override
 	public List<Address> getAllAdresses() throws SQLException {
@@ -39,7 +39,7 @@
 
 		
 		try ( Connection conn = DBConnection.getConnection();		
-				Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
+				Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
 				) {
 			stmt.setFetchSize(Integer.MIN_VALUE);
 			ResultSet res = stmt.executeQuery(sql);
@@ -50,6 +50,8 @@
 			DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>();
 			DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>();
 			DeduplicateHelper<String> dirigeringsCache = new DeduplicateHelper<String>(16*1024);
+			
+			DeduplicateHelper<String> baneCache = new DeduplicateHelper<String>();
 	
 			
 			while (res.next()) {
@@ -64,30 +66,30 @@
 				a.postnr = (short)res.getInt(7);
 				a.gadeid = res.getInt(8);
 				a.distributor = distributorCache.getInstance(res.getString(9));
-				a.dbkBane = (short) res.getInt(10);
+				a.dbkBane = baneCache.getInstance( res.getString(10) );
 				a.latitude = (float) res.getDouble(11);
 				a.longitude = (float) res.getDouble(12);
 				
-				a.ruteMandag = dirigeringsCache.getInstance( res.getString(13) );
-				a.korelisteMandag = dirigeringsCache.getInstance( res.getString(14) );
+				a.routingMandag.rute = dirigeringsCache.getInstance( res.getString(13) );
+				a.routingMandag.koreliste = dirigeringsCache.getInstance( res.getString(14) );
 				
-				a.ruteTirsdag = dirigeringsCache.getInstance( res.getString(15) );
-				a.korelisteTirsdag = dirigeringsCache.getInstance( res.getString(16) );				
+				a.routingTirsdag.rute = dirigeringsCache.getInstance( res.getString(15) );
+				a.routingTirsdag.koreliste = dirigeringsCache.getInstance( res.getString(16) );				
 
-				a.ruteOnsdag = dirigeringsCache.getInstance( res.getString(17) );
-				a.korelisteOnsdag = dirigeringsCache.getInstance( res.getString(18) );
+				a.routingOnsdag.rute = dirigeringsCache.getInstance( res.getString(17) );
+				a.routingOnsdag.koreliste = dirigeringsCache.getInstance( res.getString(18) );
 				
-				a.ruteTorsdag = dirigeringsCache.getInstance( res.getString(19) );
-				a.korelisteTorsdag = dirigeringsCache.getInstance( res.getString(20) );
+				a.routingTorsdag.rute = dirigeringsCache.getInstance( res.getString(19) );
+				a.routingTorsdag.koreliste = dirigeringsCache.getInstance( res.getString(20) );
 				
-				a.ruteFredag = dirigeringsCache.getInstance( res.getString(21) );
-				a.korelisteFredag = dirigeringsCache.getInstance( res.getString(22) );
+				a.routingFredag.rute = dirigeringsCache.getInstance( res.getString(21) );
+				a.routingFredag.koreliste = dirigeringsCache.getInstance( res.getString(22) );
 				
-				a.ruteLordag = dirigeringsCache.getInstance( res.getString(23) );
-				a.korelisteLordag = dirigeringsCache.getInstance( res.getString(24) );
+				a.routingLordag.rute = dirigeringsCache.getInstance( res.getString(23) );
+				a.routingLordag.koreliste = dirigeringsCache.getInstance( res.getString(24) );
 				
-				a.ruteSondag = dirigeringsCache.getInstance( res.getString(25) );
-				a.korelisteSondag = dirigeringsCache.getInstance( res.getString(16) );
+				a.routingSondag.rute = dirigeringsCache.getInstance( res.getString(25) );
+				a.routingSondag.koreliste = dirigeringsCache.getInstance( res.getString(26) );
 				
 				
 				//Ajourfør adresse objectets dækningstype
@@ -114,7 +116,7 @@
 					;
 		
 		try ( Connection conn = DBConnection.getConnection();		
-				Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
+				Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
 				) {
 					
 			stmt.setFetchSize(Integer.MIN_VALUE);
@@ -166,7 +168,7 @@
 					;
 		
 		try ( Connection conn = DBConnection.getConnection();		
-				Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
+				Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
 				) {
 			
 		
@@ -204,7 +206,7 @@
 					 "FROM bogleveringer.adresser_udenfor_daekning";
 		
 		try ( Connection conn = DBConnection.getConnection();		
-				Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
+				Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
 				) {
 			ResultSet res = stmt.executeQuery(sql);
 	
@@ -213,6 +215,7 @@
 			DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>();
 			DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>();
 			DeduplicateHelper<String> korelisteCache = new DeduplicateHelper<String>();
+			DeduplicateHelper<String> baneCache = new DeduplicateHelper<String>();
 			
 			while (res.next()) {
 				
@@ -222,7 +225,7 @@
 				bean.distributor = distributorCache.getInstance(res.getString(2));
 				bean.rute = ruteCache.getInstance( res.getString(3) );
 				bean.koreliste = korelisteCache.getInstance(res.getString(4) );
-				bean.dbkBane = (short)res.getInt(5);			
+				bean.dbkBane = baneCache.getInstance(res.getString(5) ); 			
 							
 				map.put(bean.postnr, bean);
 			}
@@ -311,12 +314,16 @@
 			return 22;			
 		case ERROR_UNKNOWN_STREETNAME:
 			return 23;
-		case ERROR_UNKNOWN_ADDRESSPOINT:
+		case ERROR_UNKNOWN_HOUSENUMBER:
 			return 24;
+			
 		case STATUS_NOT_COVERED:			
 			return 25;
 		case ERROR_INTERNAL: //			
-			return 26;			
+			return 26;
+			
+		case ERROR_UNKNOWN_LITRA: //Er kommet til senere, derfor ligger den paa 27 selvom den logisk set burde have haft 25
+			return 27;			
 			
 		case STATUS_OK:
 			return 30;