X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FHval.pm;h=e0ec630583dd84364c6131575d8bf5a655d816a4;hb=f76f265a851944b5dedcc3be5f3b5224b6ebda89;hp=a93e8c247ea6cce2fd7b85398cb2405ef3dd06fa;hpb=59e7af124580f46bdb2dec21273607599ba1e8f9;p=public-inbox.git

diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index a93e8c24..e0ec6305 100644
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -1,32 +1,33 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 #
 # represents a header value in various forms
 package PublicInbox::Hval;
 use strict;
 use warnings;
-use fields qw(raw);
+use fields qw(raw href);
 use Encode qw(find_encoding);
 use URI::Escape qw(uri_escape_utf8);
+use PublicInbox::MID qw/mid_clean/;
 
 my $enc_ascii = find_encoding('us-ascii');
 
 sub new {
-	my ($class, $raw) = @_;
+	my ($class, $raw, $href) = @_;
 	my $self = fields::new($class);
 
 	# we never care about leading/trailing whitespace
 	$raw =~ s/\A\s*//;
 	$raw =~ s/\s*\z//;
 	$self->{raw} = $raw;
+	$self->{href} = defined $href ? $href : $raw;
 	$self;
 }
 
 sub new_msgid {
-	my ($class, $raw) = @_;
-	$raw =~ s/\A<//;
-	$raw =~ s/>\z//;
-	$class->new($raw);
+	my ($class, $msgid, $no_compress) = @_;
+	$msgid = mid_clean($msgid);
+	$class->new($msgid, $msgid);
 }
 
 sub new_oneline {
@@ -47,12 +48,13 @@ my %xhtml_map = (
 
 sub ascii_html {
 	my ($s) = @_;
+	$s =~ s/\r\n/\n/sg; # fixup bad line endings
 	$s =~ s/([<>&'"])/$xhtml_map{$1}/ge;
 	$enc_ascii->encode($s, Encode::HTMLCREF);
 }
 
 sub as_html { ascii_html($_[0]->{raw}) }
-sub as_href { ascii_html(uri_escape_utf8($_[0]->{raw})) }
+sub as_href { ascii_html(uri_escape_utf8($_[0]->{href})) }
 
 sub raw {
 	if (defined $_[1]) {