Commit 41b232d8 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

VRR.pm: Only die when getting invalid arguments, set ->errstr for request errors

parent 4ab8c3cc

bin/efa-m

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ sub display_result { 
	return;

}



if ( my $err = $status->errstr ) {

	say STDERR "Request error: ${err}";

	exit 2;

}



for my $d ( $status->results ) {



	push( @output,

lib/Travel/Status/DE/VRR.pm

+23 −3
Original line number Diff line number Diff line
@@ -59,14 +59,22 @@ sub new { 
		},

	};



	bless( $self, $class );



	$mech->post( 'http://efa.vrr.de/vrr/XSLT_DM_REQUEST', $self->{post} );



	if ( $mech->response->is_error ) {

		confess( $mech->response->status_line );

		$self->{errstr} = $mech->response->status_line;

		return $self;

	}



	my $form = $mech->form_number(1);



	if ( not $form ) {

		$self->{errstr} = 'Unable to find the form - no lines returned?';

		return $self;

	}



	for my $input ( $form->find_input( 'dmLineSelection', 'option' ) ) {

		$input->check();

	}
@@ -74,7 +82,8 @@ sub new { 
	$mech->click('submitButton');



	if ( $mech->response->is_error ) {

		confess( $mech->response->status_line );

		$self->{errstr} = $mech->response->status_line;

		return $self;

	}



	$self->{html} = $mech->response->decoded_content;
@@ -86,7 +95,13 @@ sub new { 
		suppress_warnings => 1,

	);



	return bless( $self, $class );

	return $self;

}



sub errstr {

	my ($self) = @_;



	return $self->{errstr};

}



sub results {
@@ -188,6 +203,11 @@ address / poi / stop name to list departures for. 


=back



=item $status->errstr



In case of an error in the HTTP requests, returns a string describing it.  If

no error occured, returns undef.



=item $status->results



Returns a list of Travel::Status::DE::VRR::Result(3pm) objects, each one describing