autoload methods returning foreign records, RT#13971

[freeside.git] / FS / FS / contact.pm

diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm
index 8fcd724..b76f0d9 100644 (file)
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -1,14 +1,8 @@
 package FS::contact;
+use base qw( FS::Record );
 
 use strict;
-use base qw( FS::Record );
-use FS::Record qw( qsearch qsearchs dbh );
-use FS::prospect_main;
-use FS::cust_main;
-use FS::contact_class;
-use FS::cust_location;
-use FS::contact_phone;
-use FS::contact_email;
+use FS::Record qw( qsearchs dbh ); # qw( qsearch qsearchs dbh );
 
 =head1 NAME
 
@@ -153,6 +147,16 @@ sub insert {
 
   }
 
+  #unless ( $import || $skip_fuzzyfiles ) {
+    #warn "  queueing fuzzyfiles update\n"
+    #  if $DEBUG > 1;
+    $error = $self->queue_fuzzyfiles_update;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "updating fuzzy search cache: $error";
+    }
+  #}
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   '';
@@ -277,6 +281,16 @@ sub replace {
 
   }
 
+  #unless ( $import || $skip_fuzzyfiles ) {
+    #warn "  queueing fuzzyfiles update\n"
+    #  if $DEBUG > 1;
+    $error = $self->queue_fuzzyfiles_update;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "updating fuzzy search cache: $error";
+    }
+  #}
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   '';
@@ -306,6 +320,44 @@ sub _parse_phonestring {
   );
 }
 
+=item queue_fuzzyfiles_update
+
+Used by insert & replace to update the fuzzy search cache
+
+=cut
+
+use FS::cust_main::Search;
+sub queue_fuzzyfiles_update {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $field ( 'first', 'last' ) {
+    my $queue = new FS::queue { 
+      'job' => 'FS::cust_main::Search::append_fuzzyfiles_fuzzyfield'
+    };
+    my @args = "contact.$field", $self->get($field);
+    my $error = $queue->insert( @args );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "queueing job (transaction rolled back): $error";
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
 =item check
 
 Checks all fields to make sure this is a valid example.  If there is
@@ -353,34 +405,12 @@ sub line {
   $data;
 }
 
-sub cust_location {
-  my $self = shift;
-  return '' unless $self->locationnum;
-  qsearchs('cust_location', { 'locationnum' => $self->locationnum } );
-}
-
-sub contact_class {
-  my $self = shift;
-  return '' unless $self->classnum;
-  qsearchs('contact_class', { 'classnum' => $self->classnum } );
-}
-
 sub contact_classname {
   my $self = shift;
   my $contact_class = $self->contact_class or return '';
   $contact_class->classname;
 }
 
-sub contact_phone {
-  my $self = shift;
-  qsearch('contact_phone', { 'contactnum' => $self->contactnum } );
-}
-
-sub contact_email {
-  my $self = shift;
-  qsearch('contact_email', { 'contactnum' => $self->contactnum } );
-}
-
 =back
 
 =head1 BUGS