andrew/statstat
Archived
1
0
Fork 0
Code Issues Releases Activity

Fix conflict

Browse Source
This commit is contained in:
James Stuckey Weber
2015-03-22 14:22:14 -04:00
parent f146e5b9b9 10e8457211
commit 98ce0b152f
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbsetup.php
View File

@@ -38,6 +38,8 @@ $sql = "CREATE TABLE IF NOT EXISTS `stat` (
$result = $conn->query($sql); $result = $conn->query($sql);
if (!$result) { if (!$result) {
printf("Errormessage: %s\n", $conn->error); printf("Errormessage: %s\n", $conn->error);
} else{
print "success";
} }
?> ?>

1
scrape.php
View File

@@ -19,6 +19,7 @@ if (!$conn) {
$good_columns = array("coolLowerSetpLimit","coolNextPeriod","coolSetpoint","coolUpperSetptLimit","deviceID","dispTemperature","displayedUnits","heatLowerSetptLimit","heatNextPeriod","heatSetpoint","heatUpperSetptLimit","isInVacationHoldMode","schedCoolSp","schedHeatSp","scheduleCapable","statusCool","statusHeat","systemSwitchPosition","weatherHumidity","weatherPhrase","weatherTemperature"); $good_columns = array("coolLowerSetpLimit","coolNextPeriod","coolSetpoint","coolUpperSetptLimit","deviceID","dispTemperature","displayedUnits","heatLowerSetptLimit","heatNextPeriod","heatSetpoint","heatUpperSetptLimit","isInVacationHoldMode","schedCoolSp","schedHeatSp","scheduleCapable","statusCool","statusHeat","systemSwitchPosition","weatherHumidity","weatherPhrase","weatherTemperature");
$clean_data = array(); $clean_data = array();
foreach($good_columns as $col){ foreach($good_columns as $col){
if(isset($data[$col])){ if(isset($data[$col])){