--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/db/DatabaseLayerImplementation.java	2016/01/19 10:01:00	2820
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/db/DatabaseLayerImplementation.java	2016/01/19 10:02:51	2821
@@ -21,7 +21,7 @@
 
 public class DatabaseLayerImplementation implements DatabaseLayer {
 	
-	static boolean DEBUG = false;
+	static boolean DEBUG = true;
 	
 	@Override
 	public List<Address> getAllAdresses() throws SQLException {
@@ -30,11 +30,13 @@
 		String debugFilter = DatabaseLayerImplementation.DEBUG ? " AND postnr = 8700 " : "";
 		
 		String sql = 
-				"SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,koreliste,rute,korelisteloerdag,ruteloerdag,korelistesoendag,rutesoendag,latitude,longitude "
+				"SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,latitude,longitude, "
+				+ "rutema,korelistema,ruteti,korelisteti,ruteon,korelisteon,ruteto,korelisteto,rutefr,korelistefr,rutelo,korelistelo,ruteso,korelisteso "
 				+ "FROM fulddaekning.adressetabel "
 				+ "WHERE gadeid IS NOT NULL "
 				+ debugFilter
 				;
+
 		
 		try ( Connection conn = DBConnection.getConnection();		
 				Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
@@ -47,8 +49,7 @@
 			DeduplicateHelper<String> vejnavnCache = new DeduplicateHelper<String>(81920);
 			DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>();
 			DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>();
-			DeduplicateHelper<String> korelisteCache = new DeduplicateHelper<String>(8192);
-			DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(8192);
+			DeduplicateHelper<String> dirigeringsCache = new DeduplicateHelper<String>(16*1024);
 	
 			
 			while (res.next()) {
@@ -64,18 +65,29 @@
 				a.gadeid = res.getInt(8);
 				a.distributor = distributorCache.getInstance(res.getString(9));
 				a.dbkBane = (short) res.getInt(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.ruteTirsdag = dirigeringsCache.getInstance( res.getString(15) );
+				a.korelisteTirsdag = dirigeringsCache.getInstance( res.getString(16) );				
+
+				a.ruteOnsdag = dirigeringsCache.getInstance( res.getString(17) );
+				a.korelisteOnsdag = dirigeringsCache.getInstance( res.getString(18) );
+				
+				a.ruteTorsdag = dirigeringsCache.getInstance( res.getString(19) );
+				a.korelisteTorsdag = dirigeringsCache.getInstance( res.getString(20) );
 				
-				a.koreliste = korelisteCache.getInstance( res.getString(11) );
-				a.rute = ruteCache.getInstance( res.getString(12) );
-				a.korelisteLordag = korelisteCache.getInstance( res.getString(13) );
-				a.ruteLordag = ruteCache.getInstance( res.getString(14) );				
-				a.korelisteSondag = korelisteCache.getInstance( res.getString(15) );
-				a.ruteSondag = ruteCache.getInstance( res.getString(16) );
+				a.ruteFredag = dirigeringsCache.getInstance( res.getString(21) );
+				a.korelisteFredag = dirigeringsCache.getInstance( res.getString(22) );
 				
-				a.latitude = (float) res.getDouble(17);
-				a.longitude = (float) res.getDouble(18);
+				a.ruteLordag = dirigeringsCache.getInstance( res.getString(23) );
+				a.korelisteLordag = dirigeringsCache.getInstance( res.getString(24) );
 				
-				//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
+				a.ruteSondag = dirigeringsCache.getInstance( res.getString(25) );
+				a.korelisteSondag = dirigeringsCache.getInstance( res.getString(16) );
 				
 				
 				//Ajourfør adresse objectets dækningstype