Unverified Commit f1ca0ba4 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Switch from DBWagenreihung to DBRIS::Formation

parent db9c1bf2

cpanfile

+3 −3
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ requires 'List::UtilsBy'; 
requires 'LWP::UserAgent';

requires 'LWP::UserAgent';

requires 'LWP::Protocol::https';

requires 'LWP::Protocol::https';

requires 'Mojolicious';

requires 'Mojolicious';

requires 'Travel::Status::DE::DBWagenreihung', '== 0.18';

requires 'Travel::Status::DE::DBRIS::Formation', '>= 0.04';

requires 'Travel::Status::DE::EFA',              '>= 3.06';

requires 'Travel::Status::DE::EFA',              '>= 3.06';

requires 'Travel::Status::DE::HAFAS',            '>= 5.06';

requires 'Travel::Status::DE::HAFAS',            '>= 5.06';

requires 'Travel::Status::DE::IRIS';

requires 'Travel::Status::DE::IRIS';

lib/DBInfoscreen/Controller/Stationboard.pm

+3 −3
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ use List::MoreUtils qw(); 
use Mojo::JSON      qw(decode_json encode_json);

use Mojo::JSON      qw(decode_json encode_json);

use Mojo::Promise;

use Mojo::Promise;

use Mojo::UserAgent;

use Mojo::UserAgent;

use Travel::Status::DE::DBWagenreihung;

use Travel::Status::DE::DBRIS::Formation;

use Travel::Status::DE::EFA;

use Travel::Status::DE::EFA;

use Travel::Status::DE::HAFAS;

use Travel::Status::DE::HAFAS;

use Travel::Status::DE::IRIS;

use Travel::Status::DE::IRIS;
@@ -793,8 +793,8 @@ sub render_train { 
				my ( $wr_json, $wr_param ) = @_;

				my ( $wr_json, $wr_param ) = @_;

				eval {

				eval {

					my $wr

					my $wr

					  = Travel::Status::DE::DBWagenreihung->new(

					  = Travel::Status::DE::DBRIS::Formation->new(

						from_json => $wr_json );

						json => $wr_json );

					$departure->{wr}      = $wr;

					$departure->{wr}      = $wr;

					$departure->{wr_link} = join( '&',

					$departure->{wr_link} = join( '&',

						map { $_ . '=' . $wr_param->{$_} } keys %{$wr_param} );

						map { $_ . '=' . $wr_param->{$_} } keys %{$wr_param} );

lib/DBInfoscreen/Controller/Wagenreihung.pm

+4 −5
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ use Mojo::Util qw(b64_encode b64_decode); 




use utf8;

use utf8;





use Travel::Status::DE::DBWagenreihung;

use Travel::Status::DE::DBRIS::Formation;





sub handle_wagenreihung_error {

sub handle_wagenreihung_error {

	my ( $self, $train, $err ) = @_;

	my ( $self, $train, $err ) = @_;
@@ -43,8 +43,7 @@ sub wagenreihung { 
			my $wr;

			my $wr;

			eval {

			eval {

				$wr

				$wr

				  = Travel::Status::DE::DBWagenreihung->new(

				  = Travel::Status::DE::DBRIS::Formation->new( json => $json );

					from_json => $json );

			};

			};

			if ($@) {

			if ($@) {

				$self->handle_wagenreihung_error( $train, scalar $@ );

				$self->handle_wagenreihung_error( $train, scalar $@ );

templates/about.html.ep

+2 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,8 @@ 
		<strong>v<%= $Travel::Status::DE::HAFAS::VERSION %></strong></li>

		<strong>v<%= $Travel::Status::DE::HAFAS::VERSION %></strong></li>

		<li>Nah- und Regionalverkehr im In- und Ausland: EFA via <a href="https://finalrewind.org/projects/Travel-Status-DE-VRR/">Travel::Status::DE::EFA</a>

		<li>Nah- und Regionalverkehr im In- und Ausland: EFA via <a href="https://finalrewind.org/projects/Travel-Status-DE-VRR/">Travel::Status::DE::EFA</a>

		<strong>v<%= $Travel::Status::DE::EFA::VERSION %></strong></li>

		<strong>v<%= $Travel::Status::DE::EFA::VERSION %></strong></li>

		<li>Wagenreihung im Netz der DB InfraGO: <a href="https://finalrewind.org/projects/Travel-Status-DE-DBWagenreihung/">Travel::Status::DE::DBWagenreihung</a>

		<li>Wagenreihung im Netz der DB InfraGO: <a href="https://finalrewind.org/projects/Travel-Status-DE-DBRIS/">Travel::Status::DE::DBRIS::Formation</a>

		<strong>v<%= $Travel::Status::DE::DBWagenreihung::VERSION %></strong></li>

		<strong>v<%= $Travel::Status::DE::DBRIS::Formation::VERSION %></strong></li>

		</ul>

		</ul>

	</p>

	</p>

	<p>

	<p>

templates/wagenreihung.html.ep

+2 −2
Original line number Original line Diff line number Diff line 
% if (not $wr or $wr->errstr) {

% if (not $wr or $wr_error) {

  <div class="container">

  <div class="container">

    <div class="error">

    <div class="error">

      <strong>Fehler bei der Abfrage der Wagenreihung:</strong>

      <strong>Fehler bei der Abfrage der Wagenreihung:</strong>

      <%= $wr ? $wr->errstr : $wr_error %>

      <%= $wr_error // 'Unbekannter Fehler' %>

    </div>

    </div>

  </div>

  </div>

% }

% }