From 300c3b4ed40d80a483ea9e52b1591e2c38ef7209 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 24 Nov 2007 14:36:21 +0000 Subject: [PATCH] Work round ruby's horribly broken URI.escape that deliberately doesn't escape most characters which have special meaning in URIs... --- app/controllers/geocoder_controller.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 27e7cbf3e..489d89b58 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -55,7 +55,7 @@ private results = Array.new # ask geocoder.us (they have a non-commercial use api) - response = fetch_text("http://rpc.geocoder.us/service/csv?zip=#{URI.escape(query)}") + response = fetch_text("http://rpc.geocoder.us/service/csv?zip=#{escape_query(query)}") # parse the response unless response.match(/couldn't find this zip/) @@ -74,7 +74,7 @@ private results = Array.new # ask npemap.org.uk to do a combined npemap + freethepostcode search - response = fetch_text("http://www.npemap.org.uk/cgi/geocoder.fcgi?format=text&postcode=#{URI.escape(query)}") + response = fetch_text("http://www.npemap.org.uk/cgi/geocoder.fcgi?format=text&postcode=#{escape_query(query)}") # parse the response unless response.match(/Error/) @@ -93,7 +93,7 @@ private results = Array.new # ask geocoder.ca (note - they have a per-day limit) - response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{URI.escape(query)}") + response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}") # parse the response unless response.get_elements("geodata/error") @@ -112,7 +112,7 @@ private results = Array.new # ask OSM namefinder - response = fetch_xml("http://www.frankieandshadow.com/osm/search.xml?find=#{URI.escape(query)}") + response = fetch_xml("http://www.frankieandshadow.com/osm/search.xml?find=#{escape_query(query)}") # parse the response response.elements.each("searchresults/named") do |named| @@ -151,7 +151,7 @@ private results = Array.new # ask geonames.org - response = fetch_xml("http://ws.geonames.org/search?q=#{URI.escape(query)}&maxRows=20") + response = fetch_xml("http://ws.geonames.org/search?q=#{escape_query(query)}&maxRows=20") # parse the response response.elements.each("geonames/geoname") do |geoname| @@ -248,4 +248,8 @@ private return count end + + def escape_query(query) + return URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]", false, 'N')) + end end -- 2.43.2