Merge branch 'feature/WaitUntilWritingToFileIsFinished' into development

Author: David Baum

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

@@ -2,14 +2,11 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.net.InetAddress;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.getaviz.generator.SettingsConfiguration.OutputFormat;
 
 public class GeneratorServlet extends HttpServlet {
 	private static final long serialVersionUID = -5343549433924172589L;
@@ -22,25 +19,15 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
 		writeGetResponse(response);
 	}
 
-	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+	public void doPost(HttpServletRequest request, HttpServletResponse response) {
 		log.info("POST request generator");
-		SettingsConfiguration config = SettingsConfiguration.getInstance(request);
 		Generator.run();
-		writePostResponse(response, config);
+		writePostResponse(response);
 	}
 
-	private void writePostResponse(HttpServletResponse response, SettingsConfiguration config) throws IOException {
-		PrintWriter out = response.getWriter();
+	private void writePostResponse(HttpServletResponse response) {
 		response.setContentType("text/html");
-		out.println("<h1>Getaviz</h1>");
-		out.println("<h3>Visualization is generated, please wait. You will be redirected automatically.</h3>");
-		response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
-		InetAddress addr = InetAddress.getByName("frontend");
-		String url = "http://" + addr.getHostAddress() + "/ui/index.php";
-		String name = config.getName();
-		boolean aframe = config.getOutputFormat() == OutputFormat.AFrame;
-		response.setHeader("Location", url + "?aframe=" + Boolean.toString(aframe) + "&model=" + name
-				+ "&setup=web_a-frame/default" + "&srcDir=data-gen");
+		response.setStatus(HttpServletResponse.SC_OK);
 	}
 
 	private void writeGetResponse(HttpServletResponse response) throws IOException {

ui/generator-connector.php

@@ -70,19 +70,13 @@
   'rd.method_type_mode'         => $_REQUEST['rd_method_type_mode']
 );
 
-// use key 'http' even if you send the request to https://..
-$options = array(
-  'http' => array(
-    'header'  => "Content-type: application/x-www-form-urlencoded\r\n",
-    'method'  => 'POST',
-    'content' => http_build_query($payload)
-  )
-);
-$context  = stream_context_create($options);
-$result = file_get_contents($url, false, $context);
-
-// false, because we receive redirect
-if ($result === FALSE) { 
+$curl = curl_init();
+curl_setopt($curl, CURLOPT_URL, $url);
+curl_setopt($curl, CURLOPT_POST, 1);
+curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($payload));
+$return = curl_exec($curl);
+curl_close ($curl);
+if ($return == "OK") {
   header("Location: index.php?aframe=true&model=$model&setup=web_a-frame/default&srcDir=data-gen");
   die();
 }