--- loncom/homework/hint.pm 2003/04/07 23:02:06 1.38 +++ loncom/homework/hint.pm 2003/04/08 02:21:13 1.39 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # implements the tags that control the hints # -# $Id: hint.pm,v 1.38 2003/04/07 23:02:06 albertel Exp $ +# $Id: hint.pm,v 1.39 2003/04/08 02:21:13 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,151 +33,154 @@ use Apache::lonnet; use capa; BEGIN { - &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint')); + &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint')); } @Apache::hint::which=(); sub start_hintgroup { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $skiptoend='0'; - my $result; - - if ($target eq 'web') { - my $id=$Apache::inputtags::part; - my $numtries=$Apache::lonhomework::history{"resource.$id.tries"}; - if ( $numtries eq '') { $numtries = 0; } - my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries"); - if ( $hinttries eq '') { $hinttries = 1; } - &Apache::lonxml::debug("found :$id:$numtries:$hinttries:"); - if ($Apache::lonhomework::type ne 'exam') { - if ( $numtries < $hinttries ) { - $skiptoend='1'; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $skiptoend='0'; + my $result; + + if ($target eq 'web') { + my $id=$Apache::inputtags::part; + my $numtries=$Apache::lonhomework::history{"resource.$id.tries"}; + if ( $numtries eq '') { $numtries = 0; } + my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries"); + if ( $hinttries eq '') { $hinttries = 1; } + &Apache::lonxml::debug("found :$id:$numtries:$hinttries:"); + if ($Apache::lonhomework::type ne 'exam') { + if ( $numtries < $hinttries ) { + $skiptoend='1'; + } else { + $result='
'; + } } else { - $result='
'; + &Apache::lonxml::startredirection; } - } else { - &Apache::lonxml::startredirection; - } - if ($skiptoend) { - &Apache::lonxml::get_all_text("/hintgroup",$parser); + if ($skiptoend) { + &Apache::lonxml::get_all_text("/hintgroup",$parser); + } + } elsif ($target eq 'tex') { + $result .= '\keephidden{'; } - } elsif ($target eq 'tex') { - $result .= '\keephidden{'; - } - @Apache::hint::which=(); - return $result; + @Apache::hint::which=(); + return $result; } sub end_hintgroup { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; - if ($target eq 'web') { - my $id=$Apache::inputtags::part; - my $numtries=$Apache::lonhomework::history{"resource.$id.tries"}; - if ( $numtries eq '') { $numtries = 0; } - my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries"); - if ( $hinttries eq '') { $hinttries = 1; } - &Apache::lonxml::debug("found :$id:$numtries:$hinttries:"); - if ($Apache::lonhomework::type ne 'exam') { - if ( $numtries >= $hinttries ) { - $result='
'; + if ($target eq 'web') { + my $id=$Apache::inputtags::part; + my $numtries=$Apache::lonhomework::history{"resource.$id.tries"}; + if ( $numtries eq '') { $numtries = 0; } + my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries"); + if ( $hinttries eq '') { $hinttries = 1; } + &Apache::lonxml::debug("found :$id:$numtries:$hinttries:"); + if ($Apache::lonhomework::type ne 'exam') { + if ( $numtries >= $hinttries ) { + $result='
'; + } + } else { + &Apache::lonxml::endredirection; } - } else { - &Apache::lonxml::endredirection; + } elsif ($target eq 'edit') { + $result.=&Apache::edit::end_table(); + } elsif ($target eq 'tex') { + $result .= '}'; } - } elsif ($target eq 'edit') { - $result.=&Apache::edit::end_table(); - } elsif ($target eq 'tex') { - $result .= '}'; - } - @Apache::hint::which=(); - return $result; + @Apache::hint::which=(); + return $result; } sub start_numericalhint { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - #do everything in end, so intervening work - &Apache::response::start_hintresponse($parstack,$safeeval); - my $result; - if ($target eq 'edit') { - $result.=&Apache::edit::tag_start($target,$token); - $result.=&Apache::edit::text_arg('Name:','name',$token); - $result.=&Apache::edit::text_arg('Answer:','answer',$token); - if ($token->[1] eq 'numericalhint') { - $result.=&Apache::edit::text_arg('Unit:','unit',$token,5). - &Apache::loncommon::help_open_topic('Physical_Units'); - $result.=&Apache::edit::text_arg('Format:','format',$token,4). - &Apache::loncommon::help_open_topic('Numerical_Response_Format'); - } elsif ($token->[1] eq 'stringhint') { - $result.=&Apache::edit::select_arg('Type:','type',['cs','ci','mc'],$token); - } elsif ($token->[1] eq 'formulahint') { - $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40); - } - $result.=&Apache::edit::end_row(); - $result.=&Apache::edit::start_spanning_row(); - } elsif ($target eq 'modified') { - my $constructtag; - if ($token->[1] eq 'numericalhint') { - $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, - 'name','answer','unit','format'); - } elsif ($token->[1] eq 'stringhint') { - $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, - 'name','answer','type'); - } elsif ($token->[1] eq 'formulahint') { - $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, - 'name','answer','samples'); - } - if ($constructtag) { - $result = &Apache::edit::rebuild_tag($token); - $result .= &Apache::edit::handle_insert(); + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + #do everything in end, so intervening work + &Apache::response::start_hintresponse($parstack,$safeeval); + my $result; + if ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Name:','name',$token); + $result.=&Apache::edit::text_arg('Answer:','answer',$token); + if ($token->[1] eq 'numericalhint') { + $result.=&Apache::edit::text_arg('Unit:','unit',$token,5). + &Apache::loncommon::help_open_topic('Physical_Units'); + $result.=&Apache::edit::text_arg('Format:','format',$token,4). + &Apache::loncommon::help_open_topic('Numerical_Response_Format'); + } elsif ($token->[1] eq 'stringhint') { + $result.=&Apache::edit::select_arg('Type:','type',['cs','ci','mc'],$token); + } elsif ($token->[1] eq 'formulahint') { + $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40); + } + $result.=&Apache::edit::end_row(); + $result.=&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag; + if ($token->[1] eq 'numericalhint') { + $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'name', + 'answer','unit','format'); + } elsif ($token->[1] eq 'stringhint') { + $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'name','answer', + 'type'); + } elsif ($token->[1] eq 'formulahint') { + $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'name','answer', + 'samples'); + } + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result .= &Apache::edit::handle_insert(); + } + } elsif ($target eq 'web') { + &Apache::response::reset_params(); } - } elsif ($target eq 'web') { - &Apache::response::reset_params(); - } - return $result; + return $result; } sub end_numericalhint { - 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); - } - $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); - my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); - &Apache::response::setup_params('numericalhint'); - my $partid=$Apache::inputtags::part; - my $id=$Apache::inputtags::response['-1']; - #id submissions occured under - my $submitid=$Apache::inputtags::response['-2']; - my $response = $Apache::lonhomework::history{ + 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); + } + $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); + my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); + &Apache::response::setup_params('numericalhint'); + my $partid=$Apache::inputtags::part; + my $id=$Apache::inputtags::response['-1']; + #id submissions occured under + my $submitid=$Apache::inputtags::response['-2']; + my $response = $Apache::lonhomework::history{ "resource.$partid.$submitid.submission"}; - &Apache::lonxml::debug("hintgroup is using $response
\n"); - #build safe space expression - my $expression="&caparesponse_check_list('".$response."','". - $$parstack[$#$parstack]; - #need to get all possible parms - foreach my $key (keys(%Apache::inputtags::params)) { - $expression.= ';my $'. #' - $key.'="'.$Apache::inputtags::params{$key}.'"'; + &Apache::lonxml::debug("hintgroup is using $response
\n"); + #build safe space expression + my $expression="&caparesponse_check_list('".$response."','". + $$parstack[$#$parstack]; + #need to get all possible parms + foreach my $key (keys(%Apache::inputtags::params)) { + $expression.= ';my $'. #' + $key.'="'.$Apache::inputtags::params{$key}.'"'; + } + $expression.="');"; + $result = &Apache::run::run($expression,$safeeval); + &Apache::lonxml::debug("$expression:result:$result:$Apache::lonxml::curdepth"); + my ($awards) = split /:/ , $result; + my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); + if ($ad eq 'EXACT_ANS' || $ad 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_table; } - $expression.="');"; - $result = &Apache::run::run($expression,$safeeval); - &Apache::lonxml::debug("$expression:result:$result:$Apache::lonxml::curdepth"); - my ($awards) = split /:/ , $result; - my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); - if ($ad eq 'EXACT_ANS' || $ad 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_table; - } - &Apache::response::end_hintresponse(); - return $result; + &Apache::response::end_hintresponse(); + return $result; } sub start_stringhint { @@ -198,38 +201,38 @@ sub end_formulahint { # a part shows if it is on, if no specific parts are on, then default shows sub start_hintpart { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $show ='0'; - my $result = ''; - if ($target eq 'web') { - my $on= &Apache::lonxml::get_param('on',$parstack,$safeeval); - &Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which"); - if ( $on eq 'default' && $#Apache::hint::which == '-1') { - $show=1; - } else { - my $which; - foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } } - } - if (!$show) { - &Apache::lonxml::get_all_text("/hintpart",$parser); - } - } elsif ($target eq 'grade') { - &Apache::lonxml::get_all_text("/hintpart",$parser); - } elsif ($target eq 'edit') { - $result.= &Apache::edit::tag_start($target,$token); - $result.= &Apache::edit::text_arg('On:','on',$token); - $result.= &Apache::edit::end_row(); - $result.= &Apache::edit::start_spanning_row(); - } elsif ($target eq 'modified') { - my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, - 'on'); - if ($constructtag) { - $result = &Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::handle_insert(); + my $show ='0'; + my $result = ''; + if ($target eq 'web') { + my $on= &Apache::lonxml::get_param('on',$parstack,$safeeval); + &Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which"); + if ( $on eq 'default' && $#Apache::hint::which == '-1') { + $show=1; + } else { + my $which; + foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } } + } + if (!$show) { + &Apache::lonxml::get_all_text("/hintpart",$parser); + } + } elsif ($target eq 'grade') { + &Apache::lonxml::get_all_text("/hintpart",$parser); + } elsif ($target eq 'edit') { + $result.= &Apache::edit::tag_start($target,$token); + $result.= &Apache::edit::text_arg('On:','on',$token); + $result.= &Apache::edit::end_row(); + $result.= &Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'on'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.=&Apache::edit::handle_insert(); + } } - } - return $result; + return $result; } sub end_hintpart {