--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/17 07:38:24	2316
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/17 08:27:13	2318
@@ -45,7 +45,7 @@
 
 			// Cache String instanserne for distributor for at mindske hukommelses forbruget
 			// (De-dubblicate)
-			String dbDistributor = res.getString(2);			
+			String dbDistributor = res.getString(9);			
 			String distributor = distributorer.getInstance(dbDistributor);
 			
 			Address a = new Address();
@@ -102,13 +102,19 @@
 		
 		ResultSet res = stmt.executeQuery(sql);
 		
+		DeduplicateHelper<String> transportTyper = new DeduplicateHelper<String>();
+		
 		List<ExtendedBean> list = new ArrayList<ExtendedBean>( 350000); //Initial capacity 350K
 		while (res.next()) {
+			
+			String dbTransport = res.getString(4);			
+			String transport = transportTyper.getInstance(dbTransport);
+			
 			ExtendedBean eb = new ExtendedBean();
 			eb.orgId = res.getInt(1);
 			eb.targetId = res.getInt(2);
 			eb.afstand = res.getDouble(3);
-			eb.transport = res.getString(4);
+			eb.transport = transport;
 						
 			list.add(eb);
 		}
@@ -132,11 +138,16 @@
 
 		Map<Integer,HundredePctBean> map = new HashMap<Integer,HundredePctBean>();
 		
+		DeduplicateHelper<String> distributorer = new DeduplicateHelper<String>();
+		
 		while (res.next()) {
 			
+			String dbDistributor = res.getString(2);			
+			String distributor = distributorer.getInstance(dbDistributor);
+			
 			HundredePctBean bean = new HundredePctBean();
 			bean.postnr = res.getInt(1);
-			bean.distributor = res.getString(2);
+			bean.distributor = distributor;
 			bean.rute = res.getString(3);
 			bean.koreliste = res.getString(4);
 			bean.dbkBane = res.getInt(5);