Added api calls and search processing.

ashchristopher · ashchristopher · commit 677a5f250cb1 · 2009-02-01T22:09:23.000-05:00
diff --git a/geonames.py b/geonames.py
@@ -2,7 +2,9 @@
 import httplib
 import simplejson
 import sys
+
 from urllib import urlencode
+from xml.etree import ElementTree
 
 class GeoNames():
 """
@@ -29,10 +31,50 @@ def _api_call(self, method, resource, **kwargs):
 return response.read()
 
 def get_connection(self):
+ """
+ Return a connection object to the webservice.
+ """
 c = httplib.HTTPConnection(self.server)
 return c
+ 
+ def search(self, name, country):
+ """
+ Perform a search for a country's information.
+ """
+ # we only want exact matches, and we only want one possible match.
+ xml = self._api_call('GET', 'search', name_equals=name, country=country, maxRows=1)
+ root_element = ElementTree.XML(xml)
+ results = root_element.find('totalResultsCount').text
+ if not results:
+ raise GeoNameResultException("No results returned for query.")
+ return GeoResult(
+ name = root_element.find('geoname/name').text,
+ country_name = root_element.find('geoname/countryName').text,
+ country_code = root_element.find('geoname/countryCode').text,
+ latitude = root_element.find('geoname/lat').text,
+ longitude = root_element.find('geoname/lng').text, 
+ )
+ 
 
- 
+class GeoResult(object):
+ """
+ Result object stores data returned from GeoNames api accessor object.
+ """
+ def __init__(self, name=None, country_name=None, country_code=None, latitude=None, longitude=None):
+ self.name = name
+ self.country_name = country_name
+ self.country_code = country_code
+ self.latitude = latitude
+ self.longitude = longitude
+ 
+ def is_complete(self):
+ complete = True
+ for key, val in self.__dict__.items():
+ if not val:
+ complete = False
+ break
+ return complete
+ 
 
 class GeoNameException(Exception):
 """
@@ -41,4 +83,10 @@ class GeoNameException(Exception):
 def __init__(self, value):
 self.message = value
 def __str__(self):
- return repr(self.message)
+ return repr(self.message)
+ 
+class GeoNameResultException(GeoNameException):
+ """
+ Error getting results from GeoName webservice.
+ """
+ pass

-Original file line number
+Diff line change
 importhttplib
 importsimplejson
 importsys
++
 fromurllibimporturlencode
 +fromxml.etreeimportElementTree
 classGeoNames():
 """
 returnresponse.read()
 defget_connection(self):
 +"""
 + Return a connection object to the webservice.
 + """
 c=httplib.HTTPConnection(self.server)
 returnc
++
 +defsearch(self, name, country):
 +"""
 + Perform a search for a country's information.
 + """
 +# we only want exact matches, and we only want one possible match.
 +xml=self._api_call('GET', 'search', name_equals=name, country=country, maxRows=1)
 +root_element=ElementTree.XML(xml)
 +results=root_element.find('totalResultsCount').text
 +ifnotresults:
 +raiseGeoNameResultException("No results returned for query.")
 +returnGeoResult(
 +name=root_element.find('geoname/name').text,
 +country_name=root_element.find('geoname/countryName').text,
 +country_code=root_element.find('geoname/countryCode').text,
 +latitude=root_element.find('geoname/lat').text,
 +longitude=root_element.find('geoname/lng').text,
 + )
++
+-
 +classGeoResult(object):
 +"""
 + Result object stores data returned from GeoNames api accessor object.
 + """
 +def__init__(self, name=None, country_name=None, country_code=None, latitude=None, longitude=None):
 +self.name=name
 +self.country_name=country_name
 +self.country_code=country_code
 +self.latitude=latitude
 +self.longitude=longitude
++
 +defis_complete(self):
 +complete=True
 +forkey, valinself.__dict__.items():
 +ifnotval:
 +complete=False
 +break
 +returncomplete
++
 classGeoNameException(Exception):
 """
 def__init__(self, value):
 self.message=value
 def__str__(self):
 -returnrepr(self.message)
 +returnrepr(self.message)
++
 +classGeoNameResultException(GeoNameException):
 +"""
 + Error getting results from GeoName webservice.
 + """
 +pass