* add city animation

* delete city button
* reload table data

src/com/wasteinformationserver/main.java

@@ -25,8 +25,13 @@ public class main {
 
         Log.message("thread started");
 
-        mqtt m = new mqtt();
-        m.notifymessage();
+        try{
+            mqtt m = new mqtt();
+            m.notifymessage();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
 
     }
 }

src/com/wasteinformationserver/website/MainPage.java

@@ -1,3 +1,16 @@
+// Dear programmer:
+// When I wrote this code, only god and
+// I knew how it worked.
+// Now, only god knows it!
+//
+// Therefore, if you are trying to optimize
+// this routine and it fails (most surely),
+// please increase this counter as a
+// warning for the next person:
+//
+// total hours wasted here = 254
+//
+
 package com.wasteinformationserver.website;
 
 import com.sun.net.httpserver.Headers;

src/com/wasteinformationserver/website/datarequests/DataRequest.java

@@ -21,19 +21,38 @@ public class DataRequest extends PostRequest {
 
                 JDCB jdcb = new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation");
 
-                ResultSet set = jdcb.executeQuery("select * from cities where name='" + params.get("cityname") + "' AND wastetype='" + params.get("wastetype") + "' AND zone='" + params.get("wastezone") + "'");
+                Log.debug(params.get("cityname") + params.get("wastetype") + params.get("wastezone"));
+                ResultSet set = jdcb.executeQuery("select * from `cities` where `name`='" + params.get("cityname") + "' AND `wastetype`='" + params.get("wastetype") + "' AND `zone`='" + params.get("wastezone") + "'");
+                int size = 0;
                 try {
-                    if (set.getFetchSize() == 0) {
-                        //doesnt exist
-                        System.out.println("doesnt exist");
-                        jdcb.executeUpdate("INSERT INTO `cities`(`userid`, `name`, `wastetype`, `zone`) VALUES ('0','" + params.get("cityname") + "','" + params.get("wastetype") + "','" + params.get("wastezone") + "');");
-                    } else {
-                        //already exists
-                        System.out.println("already exists");
+                    if (set != null) {
+                        set.last();    // moves cursor to the last row
+                        size = set.getRow(); // get row id
                     }
                 } catch (SQLException e) {
                     e.printStackTrace();
                 }
+                if (size == 0) {
+                    //doesnt exist
+                    System.out.println("doesnt exist");
+                    int status = jdcb.executeUpdate("INSERT INTO `cities`(`userid`, `name`, `wastetype`, `zone`) VALUES ('0','" + params.get("cityname") + "','" + params.get("wastetype") + "','" + params.get("wastezone") + "');");
+                    System.out.println(status);
+                    if (status == 1) {
+                        result = "{\"status\" : \"inserted\"}";
+                    } else {
+                        result = "{\"status\" : \"inserterror\"}";
+                    }
+
+                } else if (size > 1) {
+                    Log.warning("more than one entry in db!!!");
+                    result = "{\"status\" : \"exists\"}";
+                } else {
+                    //already exists
+                    System.out.println("already exists");
+                    result = "{\"status\" : \"exists\"}";
+                }
+
+                Log.debug(result);
                 break;
             case "getAllCities":
 
@@ -48,10 +67,11 @@ public class DataRequest extends PostRequest {
                 builder.append("{\"data\":[");
                 try {
                     while (sett.next()) {
-                        builder.append("{\"cityname\":\""+sett.getString("name")+"\"");
-                        builder.append(",\"wastetype\":\""+sett.getString("wastetype")+"\"");
-                        builder.append(",\"zone\":\""+sett.getString("zone")+"\"}");
-                        if (!sett.isLast()){
+                        builder.append("{\"cityname\":\"" + sett.getString("name") + "\"");
+                        builder.append(",\"wastetype\":\"" + sett.getString("wastetype") + "\"");
+                        builder.append(",\"id\":\"" + sett.getString("id") + "\"");
+                        builder.append(",\"zone\":\"" + sett.getString("zone") + "\"}");
+                        if (!sett.isLast()) {
                             builder.append(",");
                         }
 
@@ -61,8 +81,18 @@ public class DataRequest extends PostRequest {
                     e.printStackTrace();
                 }
                 builder.append("]}");
-                result= builder.toString();
+                result = builder.toString();
                 Log.debug(result);
+                break;
+            case "deletecity":
+                //DELETE FROM `cities` WHERE `id`=0
+
+                JDCB jdcbcc = new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation");
+
+                Log.debug(params.get("id"));
+                int status= jdcbcc.executeUpdate("DELETE FROM `cities` WHERE `id`='" + params.get("id")+"'");
+                Log.debug(status);
+
                 break;
         }
         return result;

src/com/wasteinformationserver/website/datarequests/login/LoginRequest.java

@@ -19,7 +19,7 @@ public class LoginRequest extends PostRequest {
         String username = params.get("username");
 
         ResultSet s = new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation").executeQuery("select * from user where username ='" + username + "'");
-
+        Log.debug("successfully logged in to db");
         String response = "{\"accept\": false}";
         try {
             s.last();