--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/13 13:48:09	2276
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/13 15:15:13	2282
@@ -6,12 +6,15 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.HashMap;
 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.beans.Address;
+import dk.daoas.daoadresseservice.beans.ExtendedBean;
+import dk.daoas.daoadresseservice.beans.HundredePctBean;
 
 public class DatabaseLayer {
 	
@@ -19,7 +22,7 @@
 		
 		String sql = "SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,distributor,dbkbane,koreliste,rute "
 				+ "FROM fulddaekning.adressetabel "
-				+ "WHERE postnr BETWEEN 8700 and 8899 OR POSTNR=8300" //DEBUG only
+				+ "WHERE postnr >=5000" //DEBUG only
 				;
 		
 		Connection conn = DBConnection.getConnection();		
@@ -43,7 +46,7 @@
 			a.koreliste = res.getString(11);
 			a.rute = res.getString(12);
 			
-			a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
+			//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
 			
 			if (a.rute != null && a.rute.length()> 0) {
 				a.daekningsType = DaekningsType.DAEKNING_DIREKTE;
@@ -66,7 +69,7 @@
 		return list;
 	}
 	
-	public static List<ExtendedBean> getExtendedAdresslistDao() throws SQLException {
+	public static List<ExtendedBean> getExtendedAdresslist() throws SQLException {
 		String sql = "select orgid, a.id as targetid, afstand,type from fulddaekning.afstand_anden_rute a " +
 					"join odbc.transporttype t " + 
 					"on t.Art = 'Transpost' " +
@@ -104,4 +107,36 @@
 		return list;
 	}
 	
+	public static Map<Integer,HundredePctBean> get100PctList() throws SQLException {
+		String sql = "SELECT postnr,distributor,rute,koreliste,dbkbane " + 
+					 "FROM bogleveringer.adresser_udenfor_daekning";
+		
+		Connection conn = DBConnection.getConnection();		
+		Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
+		ResultSet res = stmt.executeQuery(sql);
+
+		Map<Integer,HundredePctBean> map = new HashMap<Integer,HundredePctBean>();
+		
+		while (res.next()) {
+			
+			HundredePctBean bean = new HundredePctBean();
+			bean.postnr = res.getInt(1);
+			bean.distributor = res.getString(2).toUpperCase();
+			bean.rute = res.getString(3);
+			bean.koreliste = res.getString(4);
+			bean.dbkBane = res.getInt(5);			
+						
+			map.put(bean.postnr, bean);
+		}
+		
+		res.close();
+		stmt.close();
+		conn.close();
+		
+		System.out.println("Loaded " + map.size() + " extendedbeans");
+		
+		return map;
+		
+	}
+	
 }