Fix the generated image file endpoint and clean up the PTX static rendering.

Author: drgrice1

conf/pg_config.yml

@@ -51,7 +51,7 @@ directories:
     - $pg_root/macros/parsers
     - $pg_root/macros/ui
     - $pg_root/macros/deprecated
-    - /opt/renderer/private/macros
+    - $render_root/private/macros
 
 URLs:
   # The public URL of the html directory above.

lib/RenderApp/Controller/Render.pm

@@ -2,7 +2,6 @@
 package RenderApp::Controller::Render;
 use Mojo::Base 'Mojolicious::Controller', -async_await;
 
-use Mojo::DOM;
 use Mojo::JSON qw(encode_json decode_json);
 use Crypt::JWT qw(encode_jwt decode_jwt);
 use Time::HiRes qw/time/;
@@ -215,26 +214,14 @@ async sub problem {
 
 async sub render_ptx {
 	my $c = shift;
-	my $p = $c->req->params->to_hash;
+
 	$c->render_later;
-	my $res = await Mojo::IOLoop->subprocess->run_p(sub {
-		my $pg = WeBWorK::PreTeXt::render_ptx($p);
-
-		my $dom = Mojo::DOM->new->xml(1);
-		for my $answer (sort keys %{ $pg->{answers} }) {
-			$dom->append_content($dom->new_tag(
-				$answer, map { $_ => ($pg->{answers}{$answer}{$_} // '') } keys %{ $pg->{answers}{$answer} }
-			));
-		}
-		$dom->wrap_content('<answerhashes></answerhashes>');
-		my $answerXML = $dom->to_string;
-		# <?xml verion=\"1.0\"?>\n
-		return "<webwork>\n$pg->{body}\n$answerXML</webwork>";
-	})->catch(sub {
-		my $err = shift;
-		return "error: $err";
-	});
-	return $c->render(text => "$res");
+	my $res = await WeBWorK::PreTeXt::render_ptx($c->req->params->to_hash);
+
+	return $c->render(text => $res) unless ref($res) eq 'HASH';
+
+	$c->res->headers->content_type('text/xml; charset=utf-8');
+	return $c->render(template => 'RPCRenderFormats/ptx', %$res);
 }
 
 async sub sendAnswerJWT {

lib/WeBWorK/PreTeXt.pm

@@ -1,37 +1,45 @@
 package WeBWorK::PreTeXt;
 use Mojo::Base 'Mojolicious::Controller', -async_await;
 
+use Mojo::DOM;
+use Mojo::IOLoop;
 use Data::Structure::Util qw(unbless);
 
-use warnings;
-use strict;
-
 use lib "$ENV{PG_ROOT}/lib";
 use WeBWorK::PG;
 
 sub render_ptx {
 	my $p      = shift;
 	my $source = $p->{rawProblemSource};
-	my $pg     = WeBWorK::PG->new(
-		showSolutions       => 1,
-		showHints           => 1,
-		processAnswers      => 1,
-		displayMode         => 'PTX',
-		language_subroutine => WeBWorK::PG::Localize::getLoc('en'),
-		problemSeed         => $p->{problemSeed} // 1234,
-		$p->{problemUUID}       ? (problemUUID       => $p->{problemUUID})       : (),
-		$p->{templateDirectory} ? (templateDirectory => $p->{templateDirectory}) : (),
-		$p->{tempDirectory}     ? (tempDirectory     => $p->{tempDirectory})     : (),
-		$p->{sourceFilePath}    ? (sourceFilePath    => $p->{sourceFilePath})    : (),
-		$source                 ? (r_source          => \$source)                : ()
-	);
 
-	my $ret = {
-		body    => $pg->{body_text},
-		answers => unbless($pg->{answers})
-	};
+	return Mojo::IOLoop->subprocess->run_p(sub {
+		my $pg = WeBWorK::PG->new(
+			showSolutions       => 1,
+			showHints           => 1,
+			processAnswers      => 1,
+			displayMode         => 'PTX',
+			language_subroutine => WeBWorK::PG::Localize::getLoc('en'),
+			problemSeed         => $p->{problemSeed} // 1234,
+			$p->{problemUUID}    ? (problemUUID    => $p->{problemUUID})    : (),
+			$p->{sourceFilePath} ? (sourceFilePath => $p->{sourceFilePath}) : (),
+			$source              ? (r_source       => \$source)             : ()
+		);
+
+		my $dom = Mojo::DOM->new->xml(1);
+		for my $answer (sort keys %{ $pg->{answers} }) {
+			$dom->append_content($dom->new_tag(
+				$answer, map { $_ => ($pg->{answers}{$answer}{$_} // '') } keys %{ $pg->{answers}{$answer} }
+			));
+		}
+		$dom->wrap_content('<answerhashes></answerhashes>');
+
+		my $ret = { problemText => $pg->{body_text}, answerhashXML => $dom->to_string };
 
-	$pg->free;
-	return $ret;
+		$pg->free;
+		return $ret;
+	})->catch(sub {
+		my $err = shift;
+		return "error: $err";
+	});
 }
 1;