Mercurial > dive4elements > river
annotate artifacts/src/main/java/org/dive4elements/river/utils/MapUtils.java @ 8587:07c9ac22f611
(issue1755) Generalise BedQuality result handling
The bedquality calculation now produces a result for each time period
which has BedQualityResultValues for each specific result type.
Formally this was split up in density, porosity and diameter classes
with some bedload diameter classes mixed in for extra fun.
The intent of this commit is to allow more shared code and generic
access patterns to the BedQuality results.
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Wed, 18 Mar 2015 18:42:08 +0100 |
parents | e4606eae8ea5 |
children | 5e38e2924c07 |
rev | line source |
---|---|
5863
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
1 /* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde |
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
2 * Software engineering by Intevation GmbH |
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
3 * |
5994
af13ceeba52a
Removed trailing whitespace.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5865
diff
changeset
|
4 * This file is Free Software under the GNU AGPL (>=v3) |
5863
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
5 * and comes with ABSOLUTELY NO WARRANTY! Check out the |
5994
af13ceeba52a
Removed trailing whitespace.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5865
diff
changeset
|
6 * documentation coming with Dive4Elements River for details. |
5863
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
7 */ |
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
8 |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5422
diff
changeset
|
9 package org.dive4elements.river.utils; |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
10 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
11 import java.util.regex.Matcher; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
12 import java.util.regex.Pattern; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
13 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
14 import org.apache.log4j.Logger; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
15 import org.hibernate.impl.SessionFactoryImpl; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
16 |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5422
diff
changeset
|
17 import org.dive4elements.river.backend.SessionFactoryProvider; |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
18 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
19 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
20 public class MapUtils |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
21 { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
22 private static final Logger log = Logger.getLogger(MapUtils.class); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
23 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
24 public static final Pattern DB_URL_PATTERN = |
5211
9e11599266c8
Allow dots and numbers in oracle backend name
Andre Heinecke <aheinecke@intevation.de>
parents:
5147
diff
changeset
|
25 Pattern.compile("(.*)\\/\\/(.*):([0-9]+)\\/([\\.a-zA-Z0-9_-]+)"); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
26 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
27 public static final Pattern DB_PSQL_URL_PATTERN = |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
28 Pattern.compile("(.*)\\/\\/(.*):([0-9]+)\\/([a-zA-Z0-9_-]+)"); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
29 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
30 /** |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
31 * This method returns a connection string for databases used by |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
32 * Mapserver's Mapfile. |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
33 * |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
34 * @return A connection string for Mapserver. |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
35 */ |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
36 public static String getConnection() { |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
37 SessionFactoryImpl sf = (SessionFactoryImpl) |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
38 SessionFactoryProvider.getSessionFactory(); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
39 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
40 String user = SessionFactoryProvider.getUser(sf); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
41 String pass = SessionFactoryProvider.getPass(sf); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
42 String url = SessionFactoryProvider.getURL(sf); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
43 |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
44 log.debug("Parse connection url: " + url); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
45 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
46 Matcher m = DB_URL_PATTERN.matcher(url); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
47 if (!m.matches()) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
48 log.warn("Could not parse Connection string." + |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
49 "Try to parse PostgreSQL string."); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
50 // maybe this is a PostgreSQL connection... |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
51 return getPostgreSQLConnection(); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
52 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
53 |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
54 log.debug("Groups for connection string: " + m.groupCount()); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
55 int groups = m.groupCount(); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
56 |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
57 |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
58 if (log.isDebugEnabled()) { |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
59 for (int i = 0; i <= groups; i++) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
60 log.debug("Group " + i + ": " + m.group(i)); |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
61 } |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
62 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
63 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
64 String connection = null; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
65 |
5865
73da40528cf2
River artifacts: Renamed FLYSUtils to RiverUtils.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5863
diff
changeset
|
66 if (RiverUtils.isUsingOracle()) { |
5270
d17e3106c910
An oracle conection string needs a backend otherwise you get an error
Andre Heinecke <aheinecke@intevation.de>
parents:
5211
diff
changeset
|
67 if (groups < 4) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
68 log.warn("Could only partially parse connection string."); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
69 return null; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
70 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
71 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
72 String host = m.group(2); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
73 String port = m.group(3); |
5270
d17e3106c910
An oracle conection string needs a backend otherwise you get an error
Andre Heinecke <aheinecke@intevation.de>
parents:
5211
diff
changeset
|
74 String backend = m.group(4); |
5422
eb7a3f58bdd6
Add port info to generated connection string for oracle
Andre Heinecke <aheinecke@intevation.de>
parents:
5270
diff
changeset
|
75 connection = user + "/" + pass + "@" + host + ":" + port + "/" + backend; |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
76 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
77 else { |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
78 if (groups < 4) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
79 log.warn("Could only partially parse connection string."); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
80 return null; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
81 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
82 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
83 String host = m.group(2); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
84 String port = m.group(3); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
85 String db = m.group(4); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
86 |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
87 connection = createConnectionString(user, pass, host, db, port); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
88 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
89 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
90 return connection; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
91 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
92 |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
93 public static String createConnectionString( |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
94 String user, |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
95 String pass, |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
96 String host, |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
97 String db, |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
98 String port |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
99 ) { |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
100 StringBuilder sb = new StringBuilder(); |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
101 sb.append("dbname=").append(db); |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
102 sb.append(" host='").append(host).append("'"); |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
103 sb.append(" user=").append(user); |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
104 sb.append(" port=").append(port); |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
105 // XXX: We need to escape this somehow. |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
106 sb.append(" password='").append(pass).append("'"); |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
107 sb.append(" sslmode=disable"); |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
108 return sb.toString(); |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
109 } |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
110 |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
111 protected static String getPostgreSQLConnection() { |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
112 SessionFactoryImpl sf = (SessionFactoryImpl) |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
113 SessionFactoryProvider.getSessionFactory(); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
114 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
115 String user = SessionFactoryProvider.getUser(sf); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
116 String pass = SessionFactoryProvider.getPass(sf); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
117 String url = SessionFactoryProvider.getURL(sf); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
118 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
119 Matcher m = DB_PSQL_URL_PATTERN.matcher(url); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
120 if (!m.matches()) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
121 log.warn("Could not parse PostgreSQL Connection string."); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
122 return null; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
123 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
124 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
125 int groups = m.groupCount(); |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
126 log.debug("Groups for PostgreSQL connection string: " + groups); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
127 |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
128 if (log.isDebugEnabled()) { |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
129 for (int i = 0; i <= groups; i++) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
130 log.debug("Group " + i + ": " + m.group(i)); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
131 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
132 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
133 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
134 String connection = null; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
135 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
136 if (groups < 4) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
137 log.warn("Could only partially parse connection string."); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
138 return null; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
139 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
140 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
141 String host = m.group(2); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
142 String port = m.group(3); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
143 String db = m.group(4); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
144 |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
145 connection = createConnectionString(user, pass, host, db, port); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
146 |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
147 log.debug("Created connection: '" + connection + "'"); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
148 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
149 return connection; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
150 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
151 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
152 public static String getConnectionType() { |
5865
73da40528cf2
River artifacts: Renamed FLYSUtils to RiverUtils.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5863
diff
changeset
|
153 return RiverUtils.isUsingOracle() ? "oraclespatial" : "postgis"; |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
154 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
155 } |