openwebwork-cvs

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
handled renaming of the hash keys in PGcore

Modified Files:
--------------
    webwork2/lib/WebworkWebservice:
        RenderProblem.pm

Revision Data
-------------
Index: RenderProblem.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WebworkWebservice/RenderProblem.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -Llib/WebworkWebservice/RenderProblem.pm -Llib/WebworkWebservice/RenderProblem.pm -u -r1.9 -r1.10
--- lib/WebworkWebservice/RenderProblem.pm
+++ lib/WebworkWebservice/RenderProblem.pm
@@ -212,7 +212,7 @@
 	my $problemValue  =  (defined($rh->{envir}->{problemValue}))   ? $rh->{envir}->{problemValue}  : 1 ;
 	my $num_correct   =  $rh->{problem_state}->{num_correct}   || 0 ;
 	my $num_incorrect =  $rh->{problem_state}->{num_incorrect} || 0 ;
-	my $problemAttempted = ($num_correct && $num_incorrect);
+	my $problemAttempted = ($num_correct || $num_incorrect);
 	my $lastAnswer    = '';
 	
 	my $setRecord = $db->getMergedSet($effectiveUserName, $setName);
@@ -291,10 +291,12 @@
 		showSolutions   => $rh->{envir}->{showSolutions},
  		refreshMath2img => $rh->{envir}->{showHints} || $rh->{envir}->{showSolutions},
  		processAnswers  => 1,
+ 		catchWarnings   => 1,
         # methods for supplying the source, 
         r_source        => $r_problem_source, # reference to a source file string.
         # if reference is not defined then the path is obtained 
         # from the problem object.
+        permissionLevel => 10, # $rh->{envir}->{permissionLevel};
 		r_envirOverrides    => $rh, 
 	};
 	
@@ -355,11 +357,13 @@
 		header_text 				=> encode_base64( $pg->{head_text} ),
 		answers 					=> $pg->{answers},
 		errors         				=> $pg->{errors},
-		WARNINGS	   				=> encode_base64($pg->{warnings} ),
+		WARNINGS	   				=> encode_base64( $pg->{warnings} ),
 		problem_result 				=> $pg->{result},
 		problem_state				=> $pg->{state},
-		PG_flag						=> $pg->{flags},
+		flags						=> $pg->{flags},
+		internal_debug_messages     => $pg->{pgcore}->get_internal_debug_messages,
 	};
+	
 	# Filter out bad reference types
 	###################
 	# DEBUGGING CODE
@@ -377,7 +381,7 @@
 	close(DEBUGCODE) if $debugXmlCode;
 	###################
 	
-	$out2->{PG_flag}->{PROBLEM_GRADER_TO_USE} = undef;
+	$out2->{flags}->{PROBLEM_GRADER_TO_USE} = undef;
 	my $endTime = new Benchmark;
 	$out2->{compute_time} = logTimingInfo($beginTime, $endTime);
 	# warn "flags are" , WebworkWebservice::pretty_print_rh($pg->{flags});