thh/newsstats
1
0
Fork 0
Code Issues 4 Pull requests Packages Projects Releases Activity

Merge branch 'thh-parsedb' into pu

Browse source 
* thh-parsedb:
  Forcibly decode headers with unencoded 8bit chars.
  Add MID to error message to make it more useful.
This commit is contained in:
Thomas Hochstein 2021-05-29 10:21:13 +02:00
parent 84e9923abe b99d41010d
commit a586a217c9
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/parsedb.pl
View file

@ -198,6 +198,11 @@ while (my $HeadersR = $DBQuery->fetchrow_hashref) {
$Headers{$HeaderName.'_parsed'} = decode('MIME-Header',$Headers{$_}) $Headers{$HeaderName.'_parsed'} = decode('MIME-Header',$Headers{$_})
if (exists($LegalEncodings{$Encoding})); if (exists($LegalEncodings{$Encoding}));
} }
# forcibly modify headers with un-encoded 8bit data assuming utf-8
# TODO: try to guess correct enconding
elsif ($Headers{$_} =~ /[^\x00-\x7F]/) {
$Headers{$_} = decode('utf-8',$Headers{$_});
}
# extract name(s) and mail(s) from From: / Sender: / Reply-To: # extract name(s) and mail(s) from From: / Sender: / Reply-To:
# in parsed form, if available # in parsed form, if available
if ($_ ne 'subject') { if ($_ ne 'subject') {
@ -258,9 +263,9 @@ while (my $HeadersR = $DBQuery->fetchrow_hashref) {
split(/ /,'? ' x scalar(@DBFields))) split(/ /,'? ' x scalar(@DBFields)))
)); ));
$DBWrite->execute(@SQLBindVars) $DBWrite->execute(@SQLBindVars)
or &Bleat(2,sprintf("Can't write parsed data for %s to %s.%s: ". or &Bleat(2,sprintf("Can't write parsed data for %s to %s.%s for %s: ".
"$DBI::errstr\n",$Period, "$DBI::errstr\n",$Period,
$Conf{'DBDatabase'},$Conf{'DBTableParse'})); $Conf{'DBDatabase'},$Conf{'DBTableParse'}, $Headers{'mid'}));
$DBWrite->finish; $DBWrite->finish;
} }
}; };