diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2015-09-26 16:08:33 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2015-09-26 16:08:33 +0200 |
| commit | e1e714f3e7b95640ee7b9ac6f20314857fd4c32a (patch) | |
| tree | 212607ba13c08d0806312898bbc1ced26eff6678 | |
| parent | f12b977e9996439d8fc7d5987ca9581b07966a2d (diff) | |
support ALL the HAFAS backends
| -rw-r--r-- | index.pl | 21 | ||||
| -rw-r--r-- | templates/main.html.ep | 5 |
2 files changed, 24 insertions, 2 deletions
@@ -32,6 +32,9 @@ my %default = ( my @efa_services = map { $_->{shortname} } Travel::Status::DE::EFA::get_efa_urls(); +my @hafas_services + = map { $_->{shortname} } Travel::Status::DE::HAFAS::get_services(); + sub log_api_access { my $counter = 1; if ( -r $ENV{VRRFAKEDISPLAY_STATS} ) { @@ -56,6 +59,9 @@ sub get_results { if ( not defined $backend or $backend eq 'vrr' ) { $backend = 'efa.VRR'; } + if ( $backend and $backend eq 'db' ) { + $backend = 'hafas.DB'; + } if ( $backend =~ s{ [.] (.+) $ }{}x ) { $sub_backend = $1; @@ -66,6 +72,12 @@ sub get_results { errstr => "efa sub-backend '$sub_backend' not supported" }; } + if ( $backend eq 'hafas' and not $sub_backend ~~ \@hafas_services ) { + return { + results => [], + errstr => "hafas sub-backend '$sub_backend' not supported" + }; + } } my $sstr = ("${backend} _ ${stop} _ ${city}"); @@ -78,10 +90,11 @@ sub get_results { log_api_access(); } my $status; - if ( $backend eq 'db' ) { + if ( $backend eq 'hafas' ) { $status = Travel::Status::DE::HAFAS->new( station => "${stop}, ${city}", excluded_mots => [qw[ice ic_ec d regio]], + service => $sub_backend, ); } elsif ( $backend eq 'aseag' ) { @@ -519,6 +532,12 @@ helper 'efa_service_list' => sub { return @efa_services; }; +helper 'hafas_service_list' => sub { + my $self = shift; + + return @hafas_services; +}; + get '/_redirect' => sub { my $self = shift; my $city = $self->param('city') // q{}; diff --git a/templates/main.html.ep b/templates/main.html.ep index 13dda0e..589f690 100644 --- a/templates/main.html.ep +++ b/templates/main.html.ep @@ -155,7 +155,10 @@ other German transit networks. % my @efa_backends = map { ["$_ (EFA)" => "efa.$_"] } efa_service_list(); % @efa_backends = map { $_->[1] } sort { $a->[0] cmp $b->[0] } % map { [$_->[0], $_] } @efa_backends; - %= select_field backend => [['EFA / VRR' => 'vrr'], ['DB (HAFAS)' => 'db'], ['ASEAG (URA)' => 'aseag'], @efa_backends] + % my @hafas_backends = map { ["$_ (HAFAS)" => "hafas.$_"] } hafas_service_list(); + % @hafas_backends = map { $_->[1] } sort { $a->[0] cmp $b->[0] } + % map { [$_->[0], $_] } @hafas_backends; + %= select_field backend => [['EFA / VRR' => 'vrr'], ['DB (HAFAS)' => 'db'], ['ASEAG (URA)' => 'aseag'], @efa_backends, @hafas_backends] </div> </div> </div> |