use FS::cust_main;
use FS::cust_main_invoice;
use FS::svc_acct;
+use FS::payinfo_Mixin;
@EXPORT_OK = qw( smart_search );
$DEBUG = 0;
$me = '[FS::cust_main::Search]';
-@fuzzyfields = ( 'first', 'last', 'company', 'address1' );
+@fuzzyfields = (
+ 'cust_main.first', 'cust_main.last', 'cust_main.company',
+ 'cust_main.ship_company', # if you're using it
+ 'cust_location.address1',
+ 'contact.first', 'contact.last',
+);
install_callback FS::UID sub {
$conf = new FS::Conf;
Accepts the following options: I<search>, the string to search for. The string
will be searched for as a customer number, phone number, name or company name,
-as an exact, or, in some cases, a substring or fuzzy match (see the source code
-for the exact heuristics used); I<no_fuzzy_on_exact>, causes smart_search to
+address (if address1-search is on), invoicing email address, or credit card
+number.
+
+Searches match as an exact, or, in some cases, a substring or fuzzy match (see
+the source code for the exact heuristics used); I<no_fuzzy_on_exact>, causes
+smart_search to
skip fuzzy matching when an exact match is found.
Any additional options are treated as an additional qualifier on the search
#here is the agent virtualization
my $agentnums_sql =
$FS::CurrentUser::CurrentUser->agentnums_sql(table => 'cust_main');
+ my $agentnums_href = $FS::CurrentUser::CurrentUser->agentnums_href;
my @cust_main = ();
my $phonen = "$1-$2-$3";
$phonen .= " x$4" if $4;
+ my $phonenum = "$1$2$3";
+ #my $extension = $4;
+
+ #cust_main phone numbers
push @cust_main, qsearch( {
'table' => 'cust_main',
'hashref' => { %options },
" AND $agentnums_sql", #agent virtualization
} );
+ #contact phone numbers
+ push @cust_main,
+ grep $agentnums_href->{$_->agentnum}, #agent virt
+ grep $_, #skip contacts that don't have cust_main records
+ map $_->contact->cust_main,
+ qsearch({
+ 'table' => 'contact_phone',
+ 'hashref' => { 'phonenum' => $phonenum },
+ });
+
unless ( @cust_main || $phonen =~ /x\d+$/ ) { #no exact match
#try looking for matches with extensions unless one was specified
}
- # custnum search (also try agent_custid), with some tweaking options if your
- # legacy cust "numbers" have letters
}
- if ( $search =~ /@/ ) {
+ if ( $search =~ /@/ ) { #email address
+
+ # invoicing email address
push @cust_main,
+ grep $agentnums_href->{$_->agentnum}, #agent virt
map $_->cust_main,
qsearch( {
'table' => 'cust_main_invoice',
'hashref' => { 'dest' => $search },
}
);
+
+ # contact email address
+ push @cust_main,
+ grep $agentnums_href->{$_->agentnum}, #agent virt
+ grep $_, #skip contacts that don't have cust_main records
+ map $_->contact->cust_main,
+ qsearch( {
+ 'table' => 'contact_email',
+ 'hashref' => { 'emailaddress' => $search },
+ }
+ );
+
+ # custnum search (also try agent_custid), with some tweaking options if your
+ # legacy cust "numbers" have letters
} elsif ( $search =~ /^\s*(\d+)\s*$/
|| ( $conf->config('cust_main-agent_custid-format') eq 'ww?d+'
&& $search =~ /^\s*(\w\w?\d+)\s*$/
# for all agents this user can see, if any of them have custnum prefixes
# that match the search string, include customers that match the rest
# of the custnum and belong to that agent
- foreach my $agentnum ( $FS::CurrentUser::CurrentUser->agentnums ) {
+ foreach my $agentnum ( keys %$agentnums_href ) {
my $p = $conf->config('cust_main-custnum-display_prefix', $agentnum);
next if !$p;
if ( $p eq substr($num, 0, length($p)) ) {
$agentnums_sql,
),
} ),
+
#contacts?
+ # probably not necessary for the "something a browser remembered" case
} elsif ( $search =~ /^\s*(\S.*\S)\s*$/ ) { # value search
- # try (ship_){last,company}
+ # try {first,last,company}
my $value = lc($1);
my $sql = scalar(keys %options) ? ' AND ' : ' WHERE ';
$sql .= "( LOWER(cust_main.last) = $q_last AND LOWER(cust_main.first) = $q_first )";
+ #cust_main
push @cust_main, qsearch( {
'table' => 'cust_main',
'hashref' => \%options,
'extra_sql' => "$sql AND $agentnums_sql", #agent virtualization
} );
- #contacts?
+
+ #contacts
+ push @cust_main,
+ grep $agentnums_href->{$_->agentnum}, #agent virt
+ grep $_, #skip contacts that don't have cust_main records
+ map $_->cust_main,
+ qsearch( {
+ 'table' => 'contact',
+ 'hashref' => { 'first' => $first,
+ 'last' => $last,
+ },
+ }
+ );
# or it just be something that was typed in... (try that in a sec)
#exact
my $sql = scalar(keys %options) ? ' AND ' : ' WHERE ';
- $sql .= " ( LOWER(last) = $q_value
- OR LOWER(company) = $q_value
+ $sql .= " ( LOWER(cust_main.first) = $q_value
+ OR LOWER(cust_main.last) = $q_value
+ OR LOWER(cust_main.company) = $q_value
+ OR LOWER(cust_main.ship_company) = $q_value
";
- #yes, it's a kludge
- $sql .= " OR EXISTS(
- SELECT 1 FROM cust_location
- WHERE LOWER(cust_location.address1) = $q_value
- AND cust_location.custnum = cust_main.custnum
- )
- "
+
+ #address1 (yes, it's a kludge)
+ $sql .= " OR EXISTS (
+ SELECT 1 FROM cust_location
+ WHERE LOWER(cust_location.address1) = $q_value
+ AND cust_location.custnum = cust_main.custnum
+ )"
if $conf->exists('address1-search');
- $sql .= " )";
+
+ #contacts (look, another kludge)
+ $sql .= " OR EXISTS ( SELECT 1 FROM contact
+ WHERE ( LOWER(contact.first) = $q_value
+ OR LOWER(contact.last) = $q_value
+ )
+ AND contact.custnum IS NOT NULL
+ AND contact.custnum = cust_main.custnum
+ )
+ ) ";
push @cust_main, qsearch( {
'table' => 'cust_main',
#substring
- my @hashrefs = (
+ my @company_hashrefs = (
{ 'company' => { op=>'ILIKE', value=>"%$value%" }, },
+ { 'ship_company' => { op=>'ILIKE', value=>"%$value%" }, },
);
+ my @hashrefs = ();
+
if ( $first && $last ) {
- #contacts? ship_first/ship_last are gone
- push @hashrefs,
+ @hashrefs = (
{ 'first' => { op=>'ILIKE', value=>"%$first%" },
'last' => { op=>'ILIKE', value=>"%$last%" },
},
- ;
+ );
} else {
- push @hashrefs,
+ @hashrefs = (
+ { 'first' => { op=>'ILIKE', value=>"%$value%" }, },
{ 'last' => { op=>'ILIKE', value=>"%$value%" }, },
- ;
+ );
}
- foreach my $hashref ( @hashrefs ) {
+ foreach my $hashref ( @company_hashrefs, @hashrefs ) {
push @cust_main, qsearch( {
'table' => 'cust_main',
if ( $conf->exists('address1-search') ) {
push @cust_main, qsearch( {
- 'table' => 'cust_main',
- 'addl_from' => 'JOIN cust_location USING (custnum)',
- 'extra_sql' => 'WHERE cust_location.address1 ILIKE '.
- dbh->quote("%$value%"),
+ table => 'cust_main',
+ addl_from => 'JOIN cust_location USING (custnum)',
+ extra_sql => 'WHERE '.
+ ' cust_location.address1 ILIKE '.dbh->quote("%$value%").
+ " AND $agentnums_sql", #agent virtualizaiton
} );
}
+ #contact substring
+
+ foreach my $hashref ( @hashrefs ) {
+
+ push @cust_main,
+ grep $agentnums_href->{$_->agentnum}, #agent virt
+ grep $_, #skip contacts that don't have cust_main records
+ map $_->cust_main,
+ qsearch({
+ 'table' => 'contact',
+ 'hashref' => { %$hashref,
+ #%options,
+ },
+ #'extra_sql' => " AND $agentnums_sql", #agent virt
+ });
+
+ }
+
#fuzzy
my %fuzopts = (
'hashref' => \%options,
'select' => '',
- 'extra_sql' => " AND $agentnums_sql", #agent virtualization
+ 'extra_sql' => "WHERE $agentnums_sql", #agent virtualization
);
if ( $first && $last ) {
'first' => $first }, #
%fuzopts
);
+ push @cust_main, FS::cust_main::Search->fuzzy_search(
+ { 'contact.last' => $last, #fuzzy hashref
+ 'contact.first' => $first }, #
+ %fuzopts
+ );
+ }
+ foreach my $field ( 'first', 'last', 'company', 'ship_company' ) {
+ push @cust_main, FS::cust_main::Search->fuzzy_search(
+ { $field => $value },
+ %fuzopts
+ );
}
- foreach my $field ( 'last', 'company' ) {
- push @cust_main,
- FS::cust_main::Search->fuzzy_search( { $field => $value }, %fuzopts );
+ foreach my $field ( 'first', 'last' ) {
+ push @cust_main, FS::cust_main::Search->fuzzy_search(
+ { "contact.$field" => $value },
+ %fuzopts
+ );
}
if ( $conf->exists('address1-search') ) {
push @cust_main,
- FS::cust_main::Search->fuzzy_search( { 'address1' => $value }, %fuzopts );
+ FS::cust_main::Search->fuzzy_search(
+ { 'cust_location.address1' => $value },
+ %fuzopts
+ );
}
}
}
+ ( my $nospace_search = $search ) =~ s/\s//g;
+ ( my $card_search = $nospace_search ) =~ s/\-//g;
+ $card_search =~ s/[x\*\.\_]/x/gi;
+
+ if ( $card_search =~ /^[\dx]{15,16}$/i ) { #credit card search
+
+ ( my $like_search = $card_search ) =~ s/x/_/g;
+ my $mask_search = FS::payinfo_Mixin->mask_payinfo('CARD', $card_search);
+
+ push @cust_main, qsearch({
+ 'table' => 'cust_main',
+ 'addl_from' => ' JOIN cust_payby USING (custnum)',
+ 'hashref' => {},
+ 'extra_sql' => " WHERE ( cust_payby.payinfo LIKE '$like_search'
+ OR cust_payby.paymask = '$mask_search'
+ ) ".
+ " AND cust_payby.payby IN ('CARD','DCRD') ".
+ " AND $agentnums_sql", #agent virtulization
+ });
+
+ }
+
+
#eliminate duplicates
my %saw = ();
@cust_main = grep { !$saw{$_->custnum}++ } @cust_main;
sub email_search {
my %options = @_;
- local($DEBUG) = 1;
-
my $email = delete $options{'email'};
- #we're only being used by RT at the moment... no agent virtualization yet
+ #no agent virtualization yet
#my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
my @cust_main = ();
if $DEBUG;
push @cust_main,
- map $_->cust_main,
+ map { $_->cust_main }
+ map { $_->cust_contact }
+ map { $_->contact }
qsearch( {
- 'table' => 'cust_main_invoice',
- 'hashref' => { 'dest' => $email },
+ 'table' => 'contact_email',
+ 'hashref' => { 'emailaddress' => $email },
}
);
listref of start date, end date
-=item payby
-
-listref
-
-=item paydate_year
-
-=item paydate_month
-
=item current_balance
listref (list returned by FS::UI::Web::parse_lt_gt($cgi, 'current_balance'))
'status' => '',
'address' => '',
'zip' => '',
- 'paydate_year' => '',
'invoice_terms' => '',
'custbatch' => '',
%$params
}
##
- # do the same for user
+ # parse sales person
+ ##
+
+ if ( $params->{'salesnum'} =~ /^(\d+)$/ ) {
+ push @where, ($1 > 0 ) ? "cust_main.salesnum = $1"
+ : 'cust_main.salesnum IS NULL';
+ }
+
+ ##
+ # parse usernum
##
if ( $params->{'usernum'} =~ /^(\d+)$/ and $1 ) {
##
# address
##
- if ( $params->{'address'} =~ /\S/ ) {
- my $address = dbh->quote('%'. lc($params->{'address'}). '%');
+ if ( $params->{'address'} ) {
+ # allow this to be an arrayref
+ my @values = ($params->{'address'});
+ @values = @{$values[0]} if ref($values[0]);
+ my @orwhere;
+ foreach (grep /\S/, @values) {
+ my $address = dbh->quote('%'. lc($_). '%');
+ push @orwhere,
+ "LOWER(cust_location.address1) LIKE $address",
+ "LOWER(cust_location.address2) LIKE $address";
+ }
+ if (@orwhere) {
+ push @where, "EXISTS(
+ SELECT 1 FROM cust_location
+ WHERE cust_location.custnum = cust_main.custnum
+ AND (".join(' OR ',@orwhere).")
+ )";
+ }
+ }
+
+ ##
+ # city
+ ##
+ if ( $params->{'city'} =~ /\S/ ) {
+ my $city = dbh->quote($params->{'city'});
push @where, "EXISTS(
- SELECT 1 FROM cust_location
+ SELECT 1 FROM cust_location
WHERE cust_location.custnum = cust_main.custnum
- AND (LOWER(cust_location.address1) LIKE $address OR
- LOWER(cust_location.address2) LIKE $address)
+ AND cust_location.city = $city
+ )";
+ }
+
+ ##
+ # county
+ ##
+ if ( $params->{'county'} =~ /\S/ ) {
+ my $county = dbh->quote($params->{'county'});
+ push @where, "EXISTS(
+ SELECT 1 FROM cust_location
+ WHERE cust_location.custnum = cust_main.custnum
+ AND cust_location.county = $county
+ )";
+ }
+
+ ##
+ # state
+ ##
+ if ( $params->{'state'} =~ /\S/ ) {
+ my $state = dbh->quote($params->{'state'});
+ push @where, "EXISTS(
+ SELECT 1 FROM cust_location
+ WHERE cust_location.custnum = cust_main.custnum
+ AND cust_location.state = $state
)";
}
)";
}
+ ##
+ # country
+ ##
+ if ( $params->{'country'} =~ /^(\w\w)$/ ) {
+ my $country = uc($1);
+ push @where, "EXISTS(
+ SELECT 1 FROM cust_location
+ WHERE cust_location.custnum = cust_main.custnum
+ AND cust_location.country = '$country'
+ )";
+ }
+
###
# refnum
###
unless $params->{'cancelled_pkgs'};
##
- # parse without census tract checkbox
+ # "with email address(es)" checkbox
##
- push @where, "(censustract = '' or censustract is null)"
- if $params->{'no_censustract'};
+ push @where,
+ 'EXISTS ( SELECT 1 FROM contact_email
+ JOIN cust_contact USING (contactnum)
+ WHERE cust_contact.custnum = cust_main.custnum
+ )'
+ if $params->{'with_email'};
##
- # parse with hardcoded tax location checkbox
+ # "with postal mail invoices" checkbox
##
- push @where, "geocode is not null"
- if $params->{'with_geocode'};
+ push @where, "cust_main.postal_invoice = 'Y'"
+ if $params->{'POST'};
##
- # "with email address(es)" checkbox
+ # "without postal mail invoices" checkbox
##
- push @where,
- 'EXISTS ( SELECT 1 FROM cust_main_invoice
- WHERE cust_main_invoice.custnum = cust_main.custnum
- AND length(dest) > 5
- )' # AND dest LIKE '%@%'
- if $params->{'with_email'};
+ push @where, "cust_main.postal_invoice IS NULL"
+ if $params->{'no_POST'};
##
- # "without postal mail invoices" checkbox
+ # "tax exempt" checkbox
##
+ push @where, "cust_main.tax = 'Y'"
+ if $params->{'tax'};
- push @where,
- "NOT EXISTS ( SELECT 1 FROM cust_main_invoice
- WHERE cust_main_invoice.custnum = cust_main.custnum
- AND dest = 'POST' )"
- if $params->{'no_POST'};
+ ##
+ # "not tax exempt" checkbox
+ ##
+ push @where, "(cust_main.tax = '' OR cust_main.tax IS NULL )"
+ if $params->{'no_tax'};
##
# dates
}
###
- # payby
- ###
-
- if ( $params->{'payby'} ) {
-
- my @payby = ref( $params->{'payby'} )
- ? @{ $params->{'payby'} }
- : ( $params->{'payby'} );
-
- @payby = grep /^([A-Z]{4})$/, @payby;
-
- push @where, '( '. join(' OR ', map "cust_main.payby = '$_'", @payby). ' )'
- if @payby;
-
- }
-
- ###
- # paydate_year / paydate_month
- ###
-
- if ( $params->{'paydate_year'} =~ /^(\d{4})$/ ) {
- my $year = $1;
- $params->{'paydate_month'} =~ /^(\d\d?)$/
- or die "paydate_year without paydate_month?";
- my $month = $1;
-
- push @where,
- 'paydate IS NOT NULL',
- "paydate != ''",
- "CAST(paydate AS timestamp) < CAST('$year-$month-01' AS timestamp )"
-;
- }
-
- ###
# invoice terms
###
@tagnums = grep /^(\d+)$/, @tagnums;
if ( @tagnums ) {
+ if ( $params->{'all_tags'} ) {
+ foreach ( @tagnums ) {
+ push @where, 'exists(select 1 from cust_tag where '.
+ 'cust_tag.custnum = cust_main.custnum and tagnum = '.
+ $_ . ')';
+ }
+ } else { # matching any tag, not all
my $tags_where = "0 < (select count(1) from cust_tag where "
. " cust_tag.custnum = cust_main.custnum and tagnum in ("
. join(',', @tagnums) . "))";
push @where, $tags_where;
+ }
}
}
+ # pkg_classnum
+ # all_pkg_classnums
+ # any_pkg_status
+ if ( $params->{'pkg_classnum'} ) {
+ my @pkg_classnums = ref( $params->{'pkg_classnum'} ) ?
+ @{ $params->{'pkg_classnum'} } :
+ $params->{'pkg_classnum'};
+ @pkg_classnums = grep /^(\d+)$/, @pkg_classnums;
+
+ if ( @pkg_classnums ) {
+
+ my @pkg_where;
+ if ( $params->{'all_pkg_classnums'} ) {
+ push @pkg_where, "part_pkg.classnum = $_" foreach @pkg_classnums;
+ } else {
+ push @pkg_where,
+ 'part_pkg.classnum IN('. join(',', @pkg_classnums).')';
+ }
+ foreach (@pkg_where) {
+ my $select_pkg =
+ "SELECT 1 FROM cust_pkg JOIN part_pkg USING (pkgpart) WHERE ".
+ "cust_pkg.custnum = cust_main.custnum AND $_ ";
+ if ( not $params->{'any_pkg_status'} ) {
+ $select_pkg .= 'AND '.FS::cust_pkg->active_sql;
+ }
+ push @where, "EXISTS($select_pkg)";
+ }
+ }
+ }
##
# setup queries, subs, etc. for the search
'ON (cust_main.'.$pre.'locationnum = '.$pre.'location.locationnum) ';
}
- my $count_query = "SELECT COUNT(*) FROM cust_main $extra_sql";
+ # always make referral available in results
+ # (maybe we should be using FS::UI::Web::join_cust_main instead?)
+ $addl_from .= ' LEFT JOIN (select refnum, referral from part_referral) AS part_referral_x ON (cust_main.refnum = part_referral_x.refnum) ';
+
+ my $count_query = "SELECT COUNT(*) FROM cust_main $addl_from $extra_sql";
my @select = (
'cust_main.custnum',
+ 'cust_main.salesnum',
# there's a good chance that we'll need these
'cust_main.bill_locationnum',
'cust_main.ship_locationnum',
if ($params->{'flattened_pkgs'}) {
#my $pkg_join = '';
- $addl_from .= ' LEFT JOIN cust_pkg USING ( custnum ) ';
+ $addl_from .=
+ ' LEFT JOIN cust_pkg ON ( cust_main.custnum = cust_pkg.custnum ) ';
if ($dbh->{Driver}->{Name} eq 'Pg') {
}
- if ( $params->{'with_geocode'} ) {
-
- unshift @extra_headers, 'Tax location override', 'Calculated tax location';
- unshift @extra_fields, sub { my $c = shift; $c->get('geocode'); },
- sub { my $c = shift;
- $c->set('geocode', '');
- $c->geocode('cch'); #XXX only cch right now
- };
- push @select, 'geocode';
- push @select, 'zip' unless grep { $_ eq 'zip' } @select;
- push @select, 'ship_zip' unless grep { $_ eq 'ship_zip' } @select;
- }
-
my $select = join(', ', @select);
my $sql_query = {
'extra_headers' => \@extra_headers,
'extra_fields' => \@extra_fields,
};
+ $sql_query;
}
=cut
sub fuzzy_search {
- my( $self, $fuzzy ) = @_;
+ my $self = shift;
+ my $fuzzy = shift;
# sensible defaults, then merge in any passed options
my %fuzopts = (
'table' => 'cust_main',
my @cust_main = ();
+ my @fuzzy_mod = 'i';
+ my $conf = new FS::Conf;
+ my $fuzziness = $conf->config('fuzzy-fuzziness');
+ push @fuzzy_mod, $fuzziness if $fuzziness;
+
check_and_rebuild_fuzzyfiles();
foreach my $field ( keys %$fuzzy ) {
next unless scalar(@$all);
my %match = ();
- $match{$_}=1 foreach ( amatch( $fuzzy->{$field}, ['i'], @$all ) );
-
- my @fcust = ();
- foreach ( keys %match ) {
- if ( $field eq 'address1' ) {
- #because it lives outside the table
- my $addl_from = $fuzopts{addl_from} .
- 'JOIN cust_location USING (custnum)';
- my $extra_sql = $fuzopts{extra_sql} .
- " AND cust_location.address1 = ".dbh->quote($_);
- push @fcust, qsearch({
- %fuzopts,
- 'addl_from' => $addl_from,
- 'extra_sql' => $extra_sql,
- });
- } else {
- my $hash = $fuzopts{hashref};
- $hash->{$field} = $_;
- push @fcust, qsearch({
- %fuzopts,
- 'hashref' => $hash
- });
- }
+ $match{$_}=1 foreach ( amatch( $fuzzy->{$field}, \@fuzzy_mod, @$all ) );
+ next if !keys(%match);
+
+ my $in_matches = 'IN (' .
+ join(',', map { dbh->quote($_) } keys %match) .
+ ')';
+
+ my $extra_sql = $fuzopts{extra_sql};
+ if ($extra_sql =~ /^\s*where /i or keys %{ $fuzopts{hashref} }) {
+ $extra_sql .= ' AND ';
+ } else {
+ $extra_sql .= 'WHERE ';
}
- my %fsaw = ();
- push @cust_main, grep { ! $fsaw{$_->custnum}++ } @fcust;
+ $extra_sql .= "$field $in_matches";
+
+ my $addl_from = $fuzopts{addl_from};
+ if ( $field =~ /^cust_location\./ ) {
+ $addl_from .= ' JOIN cust_location USING (custnum)';
+ } elsif ( $field =~ /^contact\./ ) {
+ $addl_from .= ' JOIN contact USING (custnum)';
+ }
+
+ push @cust_main, qsearch({
+ %fuzopts,
+ 'addl_from' => $addl_from,
+ 'extra_sql' => $extra_sql,
+ });
}
# we want the components of $fuzzy ANDed, not ORed, but still don't want dupes
sub check_and_rebuild_fuzzyfiles {
my $dir = $FS::UID::conf_dir. "/cache.". $FS::UID::datasrc;
- rebuild_fuzzyfiles() if grep { ! -e "$dir/cust_main.$_" } @fuzzyfields;
+ rebuild_fuzzyfiles()
+ if grep { ! -e "$dir/$_" }
+ map {
+ my ($field, $table) = reverse split('\.', $_);
+ $table ||= 'cust_main';
+ "$table.$field"
+ }
+ @fuzzyfields;
}
=item rebuild_fuzzyfiles
foreach my $fuzzy ( @fuzzyfields ) {
- open(LOCK,">>$dir/cust_main.$fuzzy")
- or die "can't open $dir/cust_main.$fuzzy: $!";
- flock(LOCK,LOCK_EX)
- or die "can't lock $dir/cust_main.$fuzzy: $!";
+ my ($field, $table) = reverse split('\.', $fuzzy);
+ $table ||= 'cust_main';
- open (CACHE, '>:encoding(UTF-8)', "$dir/cust_main.$fuzzy.tmp")
- or die "can't open $dir/cust_main.$fuzzy.tmp: $!";
+ open(LOCK,">>$dir/$table.$field")
+ or die "can't open $dir/$table.$field: $!";
+ flock(LOCK,LOCK_EX)
+ or die "can't lock $dir/$table.$field: $!";
- foreach my $field ( $fuzzy, "ship_$fuzzy" ) {
- my $sth = dbh->prepare("SELECT $field FROM cust_main".
- " WHERE $field != '' AND $field IS NOT NULL");
- $sth->execute or die $sth->errstr;
+ open (CACHE, '>:encoding(UTF-8)', "$dir/$table.$field.tmp")
+ or die "can't open $dir/$table.$field.tmp: $!";
- while ( my $row = $sth->fetchrow_arrayref ) {
- print CACHE $row->[0]. "\n";
- }
+ my $sth = dbh->prepare(
+ "SELECT $field FROM $table WHERE $field IS NOT NULL AND $field != ''"
+ );
+ $sth->execute or die $sth->errstr;
- }
+ while ( my $row = $sth->fetchrow_arrayref ) {
+ print CACHE $row->[0]. "\n";
+ }
- close CACHE or die "can't close $dir/cust_main.$fuzzy.tmp: $!";
+ close CACHE or die "can't close $dir/$table.$field.tmp: $!";
- rename "$dir/cust_main.$fuzzy.tmp", "$dir/cust_main.$fuzzy";
+ rename "$dir/$table.$field.tmp", "$dir/$table.$field";
close LOCK;
}
check_and_rebuild_fuzzyfiles();
- use Fcntl qw(:flock);
+ #foreach my $fuzzy (@fuzzyfields) {
+ foreach my $fuzzy ( 'cust_main.first', 'cust_main.last', 'cust_main.company',
+ 'cust_location.address1',
+ 'cust_main.ship_company',
+ ) {
+
+ append_fuzzyfiles_fuzzyfield($fuzzy, shift);
+
+ }
+
+ 1;
+}
+
+=item append_fuzzyfiles_fuzzyfield COLUMN VALUE
+
+=item append_fuzzyfiles_fuzzyfield TABLE.COLUMN VALUE
+
+=cut
+
+use Fcntl qw(:flock);
+sub append_fuzzyfiles_fuzzyfield {
+ my( $fuzzyfield, $value ) = @_;
my $dir = $FS::UID::conf_dir. "/cache.". $FS::UID::datasrc;
- foreach my $field (@fuzzyfields) {
- my $value = shift;
- if ( $value ) {
+ my ($field, $table) = reverse split('\.', $fuzzyfield);
+ $table ||= 'cust_main';
- open(CACHE, '>>:encoding(UTF-8)', "$dir/cust_main.$field" )
- or die "can't open $dir/cust_main.$field: $!";
- flock(CACHE,LOCK_EX)
- or die "can't lock $dir/cust_main.$field: $!";
+ return unless defined($value) && length($value);
- print CACHE "$value\n";
+ open(CACHE, '>>:encoding(UTF-8)', "$dir/$table.$field" )
+ or die "can't open $dir/$table.$field: $!";
+ flock(CACHE,LOCK_EX)
+ or die "can't lock $dir/$table.$field: $!";
- flock(CACHE,LOCK_UN)
- or die "can't unlock $dir/cust_main.$field: $!";
- close CACHE;
- }
+ print CACHE "$value\n";
- }
+ flock(CACHE,LOCK_UN)
+ or die "can't unlock $dir/$table.$field: $!";
+ close CACHE;
- 1;
}
=item all_X
=cut
sub all_X {
- my( $self, $field ) = @_;
+ my( $self, $fuzzy ) = @_;
+ my ($field, $table) = reverse split('\.', $fuzzy);
+ $table ||= 'cust_main';
+
my $dir = $FS::UID::conf_dir. "/cache.". $FS::UID::datasrc;
- open(CACHE, '<:encoding(UTF-8)', "$dir/cust_main.$field")
- or die "can't open $dir/cust_main.$field: $!";
+ open(CACHE, '<:encoding(UTF-8)', "$dir/$table.$field")
+ or die "can't open $dir/$table.$field: $!";
my @array = map { chomp; $_; } <CACHE>;
close CACHE;
\@array;
projects / freeside.git / blobdiff