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

rename (sched|current)_info to (regular|current)_notes

parent fddd2d51
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -145,13 +145,13 @@ sub display_connection {
			$c->delay, $c->departure_stime, $c->arrival_stime );
	}

	for my $extra ( $c->sched_info ) {
	for my $extra ( $c->regular_notes ) {
		if ( not( length $ignore_info and $extra =~ /$ignore_info/i ) ) {
			say "# $extra";
		}
	}

	for my $notice ( $c->current_info ) {
	for my $notice ( $c->current_notes ) {
		if ( $notice->{subtitle} ne $notice->{subject} ) {
			printf( "# %s - %s\n", $notice->{subtitle}, $notice->{subject} );
		}
+2 −2
Original line number Diff line number Diff line
@@ -690,9 +690,9 @@ sub parse_xml_part {
			);
		}

		$hash->{sched_info}
		$hash->{regular_notes}
		  = [ map { decode( 'UTF-8', $_->textContent ) } @e_sinfo ];
		$hash->{current_info} = [ map { $self->parse_cur_info($_) } @e_cinfo ];
		$hash->{current_notes} = [ map { $self->parse_cur_info($_) } @e_cinfo ];

		push( @route_parts, $hash );
	}
+7 −7
Original line number Diff line number Diff line
@@ -86,23 +86,23 @@ sub footpath_parts {
sub extra {
	my ($self) = @_;

	return @{ $self->{sched_info} // [] };
	return @{ $self->{regular_notes} // [] };
}

sub sched_info {
sub regular_notes {
	my ($self) = @_;

	if ( $self->{sched_info} ) {
		return @{ $self->{sched_info} };
	if ( $self->{regular_notes} ) {
		return @{ $self->{regular_notes} };
	}
	return;
}

sub current_info {
sub current_notes {
	my ($self) = @_;

	if ( $self->{current_info} ) {
		return @{ $self->{current_info} };
	if ( $self->{current_notes} ) {
		return @{ $self->{current_notes} };
	}
	return;
}