X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMID.pm;h=369bb034c8dd9d5c03ce4beb2e35d1c5fc632a9c;hb=9cdeab04ebd95c7f778ba5f258399377b180f2cc;hp=dddde092f2581ea1d54b1749804642dbccf89a48;hpb=906393b801050e303d2ec2a660c85de4a5fa4740;p=public-inbox.git diff --git a/lib/PublicInbox/MID.pm b/lib/PublicInbox/MID.pm index dddde092..369bb034 100644 --- a/lib/PublicInbox/MID.pm +++ b/lib/PublicInbox/MID.pm @@ -6,13 +6,13 @@ package PublicInbox::MID; use strict; use warnings; use base qw/Exporter/; -our @EXPORT_OK = qw(mid_clean id_compress mid2path mid_mime mid_escape MID_ESC +our @EXPORT_OK = qw(mid_clean id_compress mid2path mid_escape MID_ESC mids references mids_for_index $MID_EXTRACT); use URI::Escape qw(uri_escape_utf8); use Digest::SHA qw/sha1_hex/; require PublicInbox::Address; use constant { - MID_MAX => 40, # SHA-1 hex length # TODO: get rid of this + ID_MAX => 40, # SHA-1 hex length for HTML id anchors MAX_MID_SIZE => 244, # max term size (Xapian limitation) - length('Q') }; @@ -32,7 +32,7 @@ sub mid_clean { sub id_compress { my ($id, $force) = @_; - if ($force || $id =~ /[^a-zA-Z0-9_\-]/ || length($id) > MID_MAX) { + if ($force || $id =~ /[^a-zA-Z0-9_\-]/ || length($id) > ID_MAX) { utf8::encode($id); return sha1_hex($id); } @@ -53,9 +53,6 @@ sub mid2path { "$x2/$x38"; } -# Only for v1 code paths: -sub mid_mime ($) { mids($_[0]->header_obj)->[0] } - # only intended for Message-ID and X-Alt-Message-ID sub extract_mids { my @mids; @@ -72,7 +69,7 @@ sub extract_mids { sub mids ($) { my ($hdr) = @_; - my @mids = $hdr->header_raw('Message-Id'); + my @mids = $hdr->header_raw('Message-ID'); uniq_mids(extract_mids(@mids)); } @@ -81,7 +78,7 @@ sub mids ($) { # import and index without relying on HTTP endpoints sub mids_for_index ($) { my ($hdr) = @_; - my @mids = $hdr->header_raw('Message-Id'); + my @mids = $hdr->header_raw('Message-ID'); my @alts = $hdr->header_raw('X-Alt-Message-ID'); uniq_mids(extract_mids(@mids, @alts)); }