Skip to content

Commit a02f5b9

Browse files
author
David Baum
committed
Merge branch 'feature/getResponse' into development
2 parents 98bce97 + be4c208 commit a02f5b9

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/GeneratorServlet.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
1919
log.info("GET request generator");
2020
SettingsConfiguration config = SettingsConfiguration.getInstance("/opt/config/settings.properties");
2121
Generator.run();
22-
writeResponse(response, config);
22+
writeGetResponse(response);
2323
}
2424

2525
public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
2626
log.info("POST request generator");
2727
SettingsConfiguration config = SettingsConfiguration.getInstance(request);
2828
Generator.run();
29-
writeResponse(response, config);
29+
writePostResponse(response, config);
3030
}
3131

32-
private void writeResponse(HttpServletResponse response, SettingsConfiguration config) throws IOException {
32+
private void writePostResponse(HttpServletResponse response, SettingsConfiguration config) throws IOException {
3333
PrintWriter out = response.getWriter();
3434
response.setContentType("text/html");
3535
out.println("<h1>Getaviz</h1>");
@@ -42,4 +42,11 @@ private void writeResponse(HttpServletResponse response, SettingsConfiguration c
4242
response.setHeader("Location", url + "?aframe=" + Boolean.toString(aframe) + "&model=" + name
4343
+ "&setup=web_a-frame/default" + "&srcDir=data-gen");
4444
}
45+
46+
private void writeGetResponse(HttpServletResponse response) throws IOException {
47+
PrintWriter out = response.getWriter();
48+
response.setContentType("text/html");
49+
out.println("<h1>Getaviz</h1>");
50+
out.println("<h3>Visualization has been generated to the output directory.</h3>");
51+
}
4552
}

0 commit comments

Comments
 (0)