Commit 1574bc0c authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

fix exclude / --exclude bug

parent 663e5f1e

Changelog

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ git HEAD 


    * Route::Part: Add {arrival,departure}_{route,station}maps accessors

    * efa: Add -m, --maps option

    * Fix exclude / --exclude (didn't work at all previously)



Travel::Routing::DE::VRR 2.05 - Mon Mar 03 2014

bin/efa

+4 −0
Original line number Diff line number Diff line
@@ -216,6 +216,10 @@ if ( defined $opt->{'ignore-info'} and length( $opt->{'ignore-info'} ) == 0 ) { 
	$opt->{'ignore-info'} = undef;

}



if ( $opt->{exclude} ) {

	$opt->{exclude} = [ split( /,/, join( ',', @{ $opt->{exclude} } ) ) ];

}



$efa = eval {

	Travel::Routing::DE::EFA->new(

		efa_url => $efa_url,

lib/Travel/Routing/DE/EFA.pm

+9 −5
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ sub exclude { 
		my $ok = 0;

		for my $map_id ( 0 .. $#mapping ) {

			if ( $exclude_type eq $mapping[$map_id] ) {

				$self->{post}->{"inclMOT_${map_id}"} = undef;

				delete $self->{post}->{"inclMOT_${map_id}"};

				$ok = 1;

			}

		}
@@ -432,7 +432,9 @@ sub new_from_xml { 


	my $self = { xml_reply => $opt{xml} };



	$self->{config} = { efa_url => $opt{efa_url}, };

	$self->{config} = {

		efa_url => $opt{efa_url},

	};



	$self->{config}->{efa_url} =~ m{

		(?<netroot> (?<root> [^:]+ : // [^/]+ ) / [^/]+ / )
@@ -459,7 +461,8 @@ sub submit { 


	if ( $response->is_error ) {

		Travel::Routing::DE::EFA::Exception::Net->throw(

			http_response => $response, );

			http_response => $response,

		);

	}



	$self->{xml_reply} = $response->decoded_content;
@@ -638,8 +641,9 @@ sub parse_xml_part { 
sub parse_xml {

	my ($self) = @_;



	my $tree = $self->{tree}

	  = XML::LibXML->load_xml( string => $self->{xml_reply}, );

	my $tree = $self->{tree} = XML::LibXML->load_xml(

		string => $self->{xml_reply},

	);



	#say $tree->toString(2);