Changeset 96

Timestamp:

10/01/07 22:37:08 (5 years ago)

Author:

nigel

Message:

Bug fixes

Location:

openweather

Files:

• openweather.install (modified) (1 diff)
• openweather.module (modified) (10 diffs)

openweather/openweather.install

@@ -9 +9 @@
     db_query("CREATE TABLE `openweather_readings` (
   `nid` INT( 10 ) NOT NULL ,
-  `time` DATETIME NOT NULL ,
-  `temp_in` decimal(3,1) NOT NULL default '0.0',
+  `timestamp` DATETIME NOT NULL ,
   `temp_out` decimal(3,1) NOT NULL default '0.0',
   `dewpoint` decimal(3,1) NOT NULL default '0.0',
-  `rel_hum_in` tinyint(3) NOT NULL default '0',
   `rel_hum_out` tinyint(3) NOT NULL default '0',
   `windspeed` decimal(3,1) NOT NULL default '0.0',

openweather/openweather.module

@@ -212 +212 @@
   */
 function openweather_summary($nid){
-  $data = db_query("SELECT * FROM {openweather_readings} WHERE nid = $nid ORDER BY `time` DESC LIMIT 1");
+  $data = db_query("SELECT * FROM {openweather_readings} WHERE nid = $nid ORDER BY `timestamp` DESC LIMIT 1");
   $data = db_fetch_object($data);
 
@@ -218 +218 @@
   $output .= "<tr><th>Temperature</th><td>$data->temp_out dec C</td><th>Humidity</th><td>$data->rel_hum_out %</td></tr>";
   $output .= "<tr><th>Wind speed</th><td>$data->windspeed kMh</td><th>Wind direction</th><td>".openweather_to_direction($data->wind_angle)."($data->wind_angle)</td></tr>";
-  $output .= "<tr><th>Relative pressure</th><td>$data->rel_pressure</td><th>Timestamp</th><td>$data->time</td></tr>";
+  $output .= "<tr><th>Relative pressure</th><td>$data->rel_pressure</td><th>Timestamp</th><td>$data->timestamp</td></tr>";
   $output .= "</table>";
   return $output;
@@ -262 +262 @@
   print "Time, Value\n";
   foreach($results as $row){
-    print '"'.$row->time.'",'.$row->value."\n";
+    print '"'.$row->timestamp.'",'.$row->value."\n";
   }
 }
@@ -271 +271 @@
 function openweather_get_values($node){
   $res = array();
-  $results = db_query("SELECT * FROM {openweather_readings} WHERE nid = %d ORDER BY time DESC", $node->nid);
+  $results = db_query("SELECT * FROM {openweather_readings} WHERE nid = %d ORDER BY timestamp DESC", $node->nid);
 
   while ($row = db_fetch_object($results)){
@@ -299 +299 @@
   $last = reset($values);
   $row = $last;
-  $target = strtotime($row->time); // Set the first target
+  $target = strtotime($row->timestamp); // Set the first target
   $value = $row->value; // We know what the first reading is!
 
@@ -308 +308 @@
     $target -= $days*60*60*24;
 
-    while ( !($row === false) && strtotime($row->time) > $target){
+    while ( !($row === false) && strtotime($row->timestamp) > $target){
       $last = $row;
       $row = next($values);
@@ -315 +315 @@
       break;
     } else {
-      $timeBetween = (strtotime( $last->time ) - strtotime( $row->time ));
-      $timeToTarget = $target - strtotime( $row->time );
+      $timeBetween = (strtotime( $last->timestamp ) - strtotime( $row->timestamp ));
+      $timeToTarget = $target - strtotime( $row->timestamp );
       $value = $row->value + (($last->value - $row->value)/$timeBetween*$timeToTarget);
       $entry = new StdClass();
@@ -391 +391 @@
     // Check person owns or can write to entry
 
-    return db_query("INSERT INTO {openweather_readings} (nid, `time`, temp_out, rel_hum_out, windspeed, wind_angle, wind_chill, rain_1h, rel_pressure, dewpoint) VALUES (%d, '%s', %s, %s, %s, %s, %s, %s, %s, %s)", $nid, $data['timestamp'], $data['temp'], $data['rel_hum'], $data['windspeed'], $data['wind_angle'], $data['wind_chill'], $data['rain_1h'], $data['rel_pressure'], $data['dewpoint']);
+    return db_query("INSERT INTO {openweather_readings} (nid, `timestamp`, temp_out, rel_hum_out, windspeed, wind_angle, wind_chill, rain_1h, rel_pressure, dewpoint) VALUES (%d, '%s', %s, %s, %s, %s, %s, %s, %s, %s)", $nid, $data['timestamp'], $data['temp'], $data['rel_hum'], $data['windspeed'], $data['wind_angle'], $data['wind_chill'], $data['rain_1h'], $data['rel_pressure'], $data['dewpoint']);
   } else {
     return false;
@@ -439 +439 @@
   }
 
-  $r = db_query("SELECT time(`time`) AS `timevalue`, unix_timestamp(`time`) as `timestamp`, $type FROM {openweather_readings} WHERE nid = $nid ORDER BY `time` DESC LIMIT 144" );
+  $r = db_query("SELECT time(`timestamp`) AS `timevalue`, unix_timestamp(`timestamp`) as `utimestamp`, $type FROM {openweather_readings} WHERE nid = $nid ORDER BY `timestamp` DESC LIMIT 144" );
 
   #$results = openweather_get_values($node);
@@ -456 +456 @@
   $minY = null;
   while ($e = db_fetch_object($r)) {
-    $g->x_data = array_merge($g->x_data, array($e->timevalue=>$e->timestamp));
+    $g->x_data = array_merge($g->x_data, array($e->timevalue=>$e->utimestamp));
     $g->y_data[$type][] = $e->$type;
-    //echo $e->$type.",".$e->timevalue.",".$e->timestamp."<br>";
+    //echo $e->$type.",".$e->timevalue.",".$e->utimestamp."<br>";
     if ($minY == null || $e->$type < $minY) $minY = $e->$type;
   }