From 16fd4bad182eff66aca5c9d1e1f12458e9b4928b Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Wed, 3 Oct 2012 11:24:45 -0400
Subject: [PATCH] Warn about error, if one occurs.
The version_x_results methods will return nil in case of an error. We
need to detect that and not execute that branch of the 'if' statement.
---
lib/geocoder/lookups/yahoo.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/geocoder/lookups/yahoo.rb b/lib/geocoder/lookups/yahoo.rb
index 14004487..f27beca0 100644
--- a/lib/geocoder/lookups/yahoo.rb
+++ b/lib/geocoder/lookups/yahoo.rb
@@ -13,10 +13,10 @@ module Geocoder::Lookup
def results(query)
return [] unless doc = fetch_data(query)
doc = doc['ResultSet']
- if api_version(doc).to_i == 1
- return version_1_results(doc)
- elsif api_version(doc).to_i == 2
- return version_2_results(doc)
+ if api_version(doc).to_i == 1 and r = version_1_results(doc)
+ return r
+ elsif api_version(doc).to_i == 2 and r = version_2_results(doc)
+ return r
else
warn "Yahoo Geocoding API error: #{doc['Error']} (#{doc['ErrorMessage']})."
return []
--
GitLab