From a750d073f232e4728a7f426e4e77ca82e53059a0 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 21 Jun 2014 12:19:53 +0200 Subject: IRIS backend: proper delay / qos message support --- cgi/index.pl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cgi/index.pl b/cgi/index.pl index 6948855..8558ec3 100644 --- a/cgi/index.pl +++ b/cgi/index.pl @@ -119,14 +119,20 @@ sub handle_request { } my $info; if ( $backend eq 'iris' ) { - $info = join( ' +++ ', $result->info ); + my $delaymsg + = join( ', ', map { $_->[1] } $result->delay_messages ); + my $qosmsg = join( ' +++ ', map { $_->[1] } $result->qos_messages ); if ( $result->is_cancelled ) { - $info = "Fahrt fällt aus: ${info}"; + $info = "Fahrt fällt aus: ${delaymsg}"; } - if ( $result->delay > 0 ) { + elsif ( $result->delay and $result->delay > 0 ) { $info = sprintf( 'Verspätung ca %d Min.%s%s', - $result->delay, $info ? q{: } : q{}, $info ); + $result->delay, $delaymsg ? q{: } : q{}, $delaymsg ); } + if ( $info and $qosmsg ) { + $info .= ' +++ '; + } + $info .= $qosmsg; } else { $info = $result->info; -- cgit v1.2.3