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

stationboard: directly render json 

The render_to_string path is only needed for legacy callback requests.
With this change, renderer->compression(0) is no longer required for
non-callback json requests to work.
parent dd114347

lib/DBInfoscreen.pm

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ sub startup { 
	chomp $self->config->{version};



	# Generally, the reverse proxy handles compression.

	# Also, Mojolicious compression breaks JSON endpoints for some clients.

	# Also, Mojolicious compression breaks legacy callback-based JSON endpoints

	# for some clients.

	$self->renderer->compress(0);



	$self->hook(

lib/DBInfoscreen/Controller/Stationboard.pm

+23 −31
Original line number Diff line number Diff line
@@ -77,13 +77,11 @@ sub handle_no_results_json { 
	$self->res->headers->access_control_allow_origin(q{*});

	my $json;

	if ($errstr) {

		$json = $self->render_to_string(

			json => {

		$json = {

			api_version => $api_version,

			version     => $self->config->{version},

			error       => $errstr,

			}

		);

		};

	}

	else {

		my @candidates = map { { code => $_->[0], name => $_->[1] } }
@@ -91,26 +89,23 @@ sub handle_no_results_json { 
		if ( @candidates > 1

			or ( @candidates == 1 and $candidates[0]{code} ne $station ) )

		{

			$json = $self->render_to_string(

				json => {

			$json = {

				api_version => $api_version,

				version     => $self->config->{version},

				error       => 'ambiguous station code/name',

				candidates  => \@candidates,

				}

			);

			};

		}

		else {

			$json = $self->render_to_string(

				json => {

			$json = {

				api_version => $api_version,

				version     => $self->config->{version},

				error       => ( $errstr // "Got no results for '$station'" )

				}

			);

			};

		}

	}

	if ($callback) {

		$json = $self->render_to_string( json => $json );

		$self->render(

			data   => "$callback($json);",

			format => 'json'
@@ -118,8 +113,7 @@ sub handle_no_results_json { 
	}

	else {

		$self->render(

			data   => $json,

			format => 'json'

			json => $json,

		);

	}

	return;
@@ -1386,12 +1380,11 @@ sub handle_result { 


	if ( $template eq 'json' ) {

		$self->res->headers->access_control_allow_origin(q{*});

		my $json = $self->render_to_string(

			json => {

		my $json = {

			departures => \@departures,

			}

		);

		};

		if ($callback) {

			$json = $self->render_to_string( json => $json );

			$self->render(

				data   => "$callback($json);",

				format => 'json'
@@ -1399,8 +1392,7 @@ sub handle_result { 
		}

		else {

			$self->render(

				data   => $json,

				format => 'json'

				json => $json,

			);

		}

	}