[LON-CAPA-cvs] cvs: loncom /homework hint.pm response.pm

[www]

www		Mon Dec 18 16:37:49 2006 EDT

  Modified files:              
    /loncom/homework	hint.pm response.pm 
  Log:
  <customhint>
  
  
Index: loncom/homework/hint.pm
diff -u loncom/homework/hint.pm:1.63 loncom/homework/hint.pm:1.64
--- loncom/homework/hint.pm:1.63	Mon Dec 18 16:12:51 2006
+++ loncom/homework/hint.pm	Mon Dec 18 16:37:47 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # implements the tags that control the hints
 #
-# $Id: hint.pm,v 1.63 2006/12/18 21:12:51 www Exp $
+# $Id: hint.pm,v 1.64 2006/12/18 21:37:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,7 +36,7 @@
 use Apache::lonlocal;
 
 BEGIN {
-    &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint'));
+    &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint','customhint'));
 }
 
 
@@ -282,6 +282,68 @@
     return $result;
 }
 
+sub start_customhint {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    #do everything in end, so intervening <responseparams> and <answer> work
+    &Apache::response::start_hintresponse($parstack,$safeeval);
+    &Apache::lonxml::register('Apache::response',('answer'));
+    my $result;
+    if ($target eq 'edit') {
+        $result.=&Apache::edit::tag_start($target,$token);
+        $result.=&Apache::edit::text_arg('Name:','name',$token);
+        $result.=&Apache::edit::end_row();
+        $result.=&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+        my $constructtag;
+        $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                  $safeeval,'name');
+        $result  = &Apache::edit::rebuild_tag($token);
+        $result .= &Apache::edit::handle_insert();
+    } elsif ($target eq 'web') {
+        &Apache::response::reset_params();
+    }
+    return $result;
+}
+
+sub end_customhint {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
+    if ($target eq 'web') {
+        if (!$Apache::lonxml::default_homework_loaded) {
+            &Apache::lonxml::default_homework_load($safeeval);
+        }
+	my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+        &Apache::response::setup_params('customhint',$safeeval);
+        my $partid=$Apache::inputtags::part;
+        my $submitid=$Apache::inputtags::response[-1];
+        my $response = $Apache::lonhomework::history{
+                            "resource.$partid.$submitid.submission"};
+        my $award;	
+	if ( $response =~ /[^\s]/ && 
+	     $Apache::response::custom_answer_type[-1] eq 'loncapa/perl') {
+	    if (!$Apache::lonxml::default_homework_loaded) {
+		&Apache::lonxml::default_homework_load($safeeval);
+	    }
+	    ${$safeeval->varglob('LONCAPA::customresponse_submission')}=
+		$response;
+	    
+	    $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval);
+	}
+        if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS') {
+            push (@Apache::hint::which,$name);
+        }
+        $result='';
+    } elsif ($target eq 'meta') {
+        $result=&Apache::response::meta_package_write($token->[1]);
+    } elsif ($target eq 'edit') {
+        $result.=&Apache::edit::end_row().&Apache::edit::end_table();
+    }
+    pop(@Apache::response::custom_answer);
+    pop(@Apache::response::custom_answer_type);
+    &Apache::response::end_hintresponse();
+    return $result;
+}
+
 sub start_stringhint {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     #do everything in end, so intervening <responseparams> work
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.157 loncom/homework/response.pm:1.158
--- loncom/homework/response.pm:1.157	Mon Dec 18 16:12:51 2006
+++ loncom/homework/response.pm	Mon Dec 18 16:37:47 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.157 2006/12/18 21:12:51 www Exp $
+# $Id: response.pm,v 1.158 2006/12/18 21:37:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -409,7 +409,7 @@
 	    &Apache::response::submitted('scantron')) {
 	    &Apache::response::scored_response($part,$id);
 	} elsif ( $response =~ /[^\s]/ && 
-		  $Apache::response::custom_answer_type eq 'loncapa/perl') {
+		  $Apache::response::custom_answer_type[-1] eq 'loncapa/perl') {
 	    if (!$Apache::lonxml::default_homework_loaded) {
 		&Apache::lonxml::default_homework_load($safeeval);
 	    }
@@ -575,7 +575,7 @@
     if ($target eq "edit" ) {
 	$result=&Apache::edit::tag_start($target,$token,'Answer algorithm');
 	$result.=&Apache::edit::editfield($token->[1],
-					  $Apache::response::custom_answer,
+					  $Apache::response::custom_answer[-1],
 					  '',80,4);
     } elsif ( $target eq "modified" ) {
 	$result=$token->[4].&Apache::edit::modifiedfield('/answer',$parser);