Fixed file upload

resource/web/map.tmpl

@@ -77,6 +77,8 @@
         $("#button-bg-edit").click(function() {
             // Reset modal
             $('#bg-file-input').parent().show();
+            if ($("#file_input").prop("jFiler") != null)
+                $("#file_input").prop("jFiler").reset();
             $('#bg-file-progress').parent().hide();
             $('#bgUploadModal').modal('show');
         });
@@ -97,10 +99,10 @@
                     drawMap();
                 },
                 error: function(el){
-                    $("#bg-upload-progress").addClass("progress-bar-danger");
+                    $("#bg-file-progress").addClass("progress-bar-danger");
                 },
                 onProgress: function(t){
-                    $("#bg-upload-progress").css("width", t+"%");
+                    $("#bg-file-progress").css("width", t+"%");
                 },
             }
         });
@@ -133,7 +135,7 @@
 
             ////////////////  Draw
             // Background
-            svg.image("/img/floorplan.jpg", "100%", "100%").x(0).y(0).addClass("floorplan");
+            svg.image("?bgimage", "100%", "100%").x(0).y(0).addClass("bg-image");
 
             // Sensors
             $.each(json.sensors, function(i, sensor) {

src/se/hal/intf/HalHttpPage.java

@@ -49,7 +49,7 @@ public abstract class HalHttpPage implements HttpPage{
                     request.containsKey("json"))){
                 out.setHeader("Content-Type", "application/json");
                 JSONWriter writer = new JSONWriter(out);
-                writer.write(((HalJsonPage)this).jsonResponse(header, session,cookie, request));
+                writer.write(((HalJsonPage)this).jsonResponse(session,cookie, request));
                 writer.close();
             }
             else{
@@ -66,7 +66,7 @@ public abstract class HalHttpPage implements HttpPage{
                 tmpl.set("rootNav", rootNav.createPagedNavInstance(header).getSubNavs());
                 tmpl.set("userNav", userNav.createPagedNavInstance(header).getSubNavs());
                 tmpl.set("alerts", HalAlertManager.getInstance().generateAlerts());
-                tmpl.set("content", httpRespond(header, session, cookie, request));
+                tmpl.set("content", httpRespond(session, cookie, request));
                 out.print(tmpl.compile());
             }
         } catch (Exception e) {
@@ -90,7 +90,6 @@ public abstract class HalHttpPage implements HttpPage{
 
 
     public abstract Templator httpRespond(
-            HttpHeader header,
             Map<String, Object> session,
             Map<String, String> cookie,
             Map<String, String> request)
@@ -100,7 +99,6 @@ public abstract class HalHttpPage implements HttpPage{
 
     public interface HalJsonPage{
         DataNode jsonResponse(
-                HttpHeader header,
                 Map<String, Object> session,
                 Map<String, String> cookie,
                 Map<String, String> request)

src/se/hal/page/EventConfigHttpPage.java

@@ -41,7 +41,6 @@ public class EventConfigHttpPage extends HalHttpPage {
 
     @Override
     public Templator httpRespond(
-            HttpHeader header,
             Map<String, Object> session,
             Map<String, String> cookie,
             Map<String, String> request)

src/se/hal/page/EventOverviewHttpPage.java

@@ -30,7 +30,6 @@ public class EventOverviewHttpPage extends HalHttpPage {
 
     @Override
     public Templator httpRespond(
-            HttpHeader header,
             Map<String, Object> session,
             Map<String, String> cookie,
             Map<String, String> request)

src/se/hal/page/MapHttpPage.java

@@ -8,6 +8,7 @@ import se.hal.struct.Sensor;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.net.http.HttpHeader;
+import zutil.net.http.HttpPrintStream;
 import zutil.net.http.multipart.MultipartField;
 import zutil.net.http.multipart.MultipartFileField;
 import zutil.net.http.multipart.MultipartParser;
@@ -16,6 +17,7 @@ import zutil.parser.Base64Encoder;
 import zutil.parser.DataNode;
 import zutil.parser.Templator;
 
+import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.Map;
@@ -36,12 +38,11 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage{
         super.showSubNav(false);
     }
 
-
     @Override
-    public Templator httpRespond(HttpHeader header,
+    public void respond(HttpPrintStream out, HttpHeader header,
-                                 Map<String, Object> session,
+                        Map<String, Object> session, Map<String, String> cookie,
-                                 Map<String, String> cookie,
+                        Map<String, String> request) throws IOException {
-                                 Map<String, String> request) throws Exception {
+
         if ("POST".equals(header.getRequestType())) {
             MultipartParser multipart = new MultipartParser(header);
             Iterator<MultipartField> it = multipart.iterator();
@@ -51,21 +52,32 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage{
                     MultipartFileField file = (MultipartFileField) field;
                     String ext = FileUtil.getFileExtension(file.getFilename());
                     if (ext.equals("jpg") || ext.equals("png") || ext.equals("svg") || ext.equals("gif")) {
+                        try {
                             saveBgImage(ext, file.getContent());
-                        loadBgImage();
+                            out.println("Upload successful: " + file.getFilename());
+                        } catch (SQLException e) {
+                            e.printStackTrace();
+                            out.println("Upload error: " + e.getMessage());
+                        }
+                        bgImage = null; // reload image from db
                     }
                 }
             }
-            return null;
+        } else if (request.containsKey("bgimage")) {
-        }
-
-
-        if (request.containsKey("bgimage")){
             if (bgImage == null)
                 loadBgImage();
-            // send bg image;
+            out.setHeader("Content-Type", "image/"+bgType);
+            out.setHeader("Content-Length", ""+bgImage.length);
+            out.write(bgImage);
+        } else { // Run default Hal behaviour
+            super.respond(out, header, session, cookie, request);
+        }
     }
 
+    @Override
+    public Templator httpRespond(Map<String, Object> session,
+                                 Map<String, String> cookie,
+                                 Map<String, String> request) throws Exception {
 
         Templator tmpl = new Templator(FileUtil.find(TEMPLATE));
         return tmpl;
@@ -73,16 +85,14 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage{
 
 
     @Override
-    public DataNode jsonResponse(HttpHeader header,
+    public DataNode jsonResponse(Map<String, Object> session,
-                                 Map<String, Object> session,
                                  Map<String, String> cookie,
                                  Map<String, String> request) throws Exception {
         DBConnection db = HalContext.getDB();
         DataNode root = new DataNode(DataNode.DataType.Map);
         if ("getdata".equals(request.get("action"))) {
             getDeviceNode(db, root);
-        }
+        } else if ("save".equals(request.get("action"))) {
-        else if ("save".equals(request.get("action"))){
             int id = Integer.parseInt(request.get("id"));
             AbstractDevice device = null;
             if ("sensor".equals(request.get("type")))
@@ -115,6 +125,7 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage{
         }
         root.set("events", eventsNode);
     }
+
     private DataNode getDeviceNode(AbstractDevice device) {
         DataNode deviceNode = new DataNode(DataNode.DataType.Map);
         deviceNode.set("id", device.getId());
@@ -133,6 +144,7 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage{
             bgImage = Base64Decoder.decodeToByte(split[1]);
         }
     }
+
     private void saveBgImage(String type, byte[] data) throws SQLException {
         HalContext.setProperty("map_bgimage", type + "," + Base64Encoder.encode(data));
     }

src/se/hal/page/PCHeatMapHttpPage.java

@@ -18,7 +18,6 @@ public class PCHeatMapHttpPage extends HalHttpPage {
 
 	@Override
 	public Templator httpRespond(
-			HttpHeader header,
 			Map<String, Object> session,
 			Map<String, String> cookie,
 			Map<String, String> request)

src/se/hal/page/PCOverviewHttpPage.java

@@ -30,7 +30,6 @@ public class PCOverviewHttpPage extends HalHttpPage implements HalHttpPage.HalJs
 
     @Override
     public Templator httpRespond(
-            HttpHeader header,
             Map<String, Object> session,
             Map<String, String> cookie,
             Map<String, String> request)
@@ -50,7 +49,6 @@ public class PCOverviewHttpPage extends HalHttpPage implements HalHttpPage.HalJs
 
     @Override
     public DataNode jsonResponse(
-            HttpHeader header,
             Map<String, Object> session,
             Map<String, String> cookie,
             Map<String, String> request) throws Exception {

src/se/hal/page/SensorConfigHttpPage.java

@@ -41,7 +41,6 @@ public class SensorConfigHttpPage extends HalHttpPage {
 
     @Override
     public Templator httpRespond(
-            HttpHeader header,
             Map<String, Object> session,
             Map<String, String> cookie,
             Map<String, String> request)

src/se/hal/page/SensorOverviewHttpPage.java

@@ -30,7 +30,6 @@ public class SensorOverviewHttpPage extends HalHttpPage {
 
     @Override
     public Templator httpRespond(
-            HttpHeader header,
             Map<String, Object> session,
             Map<String, String> cookie,
             Map<String, String> request)

src/se/hal/page/UserConfigHttpPage.java

@@ -21,7 +21,6 @@ public class UserConfigHttpPage extends HalHttpPage {
 
     @Override
     public Templator httpRespond(
-            HttpHeader header,
             Map<String, Object> session,
             Map<String, String> cookie,
             Map<String, String> request)