git://git.jankratochvil.net
/
PerlMail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of 'PrecislovaniLace' package dependency.
[PerlMail.git]
/
contacts-n9k2mutt
diff --git
a/contacts-n9k2mutt
b/contacts-n9k2mutt
index
8063692
..
493d0d3
100755
(executable)
--- a/
contacts-n9k2mutt
+++ b/
contacts-n9k2mutt
@@
-8,7
+8,7
@@
use strict;
use warnings;
require Getopt::Long;
use warnings;
require Getopt::Long;
-require
PrecislovaniLace::
Contacts;
+require Contacts;
require Mail::Address;
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=();
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;
$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"=>$_,
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) {
},@nicks);
} @data);
for (@nicked) {