Commit 6377b7bf authored by Cassidy Dingenskirchen's avatar Cassidy Dingenskirchen Committed by derf
Browse files

Journey: remove train number from train type if detected

parent 014cc6bd

bin/dbris-m

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ elsif ( $opt{journey} ) { 
	}



	printf( "%s %s am %s\n\n",

		$trip->train, $trip->train_no, $trip->day->strftime('%d.%m.%Y') );

		$trip->type, $trip->train_no, $trip->day->strftime('%d.%m.%Y') );



	for my $stop ( $trip->route ) {

		if ( $stop == $mark_stop ) {

lib/Travel/Status/DE/DBRIS/Journey.pm

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,14 @@ sub new { 
		( $ref->{type}, $ref->{number} ) = split( qr{\s+}, $ref->{train} );

	}



	# For some trains, the train type also contains the train number like "MEX19161"

	# If we can detect this, remove the number from the train type

	if ( $ref->{train_no} and $ref->{type}

		and $ref->{type} =~ qr{ (?<actualtype> [^\d]+ ) $ref->{train_no} $ }x )

	{

		$ref->{type} = $+{actualtype};

	}



	# The line number seems to be encoded in the trip ID

	if ( not defined $ref->{number}

		and $opt{id} =~ m{ [#] ZE [#] (?<line> [^#]+ ) [#] ZB [#] }x )