Skip to content

Commit

Permalink
Updated server's implementation of the database methods
Browse files Browse the repository at this point in the history
  • Loading branch information
pid1 committed Apr 18, 2015
1 parent 368bcb3 commit bf216e6
Showing 1 changed file with 17 additions and 29 deletions.
46 changes: 17 additions & 29 deletions src/server/server.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public class server extends ServerNetworking implements Thermostatable {
int desiredTemperature;
// Thermostat IP address
String thermostatIP;
// Database object
Database dataStorage;

public server() {
// Default admin user
Expand All @@ -31,60 +33,46 @@ public void receiveCurrentTemp() throws Exception {
super.receiveCurrentTemp(receiveCurrentTempPORT);
}

@Override
public boolean createUser(String email, String password, String ip) {
// TODO Auto-generated method stub
return false;
dataStorage.createUser(email, password, ip);
return true;
}

@Override
public boolean createThermostat(String serial, String name,
String desiredTemp) {
public boolean createThermostat(String serial, String name, String desiredTemp) {
// TODO Auto-generated method stub
return false;
}

@Override
public boolean createThermostat(String serialnumber, String name, String ip, String currenttemp, String desiredtemp){
dataStorage.createThermostat(serialnumber, name, ip, currenttemp, desiredtemp);
return true;
}

public Hashtable<String, String> getUserFromEmail(String email) {
// TODO Auto-generated method stub
return null;
return dataStorage.getObjectFromTableAndKey("UserTable", email);
}

@Override
public Hashtable<String, String> getDeviceFromSerial(String serialnumber) {
// TODO Auto-generated method stub
return null;
return dataStorage.getObjectFromTableAndKey("Thermostat", serialnumber);
}

@Override
public String getCurrentTempFromSerialNumber(String serialnumber) {
// TODO Auto-generated method stub
return null;
return dataStorage.queryForValue("Thermostat", serialnumber, "currenttemp");
}

@Override
public void setCurrentTempForSerialNumber(String serialNumber,
String currtemp) {
// TODO Auto-generated method stub

public void setCurrentTempForSerialNumber(String serialnumber, String currtemp) {
dataStorage.updateTable("Thermostat", serialnumber, "currenttemp", currtemp);
}

@Override
public void setDesiredTempForSerialNumber(String serialnumber,
String desiredtemp) {
// TODO Auto-generated method stub

public void setDesiredTempForSerialNumber(String serialnumber, String desiredtemp) {
dataStorage.updateTable("Thermostat", serialnumber, "desiredtemp", desiredtemp);
}

@Override
public String getDevicesFromEmail(String email) {
// TODO Auto-generated method stub
return null;
}

@Override
public void datastructureLogEvent(String query) {
// take this query string and pass it to the UI to display in the Log in the server text field
}


Expand Down

0 comments on commit bf216e6

Please sign in to comment.