From d14794e1c77ff54b167a6be40a153e9c25ed69da Mon Sep 17 00:00:00 2001 From: Christian 'VOID' Elberfeld <elberfeld@web.de> Date: Sat, 23 Nov 2013 23:17:21 +0100 Subject: [PATCH] erweiterte api mit parameter 'age' --- api/index.html | 1 + api/status.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/api/index.html b/api/index.html index 63c324a..4c37e3d 100644 --- a/api/index.html +++ b/api/index.html @@ -61,6 +61,7 @@ <tr><td class="type">int16</td><td class="variable">tempWerkstatt</td><td class="description">Die zum Zeitpunkt <span class="variable">timestamp</span> gemessene Temperatur in der Werkstatt in Zehntelgrad (213 => 21,3°).</td></tr> <tr><td class="type">boolean</td><td class="variable">tuerOffen</td><td class="description">Der zum Zeitpunkt <span class="variable">timestamp</span> erfasste Status der Eingangstür (0 = geschlossen; 1 = offen).</td></tr> <tr><td class="type">uint32</td><td class="variable">timestamp</td><td class="description">Zeitpunkt, an dem der Datensatz zuletzt erfasst wurde, als unix-timestamp.</td></tr> + <tr><td class="type">uint32</td><td class="variable">age</td><td class="description">Alter des Datensatzes in Sekunden.</td></tr> </table> </div> </li> diff --git a/api/status.php b/api/status.php index b2e7a5a..32312a6 100644 --- a/api/status.php +++ b/api/status.php @@ -2,7 +2,7 @@ $wankerlink = mysql_pconnect('localhost', 'wanker', 'b2SGyye48tJjtjyY', false) or print(mysql_error()); mysql_select_db('warpzone_wanker', $wankerlink) or print("FehlerS:" . mysql_error()); - $wankerQuery = "SELECT tempLounge, tempWerkstatt, tuerOffen, unix_timestamp(time) as time FROM zonenstatus ORDER BY time DESC LIMIT 1"; + $wankerQuery = "SELECT tempLounge, tempWerkstatt, tuerOffen, unix_timestamp(time) as time, UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(time) as age FROM zonenstatus ORDER BY time DESC LIMIT 1"; $wankerResult = mysql_query($wankerQuery, $wankerlink) or print("FehlerQ:" . mysql_error($wankerLink)); $wankerZonenArray = mysql_fetch_array($wankerResult) or print(mysql_error()); @@ -11,6 +11,7 @@ $wankerTempWerkstatt = $wankerZonenArray['tempWerkstatt']; $wankerTempLounge = $wankerZonenArray['tempLounge']; $wankerTimestamp = $wankerZonenArray['time']; + $wankerAge = $wankerZonenArray['age']; $wankerTuerOffen = $wankerZonenArray['tuerOffen'] == 0?0:1; @@ -19,6 +20,7 @@ $answerArray['tempWerkstatt'] = intval($wankerTempWerkstatt); $answerArray['tuerOffen'] = intval($wankerTuerOffen); $answerArray['timestamp'] = intval($wankerTimestamp); + $answerArray['age'] = intval($wankerAge); print(json_encode($answerArray)); -- GitLab