From 7d1ac56eaea7b9a116f1eb010d228c354f42d18c Mon Sep 17 00:00:00 2001
From: obma <max@mober.at>
Date: Mon, 5 Oct 2015 20:19:14 +0200
Subject: [PATCH] p: updating openweather_: replaced fgrep, tr, cut with expr

Use expr to extract values and names from the OpenWeather API xml instead of the - when using a city with spaces in its name not correctly working - fgrep | tr | cut construct.
---
 plugins/weather/openweather_ | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 plugins/weather/openweather_

diff --git a/plugins/weather/openweather_ b/plugins/weather/openweather_
old mode 100644
new mode 100755
index bbd3c7a4..a7eea886
--- a/plugins/weather/openweather_
+++ b/plugins/weather/openweather_
@@ -19,15 +19,13 @@
 # env.apikey XYZ
 
 query_string=$(printf '%s' "${0#*_}" | tr '_' '=')
-TMPFILE=$(mktemp)
-trap 'rm -f $TMPFILE' EXIT
 
+OWAPI=$( curl -s "http://api.openweathermap.org/data/2.5/weather?mode=xml&${query_string}")
 # API returns temp in K, we have to convert it in C
+# &units=metric would change that ;-)
 KELVIN_BIAS=273
 
-curl -s "http://api.openweathermap.org/data/2.5/weather?mode=xml&${query_string}&APPID=${apikey}" > $TMPFILE
-
-CITY=$(fgrep "<city id=" $TMPFILE | tr -sc '[:alnum:]' ' ' | cut -d " " -f 6)
+CITY=$( expr "$OWAPI" : '.*\<city.*name=\"\(.*\)\"><coord.*' )
 
 if [ "$1" = "config" ];
 then
@@ -85,15 +83,15 @@ then
 	[ "$MUNIN_CAP_DIRTYCONFIG" = 1 ] || exit 0
 fi
 
-TEMP_AVG=$(fgrep "<temperature value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 4)
-TEMP_MIN=$(fgrep "<temperature value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 6)
-TEMP_MAX=$(fgrep "<temperature value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 8)
+TEMP_AVG=$( expr "$OWAPI" : '.*\<temperature value=\"\(.*\)\" min.*/temperature.*' )
+TEMP_MIN=$( expr "$OWAPI" : '.*\<temperature .*min=\"\(.*\)\" max.*/temperature.*' )
+TEMP_MAX=$( expr "$OWAPI" : '.*\<temperature .*max=\"\(.*\)\" unit.*/temperature.*' )
 
-HUMIDITY=$(fgrep "<humidity value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 4)
-PRESSURE=$(fgrep "<pressure value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 4)
+HUMIDITY=$( expr "$OWAPI" : '.*\<humidity .*value=\"\(.*\)\" unit.*/humidity.*' )
+PRESSURE=$( expr "$OWAPI" : '.*\<pressure .*value=\"\(.*\)\" unit.*/pressure.*' )
 
-WD_SPEED=$(fgrep "<speed value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 4)
-WD_DIREC=$(fgrep "<direction value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 4)
+WD_SPEED=$( expr "$OWAPI" : '.*\<speed .*value=\"\(.*\)\" name.*/speed.*' )
+WD_DIREC=$( expr "$OWAPI" : '.*\<direction .*value=\"\(.*\)\" code.*/direction.*' )
 
 cat <<- EOF
 	multigraph $0