--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java 2015/02/13 15:12:28 2281 +++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java 2015/02/13 15:45:24 2283 @@ -10,19 +10,18 @@ import java.util.List; import java.util.Map; -import dk.daoas.daoadresseservice.Address; -import dk.daoas.daoadresseservice.AddressUtils; import dk.daoas.daoadresseservice.DaekningsType; -import dk.daoas.daoadresseservice.ExtendedBean; -import dk.daoas.daoadresseservice.HundredePctBean; +import dk.daoas.daoadresseservice.beans.Address; +import dk.daoas.daoadresseservice.beans.ExtendedBean; +import dk.daoas.daoadresseservice.beans.HundredePctBean; public class DatabaseLayer { public static List
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