X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=contacts-n9k2mutt;h=493d0d3d0cd7677651f23ae37a2c59b045defcee;hp=80636928bfc52ad7e1639deda8ac76a4156ff3db;hb=eafa2867cd90945b429ab07e3d844377a580ce97;hpb=0a5d1d37f2edaa846e2c02e926006a249dad4ac8 diff --git a/contacts-n9k2mutt b/contacts-n9k2mutt index 8063692..493d0d3 100755 --- a/contacts-n9k2mutt +++ b/contacts-n9k2mutt @@ -8,7 +8,7 @@ use strict; use warnings; require Getopt::Long; -require PrecislovaniLace::Contacts; +require Contacts; require Mail::Address; @@ -40,17 +40,21 @@ while (<>) { my($name,$mail,$attr,$iscompany)=map(($data->{$_}),qw(name mail attr iscompany)); $name=~s/,.*$//s; my @nicks=(); - push @nicks,$1 while $name=~s/"([^"]*)"//s; + my $name_force; + while ($name=~s/"([^"]*)"([!])?//s) { + push @nicks,$1; + $name_force=$1 if $2; + } $name=~s/\s*$//s; $name=~s/^(\w+)\s+(\w+)$/$2 $1/s if !$iscompany; - push @nicks,$name; + push @nicks,$name if !$name_force; for (@nicks) { $_.=".$attr" if $attr; s/\s+/./gs; } map({ "nick"=>$_, - "obj"=>Mail::Address->new($name,$mail), + "obj"=>Mail::Address->new(($name_force || $name),$mail), },@nicks); } @data); for (@nicked) {