Commit dfd50dae authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Result: Report real time by default 

Scheduled time is now available via sched_* accessors
parent 8745b66e

bin/hafas-m

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ for my $d ( $status->results() ) { 
	push(

		@output,

		[

			$d->time,

			$d->sched_time,

			$d->is_cancelled

			? 'CANCELED'

			: ( $d->delay ? sprintf( '%+d', $d->delay ) : q{} ),

lib/Travel/Status/DE/HAFAS.pm

+12 −12
Original line number Diff line number Diff line
@@ -348,13 +348,13 @@ sub results { 
		push(

			@{ $self->{results} },

			Travel::Status::DE::HAFAS::Result->new(

				date         => $date,

				datetime     => $datetime,

				sched_date     => $date,

				sched_datetime => $datetime,

				datetime_now   => $self->{datetime_now},

				raw_delay      => $delay,

				raw_e_delay    => $e_delay,

				messages       => \@messages,

				time         => $time,

				sched_time     => $time,

				train          => $train,

				route_end      => $dest,

				platform       => $platform,

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

+17 −2
Original line number Diff line number Diff line
@@ -11,14 +11,29 @@ use parent 'Class::Accessor'; 
our $VERSION = '2.05';



Travel::Status::DE::HAFAS::Result->mk_ro_accessors(

	qw(date datetime info raw_e_delay raw_delay time train route_end));

	qw(sched_date date sched_datetime datetime info raw_e_delay raw_delay

	  sched_time time train route_end)

);



sub new {

	my ( $obj, %conf ) = @_;



	my $ref = \%conf;

	bless( $ref, $obj );



	if ( my $delay = $ref->delay ) {

		$ref->{datetime}

		  = $ref->{sched_datetime}->clone->add( minutes => $delay );

		$ref->{date} = $ref->{datetime}->strftime('%d.%m.%Y');

		$ref->{time} = $ref->{datetime}->strftime('%H:%M');

	}

	else {

		$ref->{datetime} = $ref->{sched_datetime};

		$ref->{date}     = $ref->{sched_date};

		$ref->{time}     = $ref->{sched_time};

	}



	return bless( $ref, $obj );

	return $ref;

}



sub countdown {