daoas/fulddaekning/Database.java

package dk.daoas.fulddaekning;

import geocode.GeoPoint;

import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
import java.util.logging.Logger;


public class Database { 
        Logger logger = Logger.getLogger(Database.class.getName());

        int batchCount = 0;

        Connection conn;
        PreparedStatement saveStmt;
        
        List<GeoPoint> alleAdresser;
        Adresse alleIkkeDaekkede[];
        
        Map<Short,List<GeoPoint>> daekkedeAdresserHO = new HashMap<Short,List<GeoPoint>>();
        
        
        DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>();
        DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(); 
        
        Set<Short> postnumre = new TreeSet<Short>();
        
        //Map<Short, List<Adresse>> ikkeDaekkedePrPost = new HashMap<Short, List<Adresse>>(); 
        
        
        private HashMap<Short,BoundingBox> bbCache = new HashMap<Short,BoundingBox>();

        public Database(SafeProperties conf)  throws SQLException,IOException {
                this.conn = getConnection( conf );      

                String sql = "INSERT INTO fulddaekning.afstand_anden_rute_ny (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+
                                "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";

                saveStmt = conn.prepareStatement(sql);          

        }

        public void resetResultTable() throws SQLException {
                logger.info("Dropping old result table (if exists)");
                String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_ny";
                conn.createStatement().executeUpdate(sql);
                
                logger.info("Create new result table");
                sql = "CREATE TABLE fulddaekning.afstand_anden_rute_ny LIKE fulddaekning.afstand_anden_rute";
                conn.createStatement().executeUpdate(sql);              
        }       
        
        public void renameResultTables() throws SQLException {
                Constants consts = Constants.getInstance();
                String ext = consts.getTableExtension();
                
                logger.info("Dropping old backup table (if exists)");
                String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_old" + ext;
                conn.createStatement().executeUpdate(sql);
                
                logger.info("Rename tables");
                String sql2 = "RENAME TABLE fulddaekning.afstand_anden_rute" + ext + " TO fulddaekning.afstand_anden_rute_old" + ext + ", fulddaekning.afstand_anden_rute_ny TO fulddaekning.afstand_anden_rute" + ext;

                logger.info("Executing: " + sql2);
                conn.createStatement().executeUpdate(sql2);             
        }
        
        public BoundingBox getBoundingbox(short postnr)  {
                BoundingBox bb = bbCache.get(postnr);
                return bb.clone();//never return the original / cached object
        }
        
        
        public Set<Short> hentPostnumreCache() {
                return postnumre;
        }


        public Adresse[] hentAlleIkkedaekkedeAdresser(int minPostnr, int maxPostnr)  throws SQLException {
                
                logger.info("Henter alle IKKE-daekkede adresser");

                String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + 
                                "FROM fulddaekning.adressetabel a " +
                                "LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
                                "WHERE rute IS NULL " +  //Ingen dækning
                                "AND a.postnr BETWEEN ? AND ? " +
                                "AND a.postnr NOT BETWEEN 3900 and 3999 " + //Skip greenland
                                "AND a.postnr NOT BETWEEN 9000 AND 9499 " + // Skip nordjylland (DAO)
                                "AND latitude IS NOT NULL " +
                                "AND longitude IS NOT NULL " +
                                "AND gadeid IS NOT NULL " +
                                "AND (a.distributor IS NULL OR a.distributor<>'LUKKET') ";              
                PreparedStatement stmt = conn.prepareStatement(sql);
                stmt.setInt(1, minPostnr);
                stmt.setInt(2, maxPostnr);

                List<Adresse> list = hentAdresseListe( stmt );
                alleIkkeDaekkede = list.toArray( new Adresse[ list.size() ] );
                
                logger.info("Analyserer ikke-daekkede adresser");
                
                for (Adresse a : alleIkkeDaekkede) {
                        
                        
                        BoundingBox bbox;
                        
                        if (! postnumre.contains(a.postnr )) {
                                postnumre.add( a.postnr );
                                
                                bbox = new BoundingBox(); 
                                
                                bbCache.put( a.postnr, bbox);                                                                                   
                                
                        } else {
                                 bbox = bbCache.get( a.postnr);
                        }
                        
                        bbox.latitudeMax = Math.max(bbox.latitudeMax, a.latitude);
                        bbox.latitudeMin = Math.min(bbox.latitudeMin, a.latitude);
                        bbox.longitudeMax = Math.max(bbox.longitudeMax, a.longitude);
                        bbox.longitudeMin = Math.min(bbox.longitudeMin, a.longitude);
                        
                        
                }
                return alleIkkeDaekkede;
        }
        

        public Map<Short, List<GeoPoint>> getDaekkedeAdresserHO() {
                return daekkedeAdresserHO;
        }
        
        public int hentAlleDaekkedeAdresser() throws SQLException {
                if ( alleAdresser == null ) {
                        String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + 
                                        "FROM fulddaekning.adressetabel a " +
                                        "LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
                                        "WHERE rute IS NOT NULL " + 
                                        "AND latitude IS NOT NULL " +
                                        "AND longitude IS NOT NULL " +
                                        "AND a.distributor = ? ";
        
                        // Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets)
                        // Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html 
                        PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
                        stmt.setFetchSize(Integer.MIN_VALUE);
        
                        stmt.setString(1, LookupMain.distributor);
        
                        List<Adresse> list = hentAdresseListe( stmt );
                        
                        alleAdresser = new ArrayList<GeoPoint>();
                        alleAdresser.addAll(list);
                        
                        for(Adresse addr : list) {
                                short ho = addr.ho;
                                List<GeoPoint> hoListe = daekkedeAdresserHO.get(ho);
                                if ( hoListe == null) {
                                        hoListe = new ArrayList<GeoPoint>();
                                        daekkedeAdresserHO.put(ho, hoListe);                                    
                                }
                                
                                hoListe.add(addr);                                                              
                                
                        }
                }
                
                return alleAdresser.size();
        }
        
        
        public synchronized void gemResultat(Adresse orgAdresse, Adresse bedsteAdresse, double bedsteAfstand) throws SQLException {
                /*String sql = "INSERT INTO fulddaekning.afstand_anden_rute_thn (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+
                                "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";

                PreparedStatement saveStmt = conn.prepareStatement(sql);*/

                saveStmt.setInt(1, orgAdresse.id);
                saveStmt.setShort(2, orgAdresse.postnr);
                saveStmt.setString(3, orgAdresse.adresse);
                saveStmt.setInt(4, orgAdresse.gadeid);
                saveStmt.setShort(5, orgAdresse.husnr);
                saveStmt.setString(6, orgAdresse.husnrbogstav);
                saveStmt.setDouble(7, orgAdresse.latitude);
                saveStmt.setDouble(8, orgAdresse.longitude);
                saveStmt.setString(9, orgAdresse.rute);


                saveStmt.setInt(10, bedsteAdresse.id);
                saveStmt.setShort(11, bedsteAdresse.postnr);
                saveStmt.setString(12, bedsteAdresse.adresse);
                saveStmt.setInt(13, bedsteAdresse.gadeid);
                saveStmt.setShort(14, bedsteAdresse.husnr);
                saveStmt.setString(15, bedsteAdresse.husnrbogstav);
                saveStmt.setDouble(16, bedsteAdresse.latitude);
                saveStmt.setDouble(17, bedsteAdresse.longitude);
                saveStmt.setString(18, bedsteAdresse.rute);

                saveStmt.setDouble(19, bedsteAfstand);

                saveStmt.addBatch();
                batchCount++;
                if (batchCount >= 1000) {
                        saveStmt.executeBatch();
                        batchCount = 0;
                }
                //saveStmt.executeUpdate();     
                //saveStmt.clearParameters();

                //saveStmt.close();     
        }
        
        public synchronized void saveBatch() throws SQLException{
                saveStmt.executeBatch();
                batchCount = 0;
        }


        protected ArrayList<Adresse> hentAdresseListe(PreparedStatement stmt) throws SQLException{
                ArrayList<Adresse> list = new ArrayList<Adresse>( 1000000 );

                //logger.info("Starting query");
                ResultSet res = stmt.executeQuery();
                //logger.info("Starting exec query done");

                while (res.next()) {
                        
                        double latitude = res.getDouble(7);
                        double longitude = res.getDouble(8);

                        
                        Adresse adr = new Adresse(latitude,longitude);

                        adr.id = res.getInt(1);
                        adr.postnr = res.getShort(2);
                        adr.adresse = res.getString(3);
                        adr.gadeid = res.getInt(4);
                        adr.husnr = res.getShort(5);
                        adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) );
                        //adr.latitude = res.getDouble(7);
                        //adr.longitude = res.getDouble(8);
                        adr.rute =  ruteCache.getInstance( res.getString(9) );
                        adr.ho = res.getShort(10);

                        list.add(adr);

                        //logger.info( "Adress:" + adr);
                }

                res.close();
                stmt.close();

                return list;
        }

        public Connection getConnection(SafeProperties conf) throws SQLException, IOException {
                
                String db_host = conf.getSafeProperty("DB_HOST");
                String db_user = conf.getSafeProperty("DB_USER");
                String db_pass = conf.getSafeProperty("DB_PASS");

                
            Connection conn = null;
            Properties connectionProps = new Properties();
            connectionProps.put("user", db_user);
            connectionProps.put("password", db_pass);

            //For debug output, tilføj denne til JDBC url'en: &profileSQL=true     
            conn = DriverManager.getConnection(
                           "jdbc:mysql://" +
                           db_host +
                           ":3306/?rewriteBatchedStatements=true",
                           connectionProps);
            logger.info("Connected to database");
            return conn;
        }

                
}
1	torben	2145	package dk.daoas.fulddaekning;
2
3	torben	2585	import geocode.GeoPoint;
4
5	torben	2152	import java.io.IOException;
6	torben	2145	import java.sql.Connection;
7	torben	2152	import java.sql.DriverManager;
8	torben	2145	import java.sql.PreparedStatement;
9			import java.sql.ResultSet;
10			import java.sql.SQLException;
11			import java.util.ArrayList;
12	torben	2247	import java.util.HashMap;
13	torben	2145	import java.util.List;
14	torben	2597	import java.util.Map;
15	torben	2152	import java.util.Properties;
16	torben	2328	import java.util.Set;
17			import java.util.TreeSet;
18	torben	2145	import java.util.logging.Logger;
19
20
21	torben	2219
22	torben	2145	public class Database {
23			Logger logger = Logger.getLogger(Database.class.getName());
24	torben	2151
25	torben	2219	int batchCount = 0;
26	torben	2151
27	torben	2145	Connection conn;
28			PreparedStatement saveStmt;
29	torben	2247
30	torben	2585	List<GeoPoint> alleAdresser;
31	torben	2328	Adresse alleIkkeDaekkede[];
32	torben	2263
33	torben	2597	Map<Short,List<GeoPoint>> daekkedeAdresserHO = new HashMap<Short,List<GeoPoint>>();
34	torben	2328
35	torben	2597
36
37
38
39
40	torben	2327	DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>();
41			DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>();
42
43	torben	2575	Set<Short> postnumre = new TreeSet<Short>();
44	torben	2328
45	torben	2585	//Map<Short, List<Adresse>> ikkeDaekkedePrPost = new HashMap<Short, List<Adresse>>();
46	torben	2328
47
48	torben	2575	private HashMap<Short,BoundingBox> bbCache = new HashMap<Short,BoundingBox>();
49	torben	2145
50	torben	2157	public Database(SafeProperties conf) throws SQLException,IOException {
51	torben	2152	this.conn = getConnection( conf );
52	torben	2151
53	torben	2192	String sql = "INSERT INTO fulddaekning.afstand_anden_rute_ny (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+
54	torben	2151	"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
55	torben	2145
56	torben	2150	saveStmt = conn.prepareStatement(sql);
57	torben	2151
58	torben	2145	}
59	torben	2151
60			public void resetResultTable() throws SQLException {
61	torben	2192	logger.info("Dropping old result table (if exists)");
62			String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_ny";
63	torben	2151	conn.createStatement().executeUpdate(sql);
64	torben	2192
65			logger.info("Create new result table");
66			sql = "CREATE TABLE fulddaekning.afstand_anden_rute_ny LIKE fulddaekning.afstand_anden_rute";
67			conn.createStatement().executeUpdate(sql);
68	torben	2151	}
69	torben	2192
70			public void renameResultTables() throws SQLException {
71	torben	2223	Constants consts = Constants.getInstance();
72			String ext = consts.getTableExtension();
73
74	torben	2192	logger.info("Dropping old backup table (if exists)");
75	torben	2223	String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_old" + ext;
76	torben	2192	conn.createStatement().executeUpdate(sql);
77
78			logger.info("Rename tables");
79	torben	2590	String sql2 = "RENAME TABLE fulddaekning.afstand_anden_rute" + ext + " TO fulddaekning.afstand_anden_rute_old" + ext + ", fulddaekning.afstand_anden_rute_ny TO fulddaekning.afstand_anden_rute" + ext;
80	torben	2230
81	torben	2590	logger.info("Executing: " + sql2);
82			conn.createStatement().executeUpdate(sql2);
83	torben	2247	}
84
85	torben	2575	public BoundingBox getBoundingbox(short postnr) {
86	torben	2247	BoundingBox bb = bbCache.get(postnr);
87			return bb.clone();//never return the original / cached object
88			}
89
90
91	torben	2575	public Set<Short> hentPostnumreCache() {
92	torben	2328	return postnumre;
93			}
94	torben	2151
95	torben	2328
96	torben	2585	public Adresse[] hentAlleIkkedaekkedeAdresser(int minPostnr, int maxPostnr) throws SQLException {
97	torben	2238
98	torben	2328	logger.info("Henter alle IKKE-daekkede adresser");
99	torben	2151
100	torben	2231	String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " +
101			"FROM fulddaekning.adressetabel a " +
102			"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
103	torben	2145	"WHERE rute IS NULL " + //Ingen dækning
104	torben	2238	"AND a.postnr BETWEEN ? AND ? " +
105	torben	2640	"AND a.postnr NOT BETWEEN 3900 and 3999 " + //Skip greenland
106			"AND a.postnr NOT BETWEEN 9000 AND 9499 " + // Skip nordjylland (DAO)
107	torben	2145	"AND latitude IS NOT NULL " +
108			"AND longitude IS NOT NULL " +
109	torben	2235	"AND gadeid IS NOT NULL " +
110			"AND (a.distributor IS NULL OR a.distributor<>'LUKKET') ";
111	torben	2145	PreparedStatement stmt = conn.prepareStatement(sql);
112	torben	2328	stmt.setInt(1, minPostnr);
113			stmt.setInt(2, maxPostnr);
114	torben	2151
115	torben	2328	List<Adresse> list = hentAdresseListe( stmt );
116			alleIkkeDaekkede = list.toArray( new Adresse[ list.size() ] );
117	torben	2203
118	torben	2328	logger.info("Analyserer ikke-daekkede adresser");
119	torben	2238
120	torben	2328	for (Adresse a : alleIkkeDaekkede) {
121
122
123			BoundingBox bbox;
124
125			if (! postnumre.contains(a.postnr )) {
126			postnumre.add( a.postnr );
127
128	torben	2585	bbox = new BoundingBox();
129	torben	2328
130			bbCache.put( a.postnr, bbox);
131
132			} else {
133			bbox = bbCache.get( a.postnr);
134			}
135
136			bbox.latitudeMax = Math.max(bbox.latitudeMax, a.latitude);
137			bbox.latitudeMin = Math.min(bbox.latitudeMin, a.latitude);
138			bbox.longitudeMax = Math.max(bbox.longitudeMax, a.longitude);
139			bbox.longitudeMin = Math.min(bbox.longitudeMin, a.longitude);
140
141
142	torben	2145	}
143	torben	2585	return alleIkkeDaekkede;
144	torben	2145	}
145	torben	2328
146	torben	2424
147	torben	2225
148	torben	2263
149	torben	2597	public Map<Short, List<GeoPoint>> getDaekkedeAdresserHO() {
150			return daekkedeAdresserHO;
151			}
152	torben	2424
153	torben	2597	public int hentAlleDaekkedeAdresser() throws SQLException {
154	torben	2263	if ( alleAdresser == null ) {
155			String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " +
156			"FROM fulddaekning.adressetabel a " +
157			"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
158			"WHERE rute IS NOT NULL " +
159			"AND latitude IS NOT NULL " +
160			"AND longitude IS NOT NULL " +
161			"AND a.distributor = ? ";
162
163			// Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets)
164			// Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html
165			PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
166			stmt.setFetchSize(Integer.MIN_VALUE);
167
168			stmt.setString(1, LookupMain.distributor);
169
170			List<Adresse> list = hentAdresseListe( stmt );
171	torben	2585
172			alleAdresser = new ArrayList<GeoPoint>();
173			alleAdresser.addAll(list);
174	torben	2597
175			for(Adresse addr : list) {
176			short ho = addr.ho;
177			List<GeoPoint> hoListe = daekkedeAdresserHO.get(ho);
178			if ( hoListe == null) {
179			hoListe = new ArrayList<GeoPoint>();
180			daekkedeAdresserHO.put(ho, hoListe);
181			}
182
183			hoListe.add(addr);
184
185			}
186	torben	2263	}
187	torben	2597
188			return alleAdresser.size();
189	torben	2145	}
190	torben	2225
191
192	torben	2145
193			public synchronized void gemResultat(Adresse orgAdresse, Adresse bedsteAdresse, double bedsteAfstand) throws SQLException {
194			/*String sql = "INSERT INTO fulddaekning.afstand_anden_rute_thn (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+
195			"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
196	torben	2151
197	torben	2145	PreparedStatement saveStmt = conn.prepareStatement(sql);*/
198	torben	2151
199	torben	2145	saveStmt.setInt(1, orgAdresse.id);
200	torben	2575	saveStmt.setShort(2, orgAdresse.postnr);
201	torben	2145	saveStmt.setString(3, orgAdresse.adresse);
202			saveStmt.setInt(4, orgAdresse.gadeid);
203	torben	2575	saveStmt.setShort(5, orgAdresse.husnr);
204	torben	2145	saveStmt.setString(6, orgAdresse.husnrbogstav);
205			saveStmt.setDouble(7, orgAdresse.latitude);
206			saveStmt.setDouble(8, orgAdresse.longitude);
207			saveStmt.setString(9, orgAdresse.rute);
208	torben	2151
209
210	torben	2145	saveStmt.setInt(10, bedsteAdresse.id);
211	torben	2575	saveStmt.setShort(11, bedsteAdresse.postnr);
212	torben	2145	saveStmt.setString(12, bedsteAdresse.adresse);
213			saveStmt.setInt(13, bedsteAdresse.gadeid);
214	torben	2575	saveStmt.setShort(14, bedsteAdresse.husnr);
215	torben	2145	saveStmt.setString(15, bedsteAdresse.husnrbogstav);
216			saveStmt.setDouble(16, bedsteAdresse.latitude);
217			saveStmt.setDouble(17, bedsteAdresse.longitude);
218			saveStmt.setString(18, bedsteAdresse.rute);
219	torben	2151
220	torben	2145	saveStmt.setDouble(19, bedsteAfstand);
221	torben	2151
222	torben	2219	saveStmt.addBatch();
223			batchCount++;
224	torben	2423	if (batchCount >= 1000) {
225	torben	2219	saveStmt.executeBatch();
226			batchCount = 0;
227			}
228			//saveStmt.executeUpdate();
229			//saveStmt.clearParameters();
230	torben	2151
231	torben	2145	//saveStmt.close();
232			}
233	torben	2219
234			public synchronized void saveBatch() throws SQLException{
235			saveStmt.executeBatch();
236			batchCount = 0;
237			}
238	torben	2151
239
240
241	torben	2145	protected ArrayList<Adresse> hentAdresseListe(PreparedStatement stmt) throws SQLException{
242	torben	2210	ArrayList<Adresse> list = new ArrayList<Adresse>( 1000000 );
243	torben	2151
244	torben	2145	//logger.info("Starting query");
245			ResultSet res = stmt.executeQuery();
246			//logger.info("Starting exec query done");
247	torben	2151
248	torben	2145	while (res.next()) {
249	torben	2585
250			double latitude = res.getDouble(7);
251			double longitude = res.getDouble(8);
252	torben	2261
253	torben	2585
254			Adresse adr = new Adresse(latitude,longitude);
255
256	torben	2261	adr.id = res.getInt(1);
257	torben	2575	adr.postnr = res.getShort(2);
258	torben	2261	adr.adresse = res.getString(3);
259			adr.gadeid = res.getInt(4);
260	torben	2575	adr.husnr = res.getShort(5);
261	torben	2327	adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) );
262	torben	2585	//adr.latitude = res.getDouble(7);
263			//adr.longitude = res.getDouble(8);
264	torben	2327	adr.rute = ruteCache.getInstance( res.getString(9) );
265	torben	2575	adr.ho = res.getShort(10);
266	torben	2151
267	torben	2145	list.add(adr);
268	torben	2151
269	torben	2145	//logger.info( "Adress:" + adr);
270			}
271	torben	2151
272	torben	2145	res.close();
273			stmt.close();
274	torben	2151
275	torben	2145	return list;
276			}
277
278	torben	2157	public Connection getConnection(SafeProperties conf) throws SQLException, IOException {
279	torben	2152
280	torben	2157	String db_host = conf.getSafeProperty("DB_HOST");
281			String db_user = conf.getSafeProperty("DB_USER");
282			String db_pass = conf.getSafeProperty("DB_PASS");
283	torben	2145
284	torben	2152
285
286	torben	2151
287	torben	2152	Connection conn = null;
288			Properties connectionProps = new Properties();
289			connectionProps.put("user", db_user);
290			connectionProps.put("password", db_pass);
291
292	torben	2220	//For debug output, tilføj denne til JDBC url'en: &profileSQL=true
293	torben	2152	conn = DriverManager.getConnection(
294			"jdbc:mysql://" +
295			db_host +
296	torben	2218	":3306/?rewriteBatchedStatements=true",
297	torben	2152	connectionProps);
298			logger.info("Connected to database");
299			return conn;
300			}
301
302	torben	2585
303	torben	2145	}