Unverified Commit 0201467b authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

do not use now-deprecated smartmatch feature

parent 7e6b9de3

bin/efa-m

+14 −18
Original line number Diff line number Diff line
@@ -4,15 +4,13 @@ use warnings; 
use 5.010;

use utf8;



no if $] >= 5.018, warnings => 'experimental::smartmatch';



our $VERSION = '1.21';



binmode( STDOUT, ':encoding(utf-8)' );



use Encode       qw(decode);

use Getopt::Long qw(:config no_ignore_case bundling);

use List::Util qw(first max);

use List::Util   qw(first max none);

use Travel::Status::DE::EFA;



my $efa_url = 'https://efa.vrr.de/vrr/XSLT_DM_REQUEST';
@@ -80,13 +78,11 @@ if ( $input =~ s{ ^ (?<type> address|poi|stop|stopID) : }{}x ) { 
}



for my $efield (@edata_pre) {

	given ($efield) {

		when ('a') { $edata{route_after}  = 1; $full_routes = 1 }

		when ('b') { $edata{route_before} = 1; $full_routes = 1 }

		when ('f') { $edata{fullroute}    = 1; $full_routes = 1 }

		when ('r') { $edata{route}        = 1; $full_routes = 1 }

		default    { $edata{$efield}      = 1 }

	}

	if    ( $efield eq 'a' ) { $edata{route_after}  = 1; $full_routes = 1 }

	elsif ( $efield eq 'b' ) { $edata{route_before} = 1; $full_routes = 1 }

	elsif ( $efield eq 'f' ) { $edata{fullroute}    = 1; $full_routes = 1 }

	elsif ( $efield eq 'r' ) { $edata{route}        = 1; $full_routes = 1 }

	else                     { $edata{$efield}      = 1 }

}

if ($filter_via) {

	$full_routes = 1;
@@ -224,13 +220,13 @@ sub show_lines { 


	for my $l ( $efa->lines ) {



		if (   ( @grep_lines and not( $l->name ~~ \@grep_lines ) )

			or ( @grep_mots and not( $l->mot_name ~~ \@grep_mots ) ) )

		if (   ( @grep_lines and none { $l->name eq $_ } @grep_lines )

			or ( @grep_mots and none { $l->mot_name eq $_ } @grep_mots ) )

		{

			next;

		}



		if ( @grep_mots and not( $l->mot_name ~~ \@grep_mots ) ) {

		if ( @grep_mots and none { $l->mot_name eq $_ } @grep_mots ) {

			next;

		}
@@ -262,10 +258,10 @@ sub show_results { 
		}



		if (

			   ( @grep_lines and not( $d->line ~~ \@grep_lines ) )

			or ( @grep_mots and not( $d->mot_name ~~ \@grep_mots ) )

			   ( @grep_lines and none { $d->line eq $_ } @grep_lines )

			or ( @grep_mots  and none { $d->mot_name eq $_ } @grep_mots )

			or ( @grep_platforms

				and not( $platform ~~ \@grep_platforms ) )

				and none { $platform eq $_ } @grep_platforms )

			or ( $offset and $d->countdown < $offset )

			or ( $filter_via

				and

lib/Travel/Status/DE/EFA.pm

+5 −5
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ use warnings; 
use 5.010;

use utf8;



no if $] >= 5.018, warnings => 'experimental::smartmatch';



our $VERSION = '1.21';



use Carp   qw(confess cluck);
@@ -34,7 +32,9 @@ sub new { 
	if ( not( $opt{name} ) ) {

		confess('You must specify a name');

	}

	if ( $opt{type} and not( $opt{type} ~~ [qw[stop stopID address poi]] ) ) {

	if ( $opt{type}

		and not( $opt{type} =~ m{ ^ (?: stop stopID address poi ) $ }x ) )

	{

		confess('type must be stop, stopID, address, or poi');

	}

lib/Travel/Status/DE/EFA/Result.pm

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ use strict; 
use warnings;

use 5.010;



no if $] >= 5.018, warnings => 'experimental::smartmatch';



use parent 'Class::Accessor';



our $VERSION = '1.21';

lib/Travel/Status/DE/EFA/Stop.pm

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ use strict; 
use warnings;

use 5.010;



no if $] >= 5.018, warnings => 'experimental::smartmatch';



use parent 'Class::Accessor';



our $VERSION = '1.21';

lib/Travel/Status/DE/VRR.pm

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ use strict; 
use warnings;

use 5.010;



no if $] >= 5.018, warnings => "experimental::smartmatch";



our $VERSION = '1.21';



use parent 'Travel::Status::DE::EFA';