Mirrors/travelynx
2
0
Fork 0
mirror of https://github.com/derf/travelynx synced 2024-11-10 06:54:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

HAFAS: Distinguish between disguised HTTP 404 and invalid XML

Browse source
This commit is contained in:
Daniel Friesel 2020-11-06 11:23:22 +01:00
parent c70280a935
commit 5e96745121
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/Travelynx/Helper/HAFAS.pm
View file

@ -197,10 +197,20 @@ sub get_xml_p {
$body
=~ s{<Attribute([^>]+)text="([^"]*)"([^"=]*)""}{<Attribute$1text="$2&#042;$3&#042;"}s;
eval { $tree = XML::LibXML->load_xml( string => $body ) };
if ($@) {
$self->{log}->info("load_xml($url): $@");
if ( my $err = $@ ) {
if ( $err =~ m{extra content at the end}i ) {
# We requested XML, but received an HTML error page
# (which was returned with HTTP 200 OK).
$self->{log}->debug("load_xml($url): $err");
}
else {
# There is invalid XML which we might be able to fix via
# regular expressions, so dump it into the production log.
$self->{log}->info("load_xml($url): $err");
}
$cache->freeze( $url, $traininfo );
$promise->resolve($traininfo);
$promise->reject("hafas->get_xml_p($url): $err");
return;
}