";
}
# PG debug messages generated with DEBUG_message();
@@ -264,13 +281,14 @@ sub formatRenderedProblem {
my $debug_messages = $rh_result->{debug_messages};
+ # For debugging purposes (only used in the debug format)
+ my $clientDebug = $self->{inputs_ref}{clientDebug} // "";
+ my $client_debug_data = $clientDebug ? "
Webwork client data
" . WebworkClient::pretty_print($self) : '';
+
# Show the footer unless it is explicity disabled.
my $showFooter = $self->{inputs_ref}{showFooter} // "";
- my $footer = $showFooter && $showFooter eq "no" ? ''
- : "";
-
- # For debugging purposes add $pretty_print_self to the output format in use and uncomment below.
- #my $pretty_print_self = WebworkClient::pretty_print($self);
+ my $footer = $showFooter eq "0" ? ''
+ : "";
# Execute and return the interpolated problem template
my $format_name = $self->{inputs_ref}{outputformat} // 'simple';
@@ -278,16 +296,24 @@ sub formatRenderedProblem {
# The json format
if ($format_name eq "json") {
my $json_output = do("WebworkClient/json_format.pl");
+ for my $key (keys %{$json_output->{hidden_input_field}}) {
+ $json_output->{hidden_input_field}{$key} =~ s/(\$\w+)/$1/gee;
+ }
+
for my $key (keys %$json_output) {
- if (($key =~ /^hidden_input_field/) ||
+ if (
($key =~ /^real_webwork/) ||
($key =~ /^internal/) ||
- ($key =~ /_VI$/)
+ ($key =~ /_A?VI$/)
) {
# Interpolate values
- $json_output->{$key} =~ s/(\$\w+)/$1/gee;
- if ($key =~ /_VI$/) {
- my $new_key = $key =~ s/_VI$//gr;
+ if ($key =~ /_AVI$/) {
+ map { s/(\$\w+)/$1/gee } @{$json_output->{$key}};
+ } else {
+ $json_output->{$key} =~ s/(\$\w+)/$1/gee;
+ }
+ if (($key =~ /_A?VI$/)) {
+ my $new_key = $key =~ s/_A?VI$//r;
$json_output->{$new_key} = $json_output->{$key};
delete $json_output->{$key};
}
diff --git a/lib/WebworkClient/debug_format.pl b/lib/WebworkClient/debug_format.pl
index 45ac8a5816..6a8cc5b08d 100644
--- a/lib/WebworkClient/debug_format.pl
+++ b/lib/WebworkClient/debug_format.pl
@@ -1,18 +1,107 @@
-$debug_format =
-q{
+$debug_format = <<'ENDPROBLEMTEMPLATE';
+
+
+
+
+
+
-
-
-
-
- $SITE_URL WeBWorK using host: $SITE_URL, course: $courseID format: debug
-
-
-
-
WeBWorK using host: $SITE_URL, course: $courseID format: debug