--- loncom/homework/response.pm	2009/03/16 18:20:22	1.213
+++ loncom/homework/response.pm	2009/05/24 13:08:18	1.216
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.213 2009/03/16 18:20:22 bisitz Exp $
+# $Id: response.pm,v 1.216 2009/05/24 13:08:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,6 +54,7 @@ use strict;
 use Apache::lonlocal;
 use Apache::lonnet;
 use Apache::lonmaxima();
+use Apache::lonr();
 
 BEGIN {
     &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse','mathresponse'));
@@ -438,7 +439,7 @@ sub end_customresponse {
 	    ${$safeeval->varglob('LONCAPA::customresponse_submission')}=
 		$response;
 	    
-	    my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval);
+	    my ($award,$score) = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval);
 	    if (!&Apache::inputtags::valid_award($award)) {
 		$error = $award;
 		$award = 'ERROR';
@@ -446,6 +447,9 @@ sub end_customresponse {
 	    &Apache::response::handle_previous(\%previous,$award);
 	    $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
 		$award;
+            if ($award eq 'ASSIGNED_SCORE') {
+                $Apache::lonhomework::results{"resource.$part.$id.awarded"}=1.0*$score;
+            }
 	    if ($error) {
 		$Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=
 		    $error;
@@ -508,7 +512,7 @@ sub start_mathresponse {
 					 'answerdisplay',$token);
 	$result.=&Apache::edit::select_arg('Algebra System:',
 					   'cas',
-					   ['maxima'],
+					   ['maxima','R'],
 					   $token);
 	$result.=&Apache::edit::text_arg('Argument Array:',
 					 'args',$token).
@@ -545,7 +549,7 @@ function edit_${id}_${field} (textarea)
     newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable");
 }
 </script>
-<a href="javascript:edit_${id}_${field}('${field}');void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$button' title='$button'/></a>
+<a href="javascript:edit_${id}_${field}('${field}');void(0);"><img class="stift" src="$iconpath/stift.gif" alt="$button" title="$button" /></a>
 ENDFORMULABUTTON
 }
 
@@ -572,6 +576,12 @@ sub end_mathresponse {
                 $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args,
                                                       &Apache::lonxml::get_param('libraries',$parstack,$safeeval));
             }
+            if ($cas eq 'R') {
+                my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
+                $award=&Apache::lonr::r_run($Apache::response::custom_answer[-1],$response,$args,
+                                            &Apache::lonxml::get_param('libraries',$parstack,$safeeval));
+            }
+
 	    if (!&Apache::inputtags::valid_award($award)) {
 		$error = $award;
 		$award = 'ERROR';