X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fnena2.pm;h=cc4069c72091301909aec2a6b1299169b5a95c59;hp=36f0293021c4e91af7b36acd0f920e3c4b2ab2a0;hb=ffa18709ee8a4d05e18d2d406cf73afe79e52524;hpb=f84f4970c03fa01779fc94cdc9dbada9f314b0cc

diff --git a/FS/FS/part_export/nena2.pm b/FS/FS/part_export/nena2.pm
index 36f029302..cc4069c72 100644
--- a/FS/FS/part_export/nena2.pm
+++ b/FS/FS/part_export/nena2.pm
@@ -10,9 +10,16 @@ use Date::Format qw(time2str);
 use Parse::FixedLength;
 use File::Temp qw(tempfile);
 use vars qw(%info %options $initial_load_hack $DEBUG);
+use Carp qw( carp );
 
 my %upload_targets;
 
+tie our %parsing_rules, 'Tie::IxHash', (
+  'no_street_suffix' => 'Avoid street suffix',
+  'no_postdir'       => 'Avoid post directional',
+  # add others as we learn about them
+);
+
 tie %options, 'Tie::IxHash', (
   'company_name'    => {  label => 'Company name for header record',
                           type  => 'text',
@@ -51,8 +58,15 @@ tie %options, 'Tie::IxHash', (
                        },
   'debug'           => { label => 'Enable debugging',
                          type => 'checkbox' },
+  'parsing_rules'   => { label => 'Address parsing rules',
+                         type => 'title' },
+
+  map({ $_ => { label => $parsing_rules{$_}, type => 'checkbox' } }
+    keys %parsing_rules
+  ),
 );
 
+
 %info = (
   'svc'       => 'svc_phone',
   'desc'      => 'Export a NENA 2 E911 data file',
@@ -247,6 +261,8 @@ sub data {
     $full_address .= ' ' . $address2;
   }
 
+  Geo::StreetAddress::US->avoid_redundant_street_type(1);
+
   my $location_hash = Geo::StreetAddress::US->parse_address(
     uc( join(', ',  $full_address,
                     $cust_location->city,
@@ -254,7 +270,16 @@ sub data {
                     $cust_location->zip
     ) )
   );
-  if ( !$location_hash and length($address2) ) {
+  if ( length($address2) ) {
+    # be careful how we handle this
+    if ( !defined $location_hash ) {
+      # then it did successfully parse. BUT.
+      # if there's no sec_unit_type, then the address2 was parsed as part
+      # of the street name, which is wrong. Then reparse.
+      if ( !$location_hash->{sec_unit_type} ) {
+        undef $location_hash;
+      }
+    }
     # then parsing failed. Try again without the address2.
     $location_hash = Geo::StreetAddress::US->parse_address(
       uc( join(', ',
@@ -273,16 +298,30 @@ sub data {
     $hash{house_number_suffix}  = ''; # we don't support this, do we?
     $hash{prefix_directional}   = $location_hash->{prefix};
     $hash{street_name}          = $location_hash->{street};
-    $hash{street_suffix}        = $location_hash->{type};
-    $hash{post_directional}     = $location_hash->{suffix};
     $hash{community_name}       = $location_hash->{city};
     $hash{state}                = $location_hash->{state};
+
     if ($location_hash->{sec_unit_type}) {
       $hash{location} = $location_hash->{sec_unit_type} . ' ' .
                         $location_hash->{sec_unit_num};
     } else {
+      # if sec_unit_type was not set, then put address2 in 'location'
       $hash{location} = $address2;
     }
+
+    if ( $self->option('no_street_suffix') and $location_hash->{type} ) {
+      my $type = $location_hash->{type};
+      $hash{street_name}  .= ' ' . uc($location_hash->{type});
+    } else {
+      $hash{street_suffix} = uc($location_hash->{type});
+    }
+
+    if ( $self->option('no_postdir') and $location_hash->{suffix} ) {
+      $hash{street_name}  .= ' ' . $location_hash->{suffix};
+    } else {
+      $hash{post_directional} = $location_hash->{suffix};
+    }
+
   } else {
     # then it still wouldn't parse; happens when the address has no house
     # number (which is allowed in NENA 2 format). so just put all the 
@@ -358,6 +397,13 @@ sub process {
   my $self = shift;
   my $batch = shift;
   local $DEBUG = $self->option('debug');
+
+  if ( $FS::svc_Common::noexport_hack ) {
+    carp 'FS::part_export::nena2::process() suppressed by noexport_hack'
+      if $DEBUG;
+    return;
+  }
+
   local $FS::UID::AutoCommit = 0;
   my $error;