Commit 4e906718 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

do not store station node in $self, the eva attribute suffices

parent c9070a5b

lib/Travel/Status/DE/IRIS.pm

+16 −12
Original line number Original line Diff line number Diff line
@@ -46,28 +46,31 @@ sub new { 
	my $res_st = $ua->get( $self->{iris_base} . '/station/' . $opt{station} );

	my $res_st = $ua->get( $self->{iris_base} . '/station/' . $opt{station} );





	if ( $res_st->is_error ) {

	if ( $res_st->is_error ) {

		$self->{errstr} = 'Failed to fetch station data: '

		$self->{errstr}

		  . $res_st->status_line;

		  = 'Failed to fetch station data: ' . $res_st->status_line;

		return $self;

		return $self;

	}

	}





	my $xml_st = XML::LibXML->load_xml( string => $res_st->decoded_content );

	my $xml_st = XML::LibXML->load_xml( string => $res_st->decoded_content );





	$self->{nodes}{station} = ( $xml_st->findnodes('//station') )[0];

	my $station_node = ( $xml_st->findnodes('//station') )[0];



	# TODO parse 'meta' and maybe 'p' flags

	# TODO parse 'meta' and maybe 'p' flags

	# They're optional pointers to related platforms. For instance

	# They're optional pointers to related platforms. For instance

	# Berlin Hbf/BL -> Berlin HBf (tief), Berlin Hbf (S), ...

	# Berlin Hbf/BL -> Berlin HBf (tief), Berlin Hbf (S), ...





	if ( not $self->{nodes}{station} ) {

	if ( not $station_node ) {

		$self->{errstr}

		$self->{errstr}

		  = "The station '$opt{station}' has no associated timetable";

		  = "The station '$opt{station}' has no associated timetable";

		return $self;

		return $self;

	}

	}





	$self->{station}      = $opt{station};

	$self->{station_code} = $station_node->getAttribute('eva');



	my $dt_req = $self->{datetime}->clone;

	my $dt_req = $self->{datetime}->clone;

	for ( 1 .. 3 ) {

	for ( 1 .. 3 ) {

		$self->get_timetable( $self->{nodes}{station}->getAttribute('eva'),

		$self->get_timetable( $self->{station_code}, $dt_req );

			$dt_req );

		$dt_req->add( hours => 1 );

		$dt_req->add( hours => 1 );

	}

	}
@@ -188,8 +191,8 @@ sub get_timetable { 
	}

	}





	if ( $res->is_error ) {

	if ( $res->is_error ) {

		$self->{warnstr} = 'Failed to fetch a schedule part: '

		$self->{warnstr}

		  . $res->status_line;

		  = 'Failed to fetch a schedule part: ' . $res->status_line;

		return $self;

		return $self;

	}

	}
@@ -208,7 +211,7 @@ sub get_timetable { 
sub get_realtime {

sub get_realtime {

	my ($self) = @_;

	my ($self) = @_;





	my $eva = $self->{nodes}{station}->getAttribute('eva');

	my $eva = $self->{station_code};

	my $res = $self->{user_agent}->get( $self->{iris_base} . "/fchg/${eva}" );

	my $res = $self->{user_agent}->get( $self->{iris_base} . "/fchg/${eva}" );





	if ( $self->{developer_mode} ) {

	if ( $self->{developer_mode} ) {
@@ -216,8 +219,8 @@ sub get_realtime { 
	}

	}





	if ( $res->is_error ) {

	if ( $res->is_error ) {

		$self->{warnstr} = 'Failed to fetch realtime data: '

		$self->{warnstr}

		  . $res->status_line;

		  = 'Failed to fetch realtime data: ' . $res->status_line;

		return $self;

		return $self;

	}

	}
@@ -290,6 +293,7 @@ sub get_realtime { 
				sched_route_pre => $e_ar->getAttribute('ppth'),

				sched_route_pre => $e_ar->getAttribute('ppth'),

				status          => $e_ar->getAttribute('cs'),

				status          => $e_ar->getAttribute('cs'),

				status_since    => $e_ar->getAttribute('clt'),

				status_since    => $e_ar->getAttribute('clt'),



				# TODO ps='a' -> rerouted and normally unscheduled train?

				# TODO ps='a' -> rerouted and normally unscheduled train?

			);

			);

		}

		}