--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/07/13 11:10:28	2599
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/07/15 06:52:05	2608
@@ -42,6 +42,8 @@
 	
 	private DataStatisticsBean stats = new DataStatisticsBean();
 	
+	private DatabaseLayer db;
+	
 	ServiceConfig config;
 	
 	StreetnameHelper levenshteinHelper;
@@ -49,9 +51,11 @@
 	StreetnameHelper osmHelper;
 	
 	
-	public AddressSearch(ServiceConfig config) {
+	public AddressSearch(DatabaseLayer db, ServiceConfig config) {
 		this.config = config;
 		
+		this.db = db;
+		
 		levenshteinHelper = new LevenshteinStreetnameHelper( this );
 		googleHelper = new GoogleStreetnameHelper( config );
 		osmHelper = new OSMStreetnameHelper( config );
@@ -250,7 +254,7 @@
 		long start1 = System.currentTimeMillis();
 		System.out.println("Build -- stage 1");
 		
-		alleAdresser = DatabaseLayer.getAllAdresses();
+		alleAdresser = db.getAllAdresses();
 		
 		
 		/* Mapper mellem db Row ID og adresse noden */
@@ -301,7 +305,7 @@
 		System.out.println("Build -- stage 2 alias tabel");
 		
 		int vaskCount = 0;
-		List<AliasBean> aliasList = DatabaseLayer.getAliasList();
+		List<AliasBean> aliasList = db.getAliasList();
 		for (AliasBean alias : aliasList) {
 			Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr);
 			
@@ -338,7 +342,7 @@
 		DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>();
 		DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>();
 		
-		List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist();
+		List<ExtendedBean> extDao = db.getExtendedAdresslist();
 		for (ExtendedBean eb : extDao) {
 			
 			Address orgAddress = idAddressMap.get(eb.orgId);			
@@ -412,7 +416,7 @@
 		System.out.println("Build, stage3 elapsed: " + (start4-start3) );
 		System.out.println("Build -- stage 4 - 100pct");
 		
-		Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList();
+		Map<Short,HundredePctBean> hundredePct = db.get100PctList();
 		for (Address addr : alleAdresser) {
 			if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {				
 				continue;
@@ -476,6 +480,10 @@
 		return stats;
 	}
 	
+	public DatabaseLayer getDatabaseLayer() {
+		return db;
+	}
+	
 	public void clear() {
 		searchPostnrVejnavnGadeid.clear();
 		searchGadeidentAdresser.clear();