dougm 02/05/26 16:39:33 Modified: lib/ModPerl FunctionMap.pm Log: improve prefix guessing Revision Changes Path 1.10 +4 -2 modperl-2.0/lib/ModPerl/FunctionMap.pm Index: FunctionMap.pm =================================================================== RCS file: /home/cvs/modperl-2.0/lib/ModPerl/FunctionMap.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- FunctionMap.pm 12 Mar 2002 03:10:49 -0000 1.9 +++ FunctionMap.pm 26 May 2002 23:39:32 -0000 1.10 @@ -67,10 +67,12 @@ $name =~ s/^DEFINE_//; $name =~ s/^mpxs_//i; - (my $guess = lc($entry->{class} || $entry->{module}) . '_') =~ s/::/_/g; + (my $modprefix = ($entry->{class} || $entry->{module}) . '_') =~ s/::/__/g; + (my $guess = lc $modprefix) =~ s/_+/_/g; + $guess =~ s/(apache)_/($1|ap)_{1,2}/; - if ($name =~ s/^($guess).*/$1/i) { + if ($name =~ s/^($guess|$modprefix).*/$1/i) { $prefix = $1; } else {