commit 2064ca3f06e4f311b5f69d917a36936014957525 from: Omar Polo date: Thu Aug 25 10:40:13 2022 UTC move the mid -> path code to a sub in the package commit - f72f362ad7ad3bed4bc3f7739518805e0a69e6ee commit + 2064ca3f06e4f311b5f69d917a36936014957525 blob - 6c35542dabd230e4576a6787e33e5537c193ab94 blob + d622e78e8616b12ca64ef45ad3f817d1dc4c524c --- GotMArc.pm +++ GotMArc.pm @@ -5,7 +5,7 @@ use v5.32; use Exporter; our @ISA = qw(Exporter); -our @EXPORT_OK = qw($logo san initpage endpage); +our @EXPORT_OK = qw($logo san mid2path initpage endpage); our $logo = <<'EOF'; @@ -23,6 +23,13 @@ sub san { return $str; } +sub mid2path { + my $mid = shift; + $mid =~ s,_,__,g; + $mid =~ s,/,_,g; + return $mid; +} + my $hdr = do { local $/ = undef; open my $fh, "<", "head.html" blob - 7f8162893c8e9c04bfd4be167bf601b14d50ed07 blob + d322f095e407448221436abf5946c2229c6a6801 --- mexp +++ mexp @@ -7,7 +7,7 @@ use warnings; use v5.32; use lib "."; -use GotMArc qw(san $logo initpage endpage); +use GotMArc qw(san $logo mid2path initpage endpage); my $outdir = $ENV{'OUTDIR'}; die 'Set $OUTDIR' unless defined $outdir; @@ -24,8 +24,7 @@ while (<>) { $subj =~ s/\s+/ /g; $subj =~ s/\s+$//; - $mid =~ s,_,__,g; - $mid =~ s,/,_,g; + $mid = mid2path($mid); my $dest = "$outdir/mail/$mid.html"; next if -f $dest; blob - 84e43ccf36d9d91b4c9bfb87d1c4a1df8a266c2b blob + 6fc62ddb1724986614d27ef964f8c5f618ffc35f --- mkindex +++ mkindex @@ -7,7 +7,7 @@ use warnings; use v5.32; use lib "."; -use GotMArc qw($logo san initpage endpage); +use GotMArc qw($logo san mid2path initpage endpage); my $outdir = $ENV{'OUTDIR'}; die 'Set $OUTDIR' unless defined $outdir; @@ -164,8 +164,7 @@ while (<>) { my $level = length($indent) - 1; $level = 10 if $indent =~ m/\.\.\d{2}\.\./; - $mid =~ s,_,__,g; - $mid =~ s,/,_,g; + $mid = mid2path($mid); $subj =~ s/\s+/ /g; $subj =~ s/\s+$//g;