[freeside-commits] freeside/FS/FS geocode_Mixin.pm,1.9,1.10

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv18717

Modified Files:
	geocode_Mixin.pm 
Log Message:
eval fatal geocoding errors, turn them into warnings, RT#15539

Index: geocode_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/geocode_Mixin.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- geocode_Mixin.pm	13 Dec 2011 05:09:31 -0000	1.9
+++ geocode_Mixin.pm	21 Dec 2011 21:19:10 -0000	1.10
@@ -143,15 +143,20 @@
   #my $module = FS::Conf->new->config('geocode_module') || 'Geo::Coder::Googlev3';
 
   my $geocoder = Geo::Coder::Googlev3->new;
-  my $location = $geocoder->geocode( location =>
+
+  my $location = eval {
+    $geocoder->geocode( location =>
     $self->get($pre.'address1'). ','.
     ( $self->get($pre.'address2') ? $self->get($pre.'address2').',' : '' ).
     $self->get($pre.'city'). ','.
     $self->get($pre.'state'). ','.
     code2country($self->get($pre.'country'))
   );
-
-  #errors?
+  };
+  if ( $@ ) {
+    warn "geocoding error: $@\n";
+    return;
+  }
 
   my $geo_loc = $location->{'geometry'}{'location'} or return;
   if ( $geo_loc->{'lat'} && $geo_loc->{'lng'} ) {