Menu
▾
▴
[WWcvs] webwork2: refactored much ofof the code in renderProblem.pl.
|
From: Mike G. v. a. <we...@ma...> - 2010-06-08 12:40:14
|
Log Message:
-----------
refactored much ofof the code in renderProblem.pl.
This now uses the module webwork2/lib/WebworkClient.pm which
also contains code from renderViaXMLRPC
Modified Files:
--------------
webwork2/clients:
checkProblem.pl
renderProblem.pl
webwork_xmlrpc_inc.pl
Revision Data
-------------
Index: renderProblem.pl
===================================================================
RCS file: /webwork/cvs/system/webwork2/clients/renderProblem.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lclients/renderProblem.pl -Lclients/renderProblem.pl -u -r1.6 -r1.7
--- clients/renderProblem.pl
+++ clients/renderProblem.pl
@@ -34,10 +34,9 @@
use strict;
use warnings;
-package WeBWorK::ContentGenerator::renderViaXMLRPC_client;
-use Crypt::SSLeay; # needed for https
-use XMLRPC::Lite;
-use MIME::Base64 qw( encode_base64 decode_base64);
+use lib '/opt/webwork/webwork2/lib';
+#use Crypt::SSLeay; # needed for https
+use WebworkClient;
##################################################
# configuration section for client
@@ -45,7 +44,10 @@
# configure the local output file and display command !!!!!!!!
use constant TEMPOUTPUTFILE => '/Users/gage/Desktop/renderProblemOutput.html'; # client only
-use constant DISPLAY_COMMAND => 'open -a firefox '; # mac client only opens tempoutputfile above
+#use constant DISPLAY_COMMAND => 'open -a firefox '; # mac client only opens tempoutputfile above
+ use constant DISPLAY_COMMAND => "open -a 'Google Chrome' ";
+
+
# other command lines for opening the html file gnome-open or firefox file.html
# the rest can be configured later to use a different server
@@ -57,30 +59,22 @@
$PROTOCOL = 'http';
$HOSTNAME = 'localhost';
$HOSTPORT = 80;
- $FULL_URL = "$PROTOCOL://$HOSTNAME:$HOSTPORT";
- $FORM_ACTION_URL = "$FULL_URL/webwork2/html2xml";
$XML_PASSWORD = 'xmlwebwork';
$XML_COURSE = 'daemon_course';
} else {
$PROTOCOL = 'https'; # or 'https';
$HOSTNAME = "hosted2.webwork.rochester.edu"; # 'localhost';
$HOSTPORT = 443; #( for secure https) # 80 or 443;
- $FULL_URL = "$PROTOCOL://$HOSTNAME:$HOSTPORT";
- $FORM_ACTION_URL = "$FULL_URL/webwork2/html2xml"; # server parameter
$XML_PASSWORD = 'xmlwebwork';
$XML_COURSE = 'daemon_course';
}
-use constant TRANSPORT_METHOD => 'XMLRPC::Lite';
-use constant REQUEST_CLASS => 'WebworkXMLRPC'; # WebworkXMLRPC is used for soap also!!
-use constant REQUEST_URI => 'mod_xmlrpc';
-
-
+ $FULL_URL = "$PROTOCOL://$HOSTNAME:$HOSTPORT";
-use constant DISPLAYMODE => 'images'; # tex and jsMath are other possibilities.
+use constant DISPLAYMODE => 'images'; # jsMath is another possibilities.
our @COMMANDS = qw( listLibraries renderProblem ); #listLib readFile tex2pdf
@@ -90,20 +84,9 @@
# end configuration section
##################################################
-sub new {
- my $self = {
- output => '',
- encodedSource => '',
- self => '',
- inputs_ref => { AnSwEr0001 => '',
- AnSwEr0002 => '',
- AnSwEr0003 => '',
- },,
- };
- bless $self;
-}
-our $xmlrpc_client = new WeBWorK::ContentGenerator::renderViaXMLRPC_client;
+
+our $xmlrpc_client = new WebworkClient;
##################################################
# input/output section
@@ -116,15 +99,29 @@
undef $/;
$source = <>; #slurp input
-$xmlrpc_client->{encodedSource} = encodeSource($source);
$/ =1;
+$xmlrpc_client->encodeSource($source);
+$xmlrpc_client->url($FULL_URL);
+$xmlrpc_client->{displayMode} = DISPLAYMODE();
+$xmlrpc_client->{user} = 'xmluser';
+$xmlrpc_client->{password} = $XML_PASSWORD;
+$xmlrpc_client->{course} = $XML_COURSE;
+
#xmlrpcCall('renderProblem');
-$xmlrpc_client->xmlrpcCall('renderProblem');
+our $output;
+if ( $xmlrpc_client->xmlrpcCall('renderProblem') ) {
+
+ $output = $xmlrpc_client->formatRenderedProblem;
+} else {
+ $output = $xmlrpc_client->{output}; # error report
+}
+
+
local(*FH);
open(FH, '>'.TEMPOUTPUTFILE) or die "Can't open file ".TEMPOUTPUTFILE()." for writing";
-print FH $xmlrpc_client->{output} ;
+print FH $output;
close(FH);
system(DISPLAY_COMMAND().TEMPOUTPUTFILE());
@@ -134,316 +131,358 @@
##################################################
-our $result;
-
##################################################
-# Utilities --
-# this code is identical between renderProblem.pl and renderViaXMLRPC.pm
+# XMLRPC client --
+# the code below is identical between renderProblem.pl and renderViaXMLRPC.pm????
+# and has been included in WebworkClient.pm
##################################################
-sub xmlrpcCall {
- my $self = shift;
- my $command = shift;
- $command = 'listLibraries' unless $command;
-
- my $requestResult = TRANSPORT_METHOD
- -> proxy($FULL_URL.'/'.REQUEST_URI);
-
- my $input = $self->setInputTable();
- local( $result);
- # use eval to catch errors
- eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command,$input) };
- print STDERR "There were a lot of errors\n" if $@;
- print STDERR "Errors: \n $@\n End Errors\n" if $@;
-
-
-
-
- unless (ref($result) and $result->fault) {
- my $rh_result = $result->result();
- #print STDERR pretty_print_rh($rh_result);
- $self->{output} = $self->formatRenderedProblem($rh_result);
-
- } else {
- $self->{output} = 'Error from server: '. join( ",\n ",
- $result->faultcode,
- $result->faultstring);
- }
-}
-
-sub encodeSource {
- my $source = shift;
- encode_base64($source);
-}
-
-sub pretty_print { # provides html output -- NOT a method
- my $r_input = shift;
- my $level = shift;
- $level = 4 unless defined($level);
- $level--;
- return '' unless $level > 0; # only print three levels of hashes (safety feature)
- my $out = '';
- if ( not ref($r_input) ) {
- $out = $r_input if defined $r_input; # not a reference
- $out =~ s/</</g ; # protect for HTML output
- } elsif ("$r_input" =~/hash/i) { # this will pick up objects whose '$self' is hash and so works better than ref($r_iput).
- local($^W) = 0;
-
- $out .= "$r_input " ."<TABLE border = \"2\" cellpadding = \"3\" BGCOLOR = \"#FFFFFF\">";
-
-
- foreach my $key ( sort ( keys %$r_input )) {
- $out .= "<tr><TD> $key</TD><TD>=></td><td> ".pretty_print($r_input->{$key}) . "</td></tr>";
- }
- $out .="</table>";
- } elsif (ref($r_input) eq 'ARRAY' ) {
- my @array = @$r_input;
- $out .= "( " ;
- while (@array) {
- $out .= pretty_print(shift @array, $level) . " , ";
- }
- $out .= " )";
- } elsif (ref($r_input) eq 'CODE') {
- $out = "$r_input";
- } else {
- $out = $r_input;
- $out =~ s/</</g; # protect for HTML output
- }
-
- return $out." ";
-}
-
-sub setInputTable_for_listLib {
- my $self = shift;
- my $out = {
- pw => $XML_PASSWORD,
- set => 'set0',
- library_name => 'Library',
- command => 'all',
- };
-
- $out;
-}
-sub setInputTable {
- my $self = shift;
- my $out = {
- pw => $XML_PASSWORD,
- library_name => 'Library',
- command => 'renderProblem',
- answer_form_submitted => 1,
- course => $XML_COURSE,
- extra_packages_to_load => [qw( AlgParserWithImplicitExpand Expr
- ExprWithImplicitExpand AnswerEvaluator
- AnswerEvaluatorMaker
- )],
- mode => DISPLAYMODE(),
- modules_to_evaluate => [ qw(
-Exporter
-DynaLoader
-GD
-WWPlot
-Fun
-Circle
-Label
-PGrandom
-Units
-Hermite
-List
-Match
-Multiple
-Select
-AlgParser
-AnswerHash
-Fraction
-VectorField
-Complex1
-Complex
-MatrixReal1 Matrix
-Distributions
-Regression
-
- )],
- envir => $self->environment(),
- problem_state => {
-
- num_of_correct_ans => 0,
- num_of_incorrect_ans => 4,
- recorded_score => 1.0,
- },
- source => $self->{encodedSource}, #base64 encoded
-
-
-
- };
-
- $out;
-}
-
-sub environment {
- my $self = shift;
- my $envir = {
- answerDate => '4014438528',
- CAPA_Graphics_URL=>"not defined",
- CAPA_GraphicsDirectory =>"not defined",
- CAPA_MCTools=>"not defined",
- CAPA_Tools=>'not defined',
- cgiDirectory=>'Not defined',
- cgiURL => 'Not defined',
- classDirectory=> 'Not defined',
- courseName=>'Not defined',
- courseScriptsDirectory=>'not defined',
- displayMode=>DISPLAYMODE,
- dueDate=> '4014438528',
- effectivePermissionLevel => 10,
- externalGif2EpsPath=>'not defined',
- externalPng2EpsPath=>'not defined',
- externalTTHPath=>'/usr/local/bin/tth',
- fileName=>'set0/prob1a.pg',
- formattedAnswerDate=>'6/19/00',
- formattedDueDate=>'6/19/00',
- formattedOpenDate=>'6/19/00',
- functAbsTolDefault=> 0.0000001,
- functLLimitDefault=>0,
- functMaxConstantOfIntegration=> 1000000000000.0,
- functNumOfPoints=> 5,
- functRelPercentTolDefault=> 0.000001,
- functULimitDefault=>1,
- functVarDefault=> 'x',
- functZeroLevelDefault=> 0.000001,
- functZeroLevelTolDefault=>0.000001,
- htmlDirectory =>'not defined',
- htmlURL =>'not defined',
- inputs_ref => $self->{inputs_ref},
- macroDirectory=>'not defined',
- numAbsTolDefault=>0.0000001,
- numFormatDefault=>'%0.13g',
- numOfAttempts=> 0,
- numRelPercentTolDefault => 0.0001,
- numZeroLevelDefault =>0.000001,
- numZeroLevelTolDefault =>0.000001,
- openDate=> '3014438528',
- permissionLevel =>10,
- PRINT_FILE_NAMES_FOR => [ 'gage'],
- probFileName => 'set0/prob1a.pg',
- problemSeed => 1234,
- problemValue =>1,
- probNum => 13,
- psvn => 54321,
- psvnNumber=> 54321,
- questionNumber => 1,
- scriptDirectory => 'Not defined',
- sectionName => 'Gage',
- sectionNumber => 1,
- sessionKey=> 'Not defined',
- setNumber =>'not defined',
- studentLogin =>'gage',
- studentName => 'Mike Gage',
- tempDirectory => 'not defined',
- templateDirectory=>'not defined',
- tempURL=>'not defined',
- webworkDocsURL => 'not defined',
-
- showHints => 1, # extra options -- usually passed from the input form
- showSolutions => 1,
-
- };
- $envir;
-};
-
-sub formatAnswerRow {
- my $self = shift;
- my $rh_answer = shift;
- my $problemNumber = shift;
- my $answerString = $rh_answer->{original_student_ans}||' ';
- my $correctAnswer = $rh_answer->{correct_ans}||'';
- my $ans_message = $rh_answer->{ans_message}||'';
- my $score = ($rh_answer->{score}) ? 'Correct' : 'Incorrect';
- my $row = qq{
- <tr>
- <td>
- Prob: $problemNumber
- </td>
- <td>
- $answerString
- </td>
- <td>
- $score
- </td>
- <td>
- Correct answer is $correctAnswer
- </td>
- <td>
- <i>$ans_message</i>
- </td>
- </tr>\n
- };
- $row;
-}
-
-sub formatRenderedProblem {
- my $self = shift;
- my $rh_result = shift; # wrap problem in formats
- my $problemText = decode_base64($rh_result->{text});
- my $rh_answers = $rh_result->{answers};
- my $encodedSource = $self->{encodedSource}||'foobar';
- my $warnings = '';
- if ( defined ($rh_result->{WARNINGS}) and $rh_result->{WARNINGS} ){
- $warnings = "<div style=\"background-color:pink\">
- <p >WARNINGS</p><p>".decode_base64($rh_result->{WARNINGS})."</p></div>";
- }
- #warn "keys: ", join(" | ", sort keys %{$rh_result });
- my $debug_messages = $rh_result->{flags}->{DEBUG_messages} || [];
- $debug_messages = join("<br/>\n", @{ $debug_messages } );
- my $internal_debug_messages = $rh_result->{internal_debug_messages} || [];
- $internal_debug_messages = join("<br/>\n", @{ $internal_debug_messages } );
- # collect answers
- my $answerTemplate = q{<hr>ANSWERS <table border="3" align="center">};
- my $problemNumber = 1;
- foreach my $key (sort keys %{$rh_answers}) {
- $answerTemplate .= $self->formatAnswerRow($rh_answers->{$key}, $problemNumber++);
- }
- $answerTemplate .= q{</table> <hr>};
-
-
-
- my $problemTemplate = <<ENDPROBLEMTEMPLATE;
-<html>
-<head>
-<base href="$FULL_URL">
-<title>WeBWorK Editor</title>
-</head>
-<body>
- $answerTemplate
- <form action="$FORM_ACTION_URL" method="post">
- $problemText
- <input type="hidden" name="answersSubmitted" value="1">
- <input type="hidden" name="problemAddress" value="probSource">
- <input type="hidden" name="problemSource" value="$encodedSource">
- <input type="hidden" name="problemSeed" value="1234">
- <input type="hidden" name="pathToProblemFile" value="foobar">
- <p><input type="submit" name="submit" value="submit answers"></p>
- </form>
-<HR>
-<h3> Warning section </h3>
-$warnings
-<h3>
-Debug message section
-</h3>
-$debug_messages
-<h3>
-internal errors
-</h3>
-$internal_debug_messages
-
-</body>
-</html>
-
-ENDPROBLEMTEMPLATE
-
-
-
- $problemTemplate;
-}
-
+# package WeBWorK::ContentGenerator::renderViaXMLRPC_client;
+#
+# use Crypt::SSLeay; # needed for https
+# use XMLRPC::Lite;
+# use MIME::Base64 qw( encode_base64 decode_base64);
+#
+# use constant TRANSPORT_METHOD => 'XMLRPC::Lite';
+# use constant REQUEST_CLASS => 'WebworkXMLRPC'; # WebworkXMLRPC is used for soap also!!
+# use constant REQUEST_URI => 'mod_xmlrpc';
+#
+# sub new {
+# my $self = {
+# output => '',
+# encodedSource => '',
+# url => '',
+# password => '',
+# course => '',
+# displayMode => '',
+# inputs_ref => { AnSwEr0001 => '',
+# AnSwEr0002 => '',
+# AnSwEr0003 => '',
+# },
+# };
+#
+# bless $self;
+# }
+#
+#
+# our $result;
+#
+# ##################################################
+# # Utilities --
+# # this code is identical between renderProblem.pl and renderViaXMLRPC.pm
+# ##################################################
+#
+# sub xmlrpcCall {
+# my $self = shift;
+# my $command = shift;
+# $command = 'listLibraries' unless $command;
+#
+# my $requestResult = TRANSPORT_METHOD
+# -> proxy($self->{url}.'/'.REQUEST_URI);
+#
+# my $input = $self->setInputTable();
+# local( $result);
+# # use eval to catch errors
+# eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command,$input) };
+# if ($@) {
+# print STDERR "There were a lot of errors for $command\n" ;
+# print STDERR "Errors: \n $@\n End Errors\n" ;
+# return 0 #failure
+# }
+#
+# unless (ref($result) and $result->fault) {
+# my $rh_result = $result->result();
+# #print STDERR pretty_print_rh($rh_result);
+# $self->{output} = $rh_result; #$self->formatRenderedProblem($rh_result);
+# return 1; # success
+#
+# } else {
+# $self->{output} = 'Error from server: '. join( ",\n ",
+# $result->faultcode,
+# $result->faultstring);
+# return 0; #failure
+# }
+# }
+#
+# sub encodeSource {
+# my $self = shift;
+# my $source = shift;
+# $self->{encodedSource} =encode_base64($source);
+# }
+# sub url {
+# my $self = shift;
+# my $new_url = shift;
+# $self->{url} = $new_url if defined($new_url) and $new_url =~ /\S/;
+# $self->{url};
+# }
+# sub pretty_print { # provides html output -- NOT a method
+# my $r_input = shift;
+# my $level = shift;
+# $level = 4 unless defined($level);
+# $level--;
+# return '' unless $level > 0; # only print three levels of hashes (safety feature)
+# my $out = '';
+# if ( not ref($r_input) ) {
+# $out = $r_input if defined $r_input; # not a reference
+# $out =~ s/</</g ; # protect for HTML output
+# } elsif ("$r_input" =~/hash/i) { # this will pick up objects whose '$self' is hash and so works better than ref($r_iput).
+# local($^W) = 0;
+#
+# $out .= "$r_input " ."<TABLE border = \"2\" cellpadding = \"3\" BGCOLOR = \"#FFFFFF\">";
+#
+#
+# foreach my $key ( sort ( keys %$r_input )) {
+# $out .= "<tr><TD> $key</TD><TD>=></td><td> ".pretty_print($r_input->{$key}) . "</td></tr>";
+# }
+# $out .="</table>";
+# } elsif (ref($r_input) eq 'ARRAY' ) {
+# my @array = @$r_input;
+# $out .= "( " ;
+# while (@array) {
+# $out .= pretty_print(shift @array, $level) . " , ";
+# }
+# $out .= " )";
+# } elsif (ref($r_input) eq 'CODE') {
+# $out = "$r_input";
+# } else {
+# $out = $r_input;
+# $out =~ s/</</g; # protect for HTML output
+# }
+#
+# return $out." ";
+# }
+#
+# sub setInputTable_for_listLib {
+# my $self = shift;
+# my $out = {
+# pw => $self->{password},
+# set => 'set0',
+# library_name => 'Library',
+# command => 'all',
+# };
+#
+# $out;
+# }
+# sub setInputTable {
+# my $self = shift;
+# my $out = {
+# pw => $self->{password},
+# library_name => 'Library',
+# command => 'renderProblem',
+# answer_form_submitted => 1,
+# course => $self->{course},
+# extra_packages_to_load => [qw( AlgParserWithImplicitExpand Expr
+# ExprWithImplicitExpand AnswerEvaluator
+# AnswerEvaluatorMaker
+# )],
+# mode => $self->{displayMode},
+# modules_to_evaluate => [ qw(
+# Exporter
+# DynaLoader
+# GD
+# WWPlot
+# Fun
+# Circle
+# Label
+# PGrandom
+# Units
+# Hermite
+# List
+# Match
+# Multiple
+# Select
+# AlgParser
+# AnswerHash
+# Fraction
+# VectorField
+# Complex1
+# Complex
+# MatrixReal1 Matrix
+# Distributions
+# Regression
+#
+# )],
+# envir => $self->environment(),
+# problem_state => {
+#
+# num_of_correct_ans => 0,
+# num_of_incorrect_ans => 4,
+# recorded_score => 1.0,
+# },
+# source => $self->{encodedSource}, #base64 encoded
+#
+#
+#
+# };
+#
+# $out;
+# }
+#
+# sub environment {
+# my $self = shift;
+# my $envir = {
+# answerDate => '4014438528',
+# CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
+# CAPA_GraphicsDirectory =>'/ww/webwork/CAPA/CAPA_Graphics/',
+# CAPA_MCTools=>'/ww/webwork/CAPA/CAPA_MCTools/',
+# CAPA_Tools=>'/ww/webwork/CAPA/CAPA_Tools/',
+# cgiDirectory=>'Not defined',
+# cgiURL => 'Not defined',
+# classDirectory=> 'Not defined',
+# courseName=>'Not defined',
+# courseScriptsDirectory=>'not defined',
+# displayMode=>$self->{displayMode},
+# dueDate=> '4014438528',
+# effectivePermissionLevel => 10,
+# externalGif2EpsPath=>'not defined',
+# externalPng2EpsPath=>'not defined',
+# externalTTHPath=>'/usr/local/bin/tth',
+# fileName=>'set0/prob1a.pg',
+# formattedAnswerDate=>'6/19/00',
+# formattedDueDate=>'6/19/00',
+# formattedOpenDate=>'6/19/00',
+# functAbsTolDefault=> 0.0000001,
+# functLLimitDefault=>0,
+# functMaxConstantOfIntegration=> 1000000000000.0,
+# functNumOfPoints=> 5,
+# functRelPercentTolDefault=> 0.000001,
+# functULimitDefault=>1,
+# functVarDefault=> 'x',
+# functZeroLevelDefault=> 0.000001,
+# functZeroLevelTolDefault=>0.000001,
+# htmlDirectory =>'not defined',
+# htmlURL =>'not defined',
+# inputs_ref => $self->{inputs_ref},
+# macroDirectory=>'not defined',
+# numAbsTolDefault=>0.0000001,
+# numFormatDefault=>'%0.13g',
+# numOfAttempts=> 0,
+# numRelPercentTolDefault => 0.0001,
+# numZeroLevelDefault =>0.000001,
+# numZeroLevelTolDefault =>0.000001,
+# openDate=> '3014438528',
+# permissionLevel =>10,
+# PRINT_FILE_NAMES_FOR => [ 'gage'],
+# probFileName => 'set0/prob1a.pg',
+# problemSeed => 1234,
+# problemValue =>1,
+# probNum => 13,
+# psvn => 54321,
+# psvnNumber=> 54321,
+# questionNumber => 1,
+# scriptDirectory => 'Not defined',
+# sectionName => 'Gage',
+# sectionNumber => 1,
+# sessionKey=> 'Not defined',
+# setNumber =>'not defined',
+# studentLogin =>'gage',
+# studentName => 'Mike Gage',
+# tempDirectory => 'not defined',
+# templateDirectory=>'not defined',
+# tempURL=>'not defined',
+# webworkDocsURL => 'not defined',
+#
+# showHints => 1, # extra options -- usually passed from the input form
+# showSolutions => 1,
+#
+# };
+# $envir;
+# };
+#
+# sub formatAnswerRow {
+# my $self = shift;
+# my $rh_answer = shift;
+# my $problemNumber = shift;
+# my $answerString = $rh_answer->{original_student_ans}||' ';
+# my $correctAnswer = $rh_answer->{correct_ans}||'';
+# my $ans_message = $rh_answer->{ans_message}||'';
+# my $score = ($rh_answer->{score}) ? 'Correct' : 'Incorrect';
+# my $row = qq{
+# <tr>
+# <td>
+# Prob: $problemNumber
+# </td>
+# <td>
+# $answerString
+# </td>
+# <td>
+# $score
+# </td>
+# <td>
+# Correct answer is $correctAnswer
+# </td>
+# <td>
+# <i>$ans_message</i>
+# </td>
+# </tr>\n
+# };
+# $row;
+# }
+#
+# sub formatRenderedProblem {
+# my $self = shift;
+# my $rh_result = $self->{output}; # wrap problem in formats
+# my $problemText = decode_base64($rh_result->{text});
+# my $rh_answers = $rh_result->{answers};
+# my $encodedSource = $self->{encodedSource}||'foobar';
+# my $warnings = '';
+# if ( defined ($rh_result->{WARNINGS}) and $rh_result->{WARNINGS} ){
+# $warnings = "<div style=\"background-color:pink\">
+# <p >WARNINGS</p><p>".decode_base64($rh_result->{WARNINGS})."</p></div>";
+# }
+# #warn "keys: ", join(" | ", sort keys %{$rh_result });
+# my $debug_messages = $rh_result->{flags}->{DEBUG_messages} || [];
+# $debug_messages = join("<br/>\n", @{ $debug_messages } );
+# my $internal_debug_messages = $rh_result->{internal_debug_messages} || [];
+# $internal_debug_messages = join("<br/>\n", @{ $internal_debug_messages } );
+# # collect answers
+# my $answerTemplate = q{<hr>ANSWERS <table border="3" align="center">};
+# my $problemNumber = 1;
+# foreach my $key (sort keys %{$rh_answers}) {
+# $answerTemplate .= $self->formatAnswerRow($rh_answers->{$key}, $problemNumber++);
+# }
+# $answerTemplate .= q{</table> <hr>};
+#
+# my $FULL_URL = $self->url;
+# my $FORM_ACTION_URL = "$FULL_URL/webwork2/html2xml";
+# my $problemTemplate = <<ENDPROBLEMTEMPLATE;
+# <html>
+# <head>
+# <base href="$FULL_URL">
+# <title>WeBWorK Editor using host $HOSTNAME</title>
+# </head>
+# <body>
+# $answerTemplate
+# <form action="$FORM_ACTION_URL" method="post">
+# $problemText
+# <input type="hidden" name="answersSubmitted" value="1">
+# <input type="hidden" name="problemAddress" value="probSource">
+# <input type="hidden" name="problemSource" value="$encodedSource">
+# <input type="hidden" name="problemSeed" value="1234">
+# <input type="hidden" name="pathToProblemFile" value="foobar">
+# <p><input type="submit" name="submit" value="submit answers"></p>
+# </form>
+# <HR>
+# <h3> Warning section </h3>
+# $warnings
+# <h3>
+# Debug message section
+# </h3>
+# $debug_messages
+# <h3>
+# internal errors
+# </h3>
+# $internal_debug_messages
+#
+# </body>
+# </html>
+#
+# ENDPROBLEMTEMPLATE
+#
+#
+#
+# $problemTemplate;
+# }
+#
1;
Index: checkProblem.pl
===================================================================
RCS file: /webwork/cvs/system/webwork2/clients/checkProblem.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lclients/checkProblem.pl -Lclients/checkProblem.pl -u -r1.3 -r1.4
--- clients/checkProblem.pl
+++ clients/checkProblem.pl
@@ -13,7 +13,7 @@
=cut
-use constant LOG_FILE => '/Volumes/Riemann/webwork/problemLibraries/bad_problems.txt';
+use constant LOG_FILE => '/Users/gage/Desktop//bad_problems.txt';
use XMLRPC::Lite;
use MIME::Base64 qw( encode_base64 decode_base64);
require "webwork_xmlrpc_inc.pl"; # must be in the same directory
Index: webwork_xmlrpc_inc.pl
===================================================================
RCS file: /webwork/cvs/system/webwork2/clients/webwork_xmlrpc_inc.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lclients/webwork_xmlrpc_inc.pl -Lclients/webwork_xmlrpc_inc.pl -u -r1.3 -r1.4
--- clients/webwork_xmlrpc_inc.pl
+++ clients/webwork_xmlrpc_inc.pl
@@ -1,131 +1,170 @@
#!/usr/bin/perl -w
-=pod
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader$
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+webwork2/clients/WebworkClient.pm
+
+This script will take a file and send it to a WeBWorK daemon webservice
+to have it rendered. The result is split into the basic HTML rendering
+and evaluation of answers and then passed to a browser for printing.
-This script will take a command and an input
-file.
+The formatting allows the browser presentation to be interactive with the
+daemon running the script webwork2/lib/renderViaXMLRPC.pm
-It will list available libraries, list the contents of libraries
-or render the input file.
+Rembember to configure the local output file and display command !!!!!!!!
-All of this is done by contacting the webservice.
+=cut
+use strict;
+use warnings;
-=cut
-use XMLRPC::Lite;
-use MIME::Base64 qw( encode_base64 decode_base64);
-# configuration section
-use constant PROTOCOL => 'http'; # or 'http';
-use constant HOSTURL => 'localhost';
-use constant HOSTPORT => 80;
-use constant TRANSPORT_METHOD => 'XMLRPC::Lite';
-use constant REQUEST_CLASS => 'WebworkXMLRPC'; # WebworkXMLRPC is used for soap also!!
-use constant REQUEST_URI => 'mod_xmlrpc';
-use constant TEMPOUTPUTFILE => '/Users/gage/Desktop/renderProblemOutput.html';
-use constant COURSE => 'daemon2_course';
+our @COMMANDS = qw( listLibraries renderProblem ); #listLib readFile tex2pdf
-# $pg{displayModes} = [
-# "plainText", # display raw TeX for math expressions
-# "formattedText", # format math expressions using TtH
-# "images", # display math expressions as images generated by dvipng
-# "jsMath", # render TeX math expressions on the client side using jsMath
-# "asciimath", # render TeX math expressions on the client side using ASCIIMathML
-# ];
-use constant DISPLAYMODE => 'images'; # tex and jsMath are other possibilities.
+##################################################
+# XMLRPC client --
+# this code is identical between renderProblem.pl and renderViaXMLRPC.pm????
+##################################################
+package WeBWorK::ContentGenerator::WebworkClient;
-my @COMMANDS = qw( listLibraries renderProblem ); #listLib readFile tex2pdf
+use Crypt::SSLeay; # needed for https
+use XMLRPC::Lite;
+use MIME::Base64 qw( encode_base64 decode_base64);
-# end configuration section
+use constant TRANSPORT_METHOD => 'XMLRPC::Lite';
+use constant REQUEST_CLASS => 'WebworkXMLRPC'; # WebworkXMLRPC is used for soap also!!
+use constant REQUEST_URI => 'mod_xmlrpc';
+sub new {
+ my $self = {
+ output => '',
+ encodedSource => '',
+ url => '',
+ password => '',
+ course => '',
+ displayMode => '',
+ inputs_ref => { AnSwEr0001 => '',
+ AnSwEr0002 => '',
+ AnSwEr0003 => '',
+ },
+ };
+ bless $self;
+}
+our $result;
+##################################################
+# Utilities --
+# this code is identical between renderProblem.pl and renderViaXMLRPC.pm
+##################################################
sub xmlrpcCall {
+ my $self = shift;
my $command = shift;
- my $source = shift;
$command = 'listLibraries' unless $command;
my $requestResult = TRANSPORT_METHOD
- #->uri('http://'.HOSTURL.':'.HOSTPORT.'/'.REQUEST_CLASS)
- -> proxy(PROTOCOL.'://'.HOSTURL.':'.HOSTPORT.'/'.REQUEST_URI);
+ -> proxy($self->{url}.'/'.REQUEST_URI);
- my $test = [3,4,5,6];
- my $input = setInputTable($source);
- #print "displayMode=",$input->{envir}->{displayMode},"\n";
+ my $input = $self->setInputTable();
local( $result);
# use eval to catch errors
eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command,$input) };
- print STDERR "There were a lot of errors\n" if $@;
- print "Errors: \n $@\n End Errors\n" if $@;
-
- #print "result is|", ref($result),"|";
+ if ($@) {
+ print STDERR "There were a lot of errors for $command\n" ;
+ print STDERR "Errors: \n $@\n End Errors\n" ;
+ return 0 #failure
+ }
unless (ref($result) and $result->fault) {
- return $result->result(); # returns result hash
+ my $rh_result = $result->result();
+ #print STDERR pretty_print_rh($rh_result);
+ $self->{output} = $rh_result; #$self->formatRenderedProblem($rh_result);
+ return 1; # success
+
} else {
- print 'oops ', join ', ',
+ $self->{output} = 'Error from server: '. join( ",\n ",
$result->faultcode,
- $result->faultstring;
- return 0;
+ $result->faultstring);
+ return 0; #failure
}
}
-sub source {
- encode_base64($source);
+sub encodeSource {
+ my $self = shift;
+ my $source = shift;
+ $self->{encodedSource} =encode_base64($source);
}
-sub pretty_print_rh {
- shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
- my $rh = shift;
- my $indent = shift || 0;
- my $out = "";
- my $type = ref($rh);
-
- if (defined($type) and $type) {
- $out .= " type = $type; ";
- } elsif (! defined($rh )) {
- $out .= " type = UNDEFINED; ";
- }
- return $out." " unless defined($rh);
-
- if ( ref($rh) =~/HASH/ or "$rh" =~/HASH/ ) {
- $out .= "{\n";
- $indent++;
- foreach my $key (sort keys %{$rh}) {
- $out .= " "x$indent."$key => " . pretty_print_rh( $rh->{$key}, $indent ) . "\n";
- }
- $indent--;
- $out .= "\n"." "x$indent."}\n";
-
- } elsif (ref($rh) =~ /ARRAY/ or "$rh" =~/ARRAY/) {
- $out .= " ( ";
- foreach my $elem ( @{$rh} ) {
- $out .= pretty_print_rh($elem, $indent);
-
- }
- $out .= " ) \n";
- } elsif ( ref($rh) =~ /SCALAR/ ) {
- $out .= "scalar reference ". ${$rh};
- } elsif ( ref($rh) =~/Base64/ ) {
- $out .= "base64 reference " .$$rh;
+sub url {
+ my $self = shift;
+ my $new_url = shift;
+ $self->{url} = $new_url if defined($new_url) and $new_url =~ /\S/;
+ $self->{url};
+}
+sub pretty_print { # provides html output -- NOT a method
+ my $r_input = shift;
+ my $level = shift;
+ $level = 4 unless defined($level);
+ $level--;
+ return '' unless $level > 0; # only print three levels of hashes (safety feature)
+ my $out = '';
+ if ( not ref($r_input) ) {
+ $out = $r_input if defined $r_input; # not a reference
+ $out =~ s/</</g ; # protect for HTML output
+ } elsif ("$r_input" =~/hash/i) { # this will pick up objects whose '$self' is hash and so works better than ref($r_iput).
+ local($^W) = 0;
+
+ $out .= "$r_input " ."<TABLE border = \"2\" cellpadding = \"3\" BGCOLOR = \"#FFFFFF\">";
+
+
+ foreach my $key ( sort ( keys %$r_input )) {
+ $out .= "<tr><TD> $key</TD><TD>=></td><td> ".pretty_print($r_input->{$key}) . "</td></tr>";
+ }
+ $out .="</table>";
+ } elsif (ref($r_input) eq 'ARRAY' ) {
+ my @array = @$r_input;
+ $out .= "( " ;
+ while (@array) {
+ $out .= pretty_print(shift @array, $level) . " , ";
+ }
+ $out .= " )";
+ } elsif (ref($r_input) eq 'CODE') {
+ $out = "$r_input";
} else {
- $out .= $rh;
+ $out = $r_input;
+ $out =~ s/</</g; # protect for HTML output
}
return $out." ";
}
sub setInputTable_for_listLib {
- $out = {
- #password => 'geometry',
- pw => 'geometry',
+ my $self = shift;
+ my $out = {
+ pw => $self->{password},
set => 'set0',
library_name => 'Library',
command => 'all',
@@ -134,20 +173,18 @@
$out;
}
sub setInputTable {
- my $source = shift;
- $out = {
- #password => 'geometry',
- pw => 'geometry',
- set => 'set0',
+ my $self = shift;
+ my $out = {
+ pw => $self->{password},
library_name => 'Library',
- command => 'all',
+ command => 'renderProblem',
answer_form_submitted => 1,
- course => COURSE(),
+ course => $self->{course},
extra_packages_to_load => [qw( AlgParserWithImplicitExpand Expr
ExprWithImplicitExpand AnswerEvaluator
AnswerEvaluatorMaker
)],
- mode => DISPLAYMODE(),
+ mode => $self->{displayMode},
modules_to_evaluate => [ qw(
Exporter
DynaLoader
@@ -174,14 +211,14 @@
Regression
)],
- envir => environment(),
+ envir => $self->environment(),
problem_state => {
- num_of_correct_ans => 2,
+ num_of_correct_ans => 0,
num_of_incorrect_ans => 4,
recorded_score => 1.0,
},
- source => source($source), #base64 encoded
+ source => $self->{encodedSource}, #base64 encoded
@@ -191,6 +228,7 @@
}
sub environment {
+ my $self = shift;
my $envir = {
answerDate => '4014438528',
CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
@@ -201,9 +239,10 @@
cgiURL => 'Not defined',
classDirectory=> 'Not defined',
courseName=>'Not defined',
- courseScriptsDirectory=>'/ww/webwork/system/courseScripts/',
- displayMode=>DISPLAYMODE,
+ courseScriptsDirectory=>'not defined',
+ displayMode=>$self->{displayMode},
dueDate=> '4014438528',
+ effectivePermissionLevel => 10,
externalGif2EpsPath=>'not defined',
externalPng2EpsPath=>'not defined',
externalTTHPath=>'/usr/local/bin/tth',
@@ -220,14 +259,10 @@
functVarDefault=> 'x',
functZeroLevelDefault=> 0.000001,
functZeroLevelTolDefault=>0.000001,
- htmlDirectory =>'/ww/webwork/courses/gage_course/html/',
- htmlURL =>'http://webwork-db.math.rochester.edu/gage_course/',
- inputs_ref => {
- AnSwEr1 => '',
- AnSwEr2 => '',
- AnSwEr3 => '',
- },
- macroDirectory=>'/ww/webwork/courses/gage_course/templates/macros/',
+ htmlDirectory =>'not defined',
+ htmlURL =>'not defined',
+ inputs_ref => $self->{inputs_ref},
+ macroDirectory=>'not defined',
numAbsTolDefault=>0.0000001,
numFormatDefault=>'%0.13g',
numOfAttempts=> 0,
@@ -235,6 +270,7 @@
numZeroLevelDefault =>0.000001,
numZeroLevelTolDefault =>0.000001,
openDate=> '3014438528',
+ permissionLevel =>10,
PRINT_FILE_NAMES_FOR => [ 'gage'],
probFileName => 'set0/prob1a.pg',
problemSeed => 1234,
@@ -247,15 +283,115 @@
sectionName => 'Gage',
sectionNumber => 1,
sessionKey=> 'Not defined',
- setNumber =>'MAAtutorial',
+ setNumber =>'not defined',
studentLogin =>'gage',
studentName => 'Mike Gage',
- tempDirectory => '/ww/htdocs/tmp/gage_course/',
- templateDirectory=>'/ww/webwork/courses/gage_course/templates/',
- tempURL=>'http://webwork-db.math.rochester.edu/tmp/gage_course/',
- webworkDocsURL => 'http://webwork.math.rochester.edu/webwork_gage_system_html',
+ tempDirectory => 'not defined',
+ templateDirectory=>'not defined',
+ tempURL=>'not defined',
+ webworkDocsURL => 'not defined',
+
+ showHints => 1, # extra options -- usually passed from the input form
+ showSolutions => 1,
+
};
$envir;
};
-1;
\ No newline at end of file
+sub formatAnswerRow {
+ my $self = shift;
+ my $rh_answer = shift;
+ my $problemNumber = shift;
+ my $answerString = $rh_answer->{original_student_ans}||' ';
+ my $correctAnswer = $rh_answer->{correct_ans}||'';
+ my $ans_message = $rh_answer->{ans_message}||'';
+ my $score = ($rh_answer->{score}) ? 'Correct' : 'Incorrect';
+ my $row = qq{
+ <tr>
+ <td>
+ Prob: $problemNumber
+ </td>
+ <td>
+ $answerString
+ </td>
+ <td>
+ $score
+ </td>
+ <td>
+ Correct answer is $correctAnswer
+ </td>
+ <td>
+ <i>$ans_message</i>
+ </td>
+ </tr>\n
+ };
+ $row;
+}
+
+sub formatRenderedProblem {
+ my $self = shift;
+ my $rh_result = $self->{output}; # wrap problem in formats
+ my $problemText = decode_base64($rh_result->{text});
+ my $rh_answers = $rh_result->{answers};
+ my $encodedSource = $self->{encodedSource}||'foobar';
+ my $warnings = '';
+ if ( defined ($rh_result->{WARNINGS}) and $rh_result->{WARNINGS} ){
+ $warnings = "<div style=\"background-color:pink\">
+ <p >WARNINGS</p><p>".decode_base64($rh_result->{WARNINGS})."</p></div>";
+ }
+ #warn "keys: ", join(" | ", sort keys %{$rh_result });
+ my $debug_messages = $rh_result->{flags}->{DEBUG_messages} || [];
+ $debug_messages = join("<br/>\n", @{ $debug_messages } );
+ my $internal_debug_messages = $rh_result->{internal_debug_messages} || [];
+ $internal_debug_messages = join("<br/>\n", @{ $internal_debug_messages } );
+ # collect answers
+ my $answerTemplate = q{<hr>ANSWERS <table border="3" align="center">};
+ my $problemNumber = 1;
+ foreach my $key (sort keys %{$rh_answers}) {
+ $answerTemplate .= $self->formatAnswerRow($rh_answers->{$key}, $problemNumber++);
+ }
+ $answerTemplate .= q{</table> <hr>};
+
+ my $FULL_URL = $self->url;
+ my $FORM_ACTION_URL = "$FULL_URL/webwork2/html2xml";
+ my $problemTemplate = <<ENDPROBLEMTEMPLATE;
+<html>
+<head>
+<base href="$FULL_URL">
+<title>WeBWorK Editor using host $HOSTNAME</title>
+</head>
+<body>
+ $answerTemplate
+ <form action="$FORM_ACTION_URL" method="post">
+ $problemText
+ <input type="hidden" name="answersSubmitted" value="1">
+ <input type="hidden" name="problemAddress" value="probSource">
+ <input type="hidden" name="problemSource" value="$encodedSource">
+ <input type="hidden" name="problemSeed" value="1234">
+ <input type="hidden" name="pathToProblemFile" value="foobar">
+ <p><input type="submit" name="submit" value="submit answers"></p>
+ </form>
+<HR>
+<h3> Warning section </h3>
+$warnings
+<h3>
+Debug message section
+</h3>
+$debug_messages
+<h3>
+internal errors
+</h3>
+$internal_debug_messages
+
+</body>
+</html>
+
+ENDPROBLEMTEMPLATE
+
+
+
+ $problemTemplate;
+}
+
+
+1;
|
