Unverified Commit 3b712427 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Drop default service; warn and fall back to ÖBB in hafas-m

parent 79d3d039

bin/hafas-m

+14 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ if ($list_services) { 
	);

	for my $service ( Travel::Status::DE::HAFAS::get_services() ) {

		if ( $service->{shortname} eq 'DB' ) {



			# HTTP 503 Service Unavailable

			next;

		}
@@ -78,6 +79,18 @@ if ($list_services) { 
	exit 0;

}



if ( not $service ) {

	say STDERR 'Note: You have called hafas-m without specifying a service.';

	say STDERR q{};

	say STDERR 'Unfortunately, the previous default service (DB HAFAS)';

	say STDERR 'is no more, and there is no generic replacement available.';

	say STDERR q{};

	say STDERR 'Please use "hafas-m --list" to list supported services,';

	say STDERR 'and then select one via -s <service>.';

	say STDERR 'Falling back to ÖBB for now.';

	$service = 'ÖBB';

}



if ($use_cache) {

	my $cache_path = ( $ENV{XDG_CACHE_HOME} // "$ENV{HOME}/.cache" )

	  . '/Travel-Status-DE-HAFAS';

lib/Travel/Status/DE/HAFAS.pm

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ sub new { 
	}



	if ( not defined $service ) {

		$service = $conf{service} = 'DB';

		confess("You must specify a service");

	}



	if ( defined $service and not exists $hafas_instance->{$service} ) {