Develop wwclientsup8

clients/sendXMLRPC.pl

@@ -36,9 +36,6 @@ =head1 DESCRIPTION
 time returns an answer hash which contains the correct answers. The question is
 then resubmitted to the renderer with the correct answers filled in and displayed.  
 
-IMPORTANT: Remember to configure the local output file and display command near the 
-top of this script. !!!!!!!!
-
 IMPORTANT: Create a valid credentials file.
 
 =cut
@@ -63,10 +60,10 @@ =head2 credentials file
     			courseID               => "the name of the webwork course",
                 site_url	           => "url of rendering site
                 site_password          => "site password" # preliminary access to site
-              form_action_url          =>  'http://localhost:80/webwork2/html2xml'; #action url for form
-              WWdisplayMode            =>  'MathJax', # optional 
+                form_action_url        =>  'http://localhost:80/webwork2/html2xml'; #action url for form
+                ww_display_mode        =>  'MathJax', # optional 
                                           # --  'MathJax' and 'images' are the possible values           
-              HTMLdisplayCommand       =>  "open -a 'Google Chrome' "  # optional
+                html_display_command   =>  "open -a 'Google Chrome' "  # optional
                                                       # for Mac: have Chrome read html output file
                                                       # modify this for other platforms or browsers  
     	);
@@ -97,7 +94,7 @@ =head2 Options
 
 =item  -h  
 
-	Prints to the command line the entire object returned by 
+	Prints to STDOUT the entire object returned by 
     the webwork_client xmlrpc request.
     This includes the answer information displayed by -a and -A and much more.
 
@@ -148,7 +145,7 @@ =head2 Options
 	Triggers the printing of the all of the variables available to the PG question. 
     The table appears within the question content. Use in conjunction with -b or -B.
 
-=item		--anshash 
+=item	--anshash 
 
 	Prints the answer hash for each answer in the PG_debug output which appears below
     the question content. Use in conjunction with -b or -B. 
@@ -168,6 +165,9 @@ =head2 Options
 =item	--help
 
        Prints help information. 
+
+=item  --log 
+       Sets path to log file
 
 =back
 =cut
@@ -213,21 +213,18 @@ BEGIN
 ### verbose output when UNIT_TESTS_ON =1;
  our $UNIT_TESTS_ON             = 0;
 
- ### Command line for displaying the temporary file in a browser.
- #use constant  DISPLAY_COMMAND  => 'open -a firefox ';   #browser opens tempoutputfile 
+#Default display commands.
 use constant  HTML_DISPLAY_COMMAND  => "open -a 'Google Chrome' "; # (MacOS command)
-use constant  HASH_DISPLAY_COMMAND => " less ";   # display tempoutputfile with less
+#use constant  HASH_DISPLAY_COMMAND => "";   # display tempoutputfile to STDOUT
 
 ### Path to a temporary file for storing the output of renderProblem.pl
  use constant  TEMPOUTPUTDIR   => "$ENV{WEBWORK_ROOT}/DATA/"; 
  die "You must make the directory ".TEMPOUTPUTDIR().
      " writeable " unless -w TEMPOUTPUTDIR();
  use constant TEMPOUTPUTFILE  => TEMPOUTPUTDIR()."temporary_output.html";
 
-### Path to a temporary file for storing the output of sendXMLRPC.pl
-use constant LOG_FILE => "$ENV{WEBWORK_ROOT}/DATA/bad_problems.txt";
-die "You must first create an output file at ".LOG_FILE().
-     " with permissions 777 " unless -w LOG_FILE();
+### Default path to a temporary file for storing the output of sendXMLRPC.pl
+use constant LOG_FILE => "$ENV{WEBWORK_ROOT}/DATA/xmlrpc_results.log";
 
 ### set display mode
 use constant DISPLAYMODE   => 'MathJax'; 
@@ -258,6 +255,7 @@ BEGIN
 my $print_pg_hash;
 my $print_help_message;
 my $read_list_from_this_file;
+my $path_to_log_file;
 GetOptions(
 	'a' => \$display_ans_output1,
 	'A' => \$display_ans_output2,
@@ -276,11 +274,13 @@ BEGIN
 	'f=s' 			=> \$format,
 	'credentials=s' => \$credentials_path,
 	'help'          => \$print_help_message,
+	'log=s'         => \$path_to_log_file,
 );
 
 
 print_help_message() if $print_help_message;
 
+
 ####################################################
 # get credentials
 ####################################################
@@ -298,9 +298,9 @@ BEGIN
             site_url	        => "url of rendering site",
             site_password       => "site password", # preliminary access to site
             form_action_url     =>  'http://localhost:80/webwork2/html2xml', #action url for form
-            WWdisplayMode       =>  'MathJax', # optional 
+            ww_display_mode       =>  'MathJax', # optional 
                                                # --  'MathJax' and 'images' are the possible values
-            HTMLdisplayCommand  =>  "open -a 'Google Chrome' "  # optional
+            html_display_command  =>  "open -a 'Google Chrome' "  # optional
                                                       # for Mac: have Chrome read html output file
                                                       # modify this for other platforms or browsers
 	);
@@ -340,8 +340,20 @@ BEGIN
 }
 
 #allow credentials to overrride the default displayMode and the browser display
-our $HTML_DISPLAY_COMMAND = $credentials{HTMLdisplayCommand}//HTML_DISPLAY_COMMAND();
-our $DISPLAYMODE          = $credentials{WWdisplayMode}//DISPLAYMODE();
+our $HTML_DISPLAY_COMMAND = $credentials{html_display_command}//HTML_DISPLAY_COMMAND();
+#our $HASH_DISPLAY_COMMAND = $credentials{hashdisplayCommand}//HASH_DISPLAY_COMMAND();
+
+our $DISPLAYMODE          = $credentials{ww_display_mode}//DISPLAYMODE();
+$path_to_log_file         = $path_to_log_file //$credentials{path_to_log_file}//LOG_FILE();  #set log file path.
+
+eval { # attempt to create log file
+	local(*FH);
+	open(FH, '>>',$path_to_log_file) or die "Can't open file $path_to_log_file for writing";
+	close(FH);	
+};
+die "You must first create an output file at $path_to_log_file
+     with permissions 777 " unless -w $path_to_log_file;
+
 ##################################################
 #  END gathering credentials for client
 ##################################################
@@ -584,7 +596,7 @@ sub record_problem_ok1 {
 	}
 
 	local(*FH);
-	open(FH, '>>',LOG_FILE()) or die "Can't open file ".LOG_FILE()." for writing";
+	open(FH, '>>',$path_to_log_file) or die "Can't open file $path_to_log_file for writing";
 	print FH $return_string;
 	close(FH);
 	return $SHORT_RETURN_STRING;
@@ -602,11 +614,11 @@ sub record_problem_ok2 {
 			      $xmlrpc_client->return_object->{answers}->{$ans}->{score};
 			$all_correct =$all_correct && $scores{$ans};
 		}
-	$all_correct = "2" if $some_correct_answers_not_specified;
-	$ALL_CORRECT = ($all_correct == 1)?'All answers correct':'Some answers are incorrect';
+	$all_correct = ".5" if $some_correct_answers_not_specified;
+	$ALL_CORRECT = ($all_correct == 1)?'All answers are correct':'Some answers are incorrect';
 	local(*FH);
-	open(FH, '>>',LOG_FILE()) or die "Can't open file ".LOG_FILE()." for writing";
-	print FH "$all_correct Answers for $file_path are all correct = $all_correct; errors: $error_flag\n";
+	open(FH, '>>',$path_to_log_file) or die "Can't open file $path_to_log_file for writing";
+	print FH "$all_correct $file_path\n"; #  do we need this? compile_errors=$error_flag\n";
 	close(FH);
 	return $ALL_CORRECT;
 }
@@ -717,12 +729,13 @@ sub display_hash_output {   # print the entire hash output to the command line
 	$file_name =~ s/\.\w+$/\.txt/;    # replace extension with html
 	my $output_file = TEMPOUTPUTDIR().$file_name;
 	my $output_text2 = pretty_print_rh($output_text);
-	local(*FH);
-	open(FH, '>', $output_file) or die "Can't open file $output_file writing";
-	print FH $output_text2;
-	close(FH);
-
-	system(HASH_DISPLAY_COMMAND().$output_file."; rm $output_file;");
+	print STDOUT $output_text2;
+# 	local(*FH);
+# 	open(FH, '>', $output_file) or die "Can't open file $output_file writing";
+# 	print FH $output_text2;
+# 	close(FH);
+# 
+# 	system(HASH_DISPLAY_COMMAND().$output_file."; rm $output_file;");
 	#sleep 1; #wait 1 seconds
 	#unlink($output_file);
 }
@@ -736,14 +749,15 @@ sub display_ans_output {  # print the collection of answer hashes to the command
 	$file_name =~ s/\.\w+$/\.txt/;    # replace extension with html
 	my $output_file = TEMPOUTPUTDIR().$file_name;
 	my $output_text = pretty_print_rh($return_object->{answers});
-	local(*FH);
-	open(FH, '>', $output_file) or die "Can't open file $output_file writing";
-	print FH $output_text;
-	close(FH);
-
-	system(HASH_DISPLAY_COMMAND().$output_file."; rm $output_file;");
-	sleep 1; #wait 1 seconds
-	unlink($output_file);
+	print STDOUT $output_text;
+# 	local(*FH);
+# 	open(FH, '>', $output_file) or die "Can't open file $output_file writing";
+# 	print FH $output_text;
+# 	close(FH);
+# 
+# 	system(HASH_DISPLAY_COMMAND().$output_file."; rm $output_file;");
+# 	sleep 1; #wait 1 seconds
+# 	unlink($output_file);
 }
 
 ##################################################
@@ -876,7 +890,7 @@ sub print_help_message {
                 Same as -b but renders the question with the correct answers submitted.
 
     -h
-                Prints to the command line the entire object returned by 
+                Prints to STDOUT the entire object returned by 
                    the webwork_client xmlrpc request.
                    This includes the answer information displayed by -a and -A and much more.
 
@@ -906,6 +920,12 @@ sub print_help_message {
 				Open the source file in an editor. 
 
                 The single letter options can be "bundled" e.g.  -vcCbB
+
+	--list   pg_list
+				Read and process a list of .pg files contained in the file C<pg_list>.  C<pg_list>
+				consists of a sequence of lines each of which contains the full path to a pg
+				file that should be processed. (For example this might be the output from an
+				earlier run of sendXMLRPC using the -c flag. )
 
     --pg
                 Triggers the printing of the all of the variables available to the PG question. 
@@ -925,8 +945,11 @@ sub print_help_message {
     --credentials=s
                 Specifies a file s where the  credential information can be found.
 
-    --help
-               Prints help information.
+	--help
+		   Prints help information. 
+
+	--log 
+		   Sets path to log file
 
 
 EOT

clients/sendxmlrpc_bbedit.pl

@@ -0,0 +1,4 @@
+#!/usr/bin/perl -w
+die "BB_DOC_PATH is not present.  You must first save the document\n" unless defined $ENV{BB_DOC_PATH};
+$command = "/Volumes/WW_test/opt/local/bin/perl /Volumes/WW_test/opt/webwork/webwork2/clients/sendXMLRPC.pl -bB $ENV{BB_DOC_PATH}";
+system($command);

clients/ww_credentials.dist

@@ -2,19 +2,27 @@
 # our @path_list = ("$ENV{HOME}/.ww_credentials", "$ENV{HOME}/ww_session_credentials", 'ww_credentials', 'ww_credentials.dist');
 # Place a credential file containing the following information at one of the locations above.
 
-# 	%credentials = (
-# 			userID          => "my login name for the webwork course",
-# 			course_password        => "my password ",
-# 			courseID        => "the name of the webwork course",
-# 	);
 
-# This will allow you to test renderProblem.pl, checkProblem.pl and similar files
-# hosted2 is not a production site so it may not always be available
-	%credentials = (
-			userID          => "daemon",
-			course_password => "daemon",
-			courseID        => "daemon",
-			site_url        => 'https://hosted2.webwork.rochester.edu/webwork2',
-			site_password   => 'xmlrpc',
-			form_action_url => 'https://hosted2.webwork.rochester.edu/webwork2/html2xml',
-	);
+# %credentials = (
+#         userID          => "daemon",
+#         course_password => "daemon",
+#         courseID        => "daemon_course",
+#         site_url        => 'http://localhost:80',
+#         site_password   => 'xmlrpc',
+#         form_action_url => 'http://localhost:80/webwork2/html2xml',
+#         ww_display_mode   => "images",
+#         html_display_command => "open -a 'Google Chrome' ", # "open -a Safari ", "lynx "
+# #       path_to_log_file =>"",
+# );
+
+%credentials = (
+        userID          => "daemon",
+        course_password => "daemon",
+        courseID        => "daemon_course",
+        site_url        => 'http://localhost:80',
+        site_password   => 'xmlrpc',
+        form_action_url => 'http://localhost:80/webwork2/html2xml',
+        ww_display_mode   => "images",
+        html_display_command => "open -a 'Google Chrome' ", # "open -a Safari ", "lynx "
+#       path_to_log_file =>"",
+);

htdocs/js/apps/LocalStorage/localstorage.js

@@ -30,9 +30,9 @@ var WWLocalStorage = function(givenContainer) {
 	    .each(function(index,input) {
 		if ($(input).attr('type').toUpperCase() == 'RADIO') {
 		    var name = $(input).attr('name');
-		    storedData['inputs'][name] = $('input[name="'+name'"]:checked').val();
-		} else if (!/previous_/.test($(input).attr('name'))) {
-
+		    storedData['inputs'][name] = $('input[name="'+name+'"]:checked').val();
+		} else if (/AnSwEr/.test($(input).attr('name'))) {
+		    
 		    storedData['inputs'][$(input).attr('name')] = $(input).val();
 		}
 	    });
@@ -47,7 +47,7 @@ var WWLocalStorage = function(givenContainer) {
 	    var keys = Object.keys(storedData['inputs']);
 
 	    keys.forEach(function(key) {
-		my input = $(container).find('[name="'+key'"]');
+		var input = $(container).find('[name="'+key+'"]');
 
 		if (input.length > 0 &&
 		    $(input).attr('type').toUpperCase() == 'RADIO') {
@@ -56,13 +56,14 @@ var WWLocalStorage = function(givenContainer) {
 			if ($(this).val() == storedData['inputs'][key]) {
 			    $(this).attr('checked',true);
 			}
+		    });
 
 		} else if (input.length > 0) {
 		    $(input).val(storedData['inputs'][key]);
 		}
 	    });	    
 	}
-	
+
 	if ($('#problem-result-score').length > 0) {
 	    if (!storedData['score'] ||
 		storedData['score'] < $('#problem-result-score').val()) {

htdocs/themes/math4/simple.template

@@ -24,7 +24,7 @@
 ################################################################################
 -->
 
-<link rel="shortcut icon" href="<!--#url type="webwork" name="htdocs"-->/images/favicon.ico"/>
+<link rel="icon" type="x-image/icon" href="<!--#url type="webwork" name="htdocs"-->/images/favicon.ico"/>
 
 <!-- CSS Loads -->
 <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/vendor/bootstrap/css/bootstrap.css"/>
@@ -70,7 +70,7 @@ var tabberOptions = {manualStartup:true};
 <script type="text/javascript" src="<!--#url type="webwork" name="theme"-->/math4-overrides.js"></script>	
 <!--#endif-->
 
-<title>Simple--<!--#path style="text" text=" : " textonly="1"--></title>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
 
 <!--#head-->
 </head>

lib/WeBWorK/ContentGenerator/Problem.pm

@@ -348,9 +348,6 @@ sub templateName {
 	my $self = shift;
 	my $r = $self->r;
 	my $templateName = $r->param('templateName')//'system';
-	unless ($templateName =~/^system$|^gateway$|^simple$/ ) {
-		$templateName = 'system';
-	}
 	$self->{templateName}= $templateName;
 	$templateName;
 }
@@ -1287,7 +1284,6 @@ sub output_checkboxes{
     my $useKnowlsForHints     = $ce->{pg}->{options}->{use_knowls_for_hints};
 	my $useKnowlsForSolutions = $ce->{pg}->{options}->{use_knowls_for_solutions};
 	if ($can{showCorrectAnswers} or $can{showAnsGroupInfo} or 
-	    $can{showHints} or $can{showSolutions} or 
 	    $can{showAnsHashInfo} or $can{showPGInfo} or $can{showResourceInfo} ) {
 		print "Show:   ";
 	}
@@ -1435,7 +1431,7 @@ sub output_checkboxes{
 
 
 	if ($can{showCorrectAnswers} or $can{showAnsGroupInfo} or 
-	    $can{showHints} or $can{showSolutions} or 
+	    $can{showHints} or $can{showSolutions} or # needed to put buttons on newline
 	    $can{showAnsHashInfo} or $can{showPGInfo} or $can{showResourceInfo}) {
 		print CGI::br();
 	}
@@ -2066,7 +2062,6 @@ sub output_email_instructor{
 }
 
 # output_hidden_info subroutine
-
 # outputs the hidden fields required for the form
 
 sub output_hidden_info {