Skip to content

Commit 90efb61

Browse files
fakitfakit
committed
Creating Extra Config Files in WebServer/bin/configFiles Dir.
1 parent 0e21fc3 commit 90efb61

File tree

3 files changed

+183
-33
lines changed

3 files changed

+183
-33
lines changed

‎src/main/webapp/java/de/htwb/shpImport/OhdmLoader.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@ public class OhdmLoader {
1010
private final File ConfigFileDir = new File("configFiles");
1111
public OhdmLoader()
1212
{
13-
ConfigFileDir.mkdir();
13+
1414
}
15+
1516
public void importFromIntermediateIntoOhdm() throws Exception
1617
{
17-
CreateStep2Schema();
18+
1819
CreateConfigFiles();
20+
CreateStep2Schema();
1921

2022
ProcessBuilder processBuilder = new ProcessBuilder();
2123
// Windows
2224
String dir=ConfigFileDir.getAbsolutePath();
23-
String cmd="java -classpath "+ JDBC_DRIVER_PATH+" -jar "+OHDM_CONVERTER_PATH +" -h \""+dir+"\\historic_import_parameter\" -d \""+dir+"\\ohdm_parameter\"";
25+
String cmd="java -classpath "+JDBC_DRIVER_PATH+" -jar "+OHDM_CONVERTER_PATH +" -h \""+dir+"\\db_ohdm_historic_local\" -d \""+dir+"\\db_shape_import\"";
2426
Process pr =processBuilder.command("cmd.exe", "/c", cmd).start();
2527

2628
pr.waitFor();
@@ -36,7 +38,7 @@ public void importFromIntermediateIntoOhdm() throws Exception
3638
}
3739
private void CreateStep2Schema() throws Exception
3840
{
39-
String SqlCmd=" CREATE SCHEMA IF NOT EXISTS intermediateosm; CREATE SCHEMA IF NOT EXISTS ohdm;";
41+
String SqlCmd=" CREATE SCHEMA IF NOT EXISTS "+SCHEME_INTERMEDIATE+"; CREATE SCHEMA IF NOT EXISTS "+SCHEME_OHDM+";";
4042

4143
Process pr = new ProcessBuilder(PGSQL_FILE_PATH, "-d", DB_NAME,"-U", DB_USER, "-h", DB_HOST,"-c", SqlCmd).start();
4244

@@ -72,10 +74,10 @@ private void CreateConfigFiles( ) throws Exception
7274
"\nvalidSince:"+ VALIDSINCE+
7375
"\nvalidUntil:"+ VALIDUNTIL+
7476
"\nclassificationID:"+ CLASSIFICATION_ID;
75-
PrintWriter writer = new PrintWriter("configFiles/ohdm_parameter", "UTF-8");
77+
PrintWriter writer = new PrintWriter("configFiles/db_shape_import", "UTF-8");
7678
writer.println(OHDM_PARAMETER);
7779
writer.close();
78-
writer = new PrintWriter("configFiles/historic_import_parameter", "UTF-8");
80+
writer = new PrintWriter("configFiles/db_ohdm_historic_local", "UTF-8");
7981
writer.println(HISTORIC_IMPORT_PARAMETER);
8082
writer.close();
8183
}

‎src/main/webapp/java/de/htwb/shpImport/ShapeImporter.java‎

Lines changed: 147 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
import javax.servlet.http.Part;
44
import java.io.*;
5+
import java.nio.file.Files;
6+
import java.time.LocalDate;
57
import java.time.LocalDateTime;
68
import java.time.format.DateTimeFormatter;
79
import java.util.ArrayList;
10+
import java.util.Arrays;
811
import java.util.List;
912
import java.util.Random;
1013
import java.util.zip.ZipEntry;
@@ -19,7 +22,7 @@
1922
public class ShapeImporter
2023
{
2124
private final int BUFFER_SIZE = 8 * 1024;
22-
25+
private final File ConfigFileDir = new File("configFiles");
2326
private final File uploadedFilesDir = new File("uploaded");
2427
private final File importFilesDir = new File("importFiles");
2528

@@ -28,11 +31,154 @@ public class ShapeImporter
2831

2932
public ShapeImporter()
3033
{
34+
ConfigFileDir.mkdir();
3135
uploadedFilesDir.mkdir();
3236
importFilesDir.mkdir();
37+
LoadConfigs();
38+
3339
dbRepos = new DatabaseRepository();
3440
}
3541

42+
private void LoadConfigs() {
43+
try {
44+
45+
File file = new File("configFiles\\GenConfigs");
46+
47+
if (file.createNewFile()){
48+
String[] GenConfigs={
49+
"DB_USER = postgres",
50+
"DB_PASS = root",
51+
"DB_NAME = ohdm",
52+
"DB_HOST = localhost",
53+
"SCHEME_TEMP = temp",
54+
"SCHEME_TEST = test",
55+
"SCHEME_CACHE = intermediateosm",
56+
"DB_GEO_USER=geoserver",
57+
/*STEP 2*/
58+
"DB_HOST_OHDM = localhost",
59+
"DB_PORT_OHDM = 5432",
60+
"DB_USER_OHDM = postgres",
61+
"DB_PASS_OHDM = root",
62+
//Intermediate
63+
"DB_NAME_INTERMEDIATE =ohdm",
64+
//ohdm
65+
"DB_NAME_OHDM = ohdm",
66+
"SCHEME_OHDM = ohdm",
67+
"SCHEME_INTERMEDIATE = intermediateosm",
68+
"GID=gid",
69+
"GEOM=geom",
70+
"VALIDSINCE=12-04-1999",
71+
"VALIDUNTIL=12-04-2022",
72+
"CLASSIFICATION_ID=13",
73+
"JDBC_DRIVER_PATH= C:\\dev\\ohdm\\postgresql-42.1.1.jar",
74+
"OHDM_CONVERTER_PATH=C:\\dev\\ohdm\\OHDMConverter.jar",
75+
"TABLENAME=''",
76+
"SHP_TO_PGSQL_FILE_PATH = C:\\Program Files\\PostgreSQL\\9.6\\bin\\shp2pgsql.exe",
77+
"PGSQL_FILE_PATH = C:\\Program Files\\PostgreSQL\\9.6\\bin\\psql.exe",
78+
};
79+
Files.write(file.toPath(), Arrays.asList(GenConfigs));
80+
81+
}
82+
83+
List<String> fileLines = Files.readAllLines(file.toPath());
84+
85+
for (String Param:fileLines)
86+
{
87+
String[] KeyValue= Param.split("=");
88+
String VarKey= KeyValue[0].trim();
89+
String VarValue= KeyValue[1].trim();
90+
switch (VarKey){
91+
92+
case "DB_USER":
93+
DB_USER = VarValue;
94+
break;
95+
case "DB_PASS":
96+
DB_PASS = VarValue;
97+
break;
98+
case "DB_NAME":
99+
DB_NAME = VarValue;
100+
break;
101+
case "DB_HOST":
102+
DB_HOST = VarValue;
103+
break;
104+
case "SCHEME_TEMP":
105+
SCHEME_TEMP = VarValue;
106+
break;
107+
case "SCHEME_TEST":
108+
SCHEME_TEST = VarValue;
109+
break;
110+
case "SCHEME_CACHE":
111+
SCHEME_CACHE = VarValue;
112+
break;
113+
case "DB_GEO_USER":
114+
DB_GEO_USER = VarValue;
115+
break;
116+
case "DB_HOST_OHDM":
117+
DB_HOST_OHDM = VarValue;
118+
break;
119+
case "DB_PORT_OHDM":
120+
DB_PORT_OHDM = VarValue;
121+
break;
122+
case "DB_USER_OHDM":
123+
DB_USER_OHDM = VarValue;
124+
break;
125+
case "DB_PASS_OHDM":
126+
DB_PASS_OHDM = VarValue;
127+
break;
128+
case "DB_NAME_INTERMEDIATE":
129+
DB_NAME_INTERMEDIATE = VarValue;
130+
break;
131+
case "DB_NAME_OHDM":
132+
DB_NAME_OHDM = VarValue;
133+
break;
134+
case "SCHEME_OHDM":
135+
SCHEME_OHDM = VarValue;
136+
break;
137+
case "SCHEME_INTERMEDIATE":
138+
SCHEME_INTERMEDIATE = VarValue;
139+
break;
140+
case "GID":
141+
GID = VarValue;
142+
break;
143+
case "GEOM":
144+
GEOM = VarValue;
145+
break;
146+
case "VALIDSINCE":
147+
VALIDSINCE = VarValue;
148+
break;
149+
case "VALIDUNTIL":
150+
VALIDUNTIL = VarValue;
151+
break;
152+
case "CLASSIFICATION_ID":
153+
CLASSIFICATION_ID = VarValue;
154+
break;
155+
case "JDBC_DRIVER_PATH":
156+
JDBC_DRIVER_PATH = VarValue;
157+
break;
158+
case "OHDM_CONVERTER_PATH":
159+
OHDM_CONVERTER_PATH = VarValue;
160+
break;
161+
case "TABLENAME":
162+
TABLENAME = VarValue;
163+
break;
164+
case "SHP_TO_PGSQL_FILE_PATH":
165+
SHP_TO_PGSQL_FILE_PATH = VarValue;
166+
break;
167+
case "PGSQL_FILE_PATH":
168+
PGSQL_FILE_PATH = VarValue;
169+
break;
170+
171+
}
172+
173+
}
174+
175+
} catch (IOException e) {
176+
e.printStackTrace();
177+
}
178+
179+
180+
}
181+
36182
public String importFile(File zipFile, String userName) throws Exception
37183
{
38184
List unzipFiles = unzipFile(zipFile);

‎src/main/webapp/java/de/htwb/utils/Config.java‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,41 @@ public class Config {
77
*/
88

99
/*STEP 1*/
10-
public static final String DB_USER = "postgres";
11-
public static final String DB_PASS = "root";
12-
public static final String DB_NAME = "ohdm";
13-
public static final String DB_HOST = "localhost";
10+
public static String DB_USER ;//= "postgres";//
11+
public static String DB_PASS ;//= "root";
12+
public static String DB_NAME ;//= "ohdm";
13+
public static String DB_HOST ;//= "localhost";
1414

15-
public static final String SCHEME_TEMP = "temp";
16-
public static final String SCHEME_TEST = "test";
17-
public static final String SCHEME_CACHE = "intermediateosm";
18-
public static final String DB_GEO_USER="geoserver";
15+
public static String SCHEME_TEMP ;//= "temp";
16+
public static String SCHEME_TEST ;//= "test";
17+
public static String SCHEME_CACHE;// = "intermediateosm";
18+
public static String DB_GEO_USER;//="geoserver";
1919

2020

2121
/*STEP 2*/
22-
public static final String DB_HOST_OHDM = "localhost";
23-
public static final String DB_PORT_OHDM = "5432";
24-
public static final String DB_USER_OHDM = "postgres";
25-
public static final String DB_PASS_OHDM = "root";
22+
public static String DB_HOST_OHDM ;//= "localhost";
23+
public static String DB_PORT_OHDM ;//= "5432";
24+
public static String DB_USER_OHDM ;//= "postgres";
25+
public static String DB_PASS_OHDM ;//= "root";
2626
//Intermediate
27-
public static final String DB_NAME_INTERMEDIATE ="ohdm"; // "postgres";
27+
public static String DB_NAME_INTERMEDIATE ;//="ohdm";
2828
//ohdm
29-
public static final String DB_NAME_OHDM = "ohdm";
30-
public static final String SCHEME_OHDM = "ohdm";//"importhistoric";
29+
public static String DB_NAME_OHDM;// = "ohdm";
30+
public static String SCHEME_OHDM;// = "ohdm";
3131

32-
public static final String SCHEME_INTERMEDIATE = "intermediateosm";
33-
public static final String GID="gid";
34-
public static final String GEOM="geom";
35-
public static final String VALIDSINCE="1990-10-03";
36-
public static final String VALIDUNTIL="2020-12-31";
37-
public static final String CLASSIFICATION_ID="13";
32+
public static String SCHEME_INTERMEDIATE;// = "intermediateosm";
33+
public static String GID;//="gid";
34+
public static String GEOM;//="geom";
35+
public static String VALIDSINCE;//="";
36+
public static String VALIDUNTIL;//="";
37+
public static String CLASSIFICATION_ID;//="13";
3838

39-
public static final String JDBC_DRIVER_PATH="C:\\dev\\ohdm\\postgresql-42.1.1.jar";
40-
public static final String OHDM_CONVERTER_PATH="C:\\dev\\ohdm\\OHDMConverter.jar";
39+
public static String JDBC_DRIVER_PATH;//="C:\\dev\\ohdm\\postgresql-42.1.1.jar";
40+
public static String OHDM_CONVERTER_PATH;//="C:\\dev\\ohdm\\OHDMConverter.jar";
41+
public static String DB_SHAPE_IMPORT;//="";
42+
public static String DB_OHDM_HISTORIC_LOCAL;//="";
4143

42-
public static String TABLENAME="";
44+
public static String TABLENAME;//="";
4345

4446
/*
4547
required Postgres application settings with examples
@@ -50,8 +52,8 @@ public class Config {
5052
//public static final String PGSQL_FILE_PATH = "/Applications/Postgres.app/Contents/Versions/12/bin/psql";
5153

5254
// for Windows
53-
public static final String SHP_TO_PGSQL_FILE_PATH = "C:\\Program Files\\PostgreSQL\\9.6\\bin\\shp2pgsql.exe";
54-
public static final String PGSQL_FILE_PATH = "C:\\Program Files\\PostgreSQL\\9.6\\bin\\psql.exe";
55+
public static String SHP_TO_PGSQL_FILE_PATH ;//= "C:\\Program Files\\PostgreSQL\\9.6\\bin\\shp2pgsql.exe";
56+
public static String PGSQL_FILE_PATH ;//= "C:\\Program Files\\PostgreSQL\\9.6\\bin\\psql.exe";
5557

5658

5759
}

0 commit comments

Comments
 (0)