mafoo.org.uk/rivers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tidied comments; fixed checkdata() and added handling of nulls in json

Browse Source
This commit is contained in:
foo
2014-01-07 10:42:52 +00:00
parent 47e3a9980c
commit 6b0cade9e2
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
river_levels_
View File

@@ -15,11 +15,8 @@
# Parameters: # Parameters:
# #
# config # config
# autoconf
# suggest
# #
#%# family=manual #%# family=manual
#%# capabilities=autoconf suggest
# Expects a config file to specify which stations to include in the data check and name the catchment # Expects a config file to specify which stations to include in the data check and name the catchment
# #
@@ -40,7 +37,7 @@ CACHE=/tmp/river_level_.dat
checkdata () { checkdata () {
if test `find "$CACHE" -mtime +1` if test `find "$CACHE" -mtime +1`
then then
curl -o $CACHE -Ss $URLBASE || exit 1 curl -o $CACHE -Ss $urlbase || exit 1
fi fi
} }
@@ -82,5 +79,5 @@ fi
for STATION in $stations ; do for STATION in $stations ; do
curl -m 5 -sS $urlbase/$STATION | curl -m 5 -sS $urlbase/$STATION |
perl -MJSON::PP -e '$id=shift(@ARGV); $d=decode_json(<>) or die; print "river_level_$id.value $d->{data}->{current}->{level}\n";' $STATION perl -MJSON::PP -e '$id=shift(@ARGV); $d=decode_json(<>) or die "error decoding station $id"; print "river_level_$id.value ", $d->{data}->{current}->{level} || "U", "\n";' $STATION
done done