The servlet now redirects directly after uploading and importing

Author: schaphil

src/main/webapp/java/de/htwb/servlets/ShapeImportServlet.java

@@ -35,8 +35,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             String userName = request.getParameter("userName");
             String tableName = shapeImporter.importFile(shapefile, userName);
             ArrayList<ImportedShape> importedShapes = shapeImporter.getImportedShapesFromTable(tableName);
-            response.setHeader("content-type", "text/json");
-            response.getWriter().write(String.format("{ \"key\" : %s}", tableName));
+            response.sendRedirect("ShapeUpdate.html?tableKey="+tableName);
 
         }
         catch (Exception ex)

src/main/webapp/js/shapeUpdate.js

@@ -1,6 +1,7 @@
 let baseUrl = "http://localhost:8080/"
 let classificationDropDown;
 let importedShapes;
+let tableKey;
 
 $(document).ready(function() {
     getOHDMInformation();
@@ -12,6 +13,12 @@ function getOHDMInformation()
     let xhr = new XMLHttpRequest();
     let url = baseUrl + "OHDMInformation";
     xhr.open("GET", url, true);
+    tableKey = getUrlVars()["tableKey"];
+
+    if (tableKey)
+    {
+        sendDataWithKey(tableKey);
+    }
 
     xhr.onload = function (e)
     {
@@ -64,6 +71,31 @@ function sendData()
     xhr.send();
 }
 
+function sendDataWithKey(tableKey)
+{
+
+    let xhr = new XMLHttpRequest();
+    let url = baseUrl + "ShapeUpdate?tableKey="+tableKey;
+    tableKey = "";
+
+    xhr.open("GET", url, true);
+
+    xhr.onload = function (e)
+    {
+        if(this.status === 200)
+        {
+            let data = this.response;
+            let dataObj = JSON.parse(data);
+
+            console.log(dataObj);
+            $("#importedShapes").empty();
+            displayImportedShapes(dataObj.importedShapes);
+            importedShapes = dataObj.importedShapes;
+        }
+    };
+    xhr.send();
+}
+
 function displayImportedShapes(importedShapes)
 {
     for(let i = 0; i < importedShapes.length; i++)
@@ -211,4 +243,12 @@ function sendUpdateObj(obj)
         }
     };
     xhr.send(formData);
+}
+
+function getUrlVars() {
+    var vars = {};
+    var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) {
+        vars[key] = value;
+    });
+    return vars;
 }