--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/13 15:15:13	2282
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/13 15:45:24	2283
@@ -10,7 +10,6 @@
 import java.util.List;
 import java.util.Map;
 
-import dk.daoas.daoadresseservice.AddressUtils;
 import dk.daoas.daoadresseservice.DaekningsType;
 import dk.daoas.daoadresseservice.beans.Address;
 import dk.daoas.daoadresseservice.beans.ExtendedBean;
@@ -20,9 +19,9 @@
 	
 	public static List<Address> getAllAdresses() throws SQLException {
 		
-		String sql = "SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,distributor,dbkbane,koreliste,rute "
+		String sql = "SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,koreliste,rute "
 				+ "FROM fulddaekning.adressetabel "
-				+ "WHERE postnr >=5000" //DEBUG only
+				//+ "WHERE postnr >=2000" //DEBUG only
 				;
 		
 		Connection conn = DBConnection.getConnection();		
@@ -52,11 +51,7 @@
 				a.daekningsType = DaekningsType.DAEKNING_DIREKTE;
 			} else {
 				a.daekningsType = DaekningsType.DAEKNING_IKKEDAEKKET;
-			}
-			
-			if (a.distributor != null) {
-				a.distributor = a.distributor.toUpperCase();
-			}
+			}			
 			
 			list.add(a);
 		}
@@ -70,7 +65,7 @@
 	}
 	
 	public static List<ExtendedBean> getExtendedAdresslist() throws SQLException {
-		String sql = "select orgid, a.id as targetid, afstand,type from fulddaekning.afstand_anden_rute a " +
+		String sql = "select orgid, a.id as targetid, afstand, LOWER(type) as type from fulddaekning.afstand_anden_rute a " +
 					"join odbc.transporttype t " + 
 					"on t.Art = 'Transpost' " +
 					"and ( (t.Type = 'Cykel' and a.Afstand < 1.001) or (t.Type = 'Scooter' and a.Afstand < 1.201) or (t.Type = 'Bil' and a.Afstand < 2.601) ) " +
@@ -93,7 +88,7 @@
 			eb.orgId = res.getInt(1);
 			eb.targetId = res.getInt(2);
 			eb.afstand = res.getDouble(3);
-			eb.transport = res.getString(4).toLowerCase();
+			eb.transport = res.getString(4);
 						
 			list.add(eb);
 		}
@@ -108,7 +103,7 @@
 	}
 	
 	public static Map<Integer,HundredePctBean> get100PctList() throws SQLException {
-		String sql = "SELECT postnr,distributor,rute,koreliste,dbkbane " + 
+		String sql = "SELECT postnr,UPPER(distributor) as distributor,rute,koreliste,dbkbane " + 
 					 "FROM bogleveringer.adresser_udenfor_daekning";
 		
 		Connection conn = DBConnection.getConnection();		
@@ -121,7 +116,7 @@
 			
 			HundredePctBean bean = new HundredePctBean();
 			bean.postnr = res.getInt(1);
-			bean.distributor = res.getString(2).toUpperCase();
+			bean.distributor = res.getString(2);
 			bean.rute = res.getString(3);
 			bean.koreliste = res.getString(4);
 			bean.dbkBane = res.getInt(5);