--- loncom/homework/response.pm 2002/11/27 19:25:56 1.68 +++ loncom/homework/response.pm 2003/05/23 19:37:33 1.79 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.68 2002/11/27 19:25:56 albertel Exp $ +# $Id: response.pm,v 1.79 2003/05/23 19:37:33 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,67 +33,76 @@ package Apache::response; use strict; BEGIN { - &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse')); + &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse')); } sub start_response { - my ($parstack,$safeeval)=@_; - my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); - if ($id eq '') { $id = $Apache::lonxml::curdepth; } - if ($#Apache::inputtags::import > -1) { - &Apache::lonxml::debug("Turning :$id: into"); - $id = join('_',@Apache::inputtags::import).'_'.$id; - &Apache::lonxml::debug("New :$id:"); - } - push (@Apache::inputtags::response,$id); - push (@Apache::inputtags::responselist,$id); - @Apache::inputtags::inputlist=(); - return $id; + my ($parstack,$safeeval)=@_; + my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); + if ($id eq '') { $id = $Apache::lonxml::curdepth; } + if ($#Apache::inputtags::import > -1) { + &Apache::lonxml::debug("Turning :$id: into"); + $id = join('_',@Apache::inputtags::import).'_'.$id; + &Apache::lonxml::debug("New :$id:"); + } + push (@Apache::inputtags::response,$id); + push (@Apache::inputtags::responselist,$id); + @Apache::inputtags::inputlist=(); + return $id; } sub end_response { - pop @Apache::inputtags::response; - @Apache::inputtags::inputlist=(); - return ''; + #pop @Apache::inputtags::response; + @Apache::inputtags::inputlist=(); + return ''; } sub start_hintresponse { - my ($parstack,$safeeval)=@_; - my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); - if ($id eq '') { $id = $Apache::lonxml::curdepth; } - push (@Apache::inputtags::response,$id); - push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]); - return $id; + my ($parstack,$safeeval)=@_; + my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); + if ($id eq '') { $id = $Apache::lonxml::curdepth; } + push (@Apache::inputtags::response,$id); + push (@Apache::inputtags::responselist,$id); + push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]); + return $id; } sub end_hintresponse { - pop @Apache::inputtags::response; - %Apache::inputtags::params=@{pop(@Apache::inputtags::paramstack)}; - return ''; + pop @Apache::inputtags::response; + if (defined($Apache::inputtags::paramstack[-1])) { + %Apache::inputtags::params= + @{ pop(@Apache::inputtags::paramstack) }; + } + return ''; } # used by response to set the non-safe space random number generator to something # that is stable and unique based on the part number and response number sub setrandomnumber { - my $rndseed; - if ($ENV{'request.state'} eq "construct") { - $rndseed=$ENV{'form.rndseed'}; - if (!$rndseed) { $rndseed=time; } - } else { - my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); - $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name); - } - &Apache::lonxml::debug("randseed $rndseed"); -# $rndseed=unpack("%32i",$rndseed); - $rndseed=$rndseed - +(&Apache::lonnet::numval($Apache::inputtags::part) << 10); - if (defined($Apache::inputtags::response['-1'])) { - $rndseed=$rndseed - +&Apache::lonnet::numval($Apache::inputtags::response['-1']); - } - &Math::Random::random_set_seed_from_phrase($rndseed); - &Apache::lonxml::debug("randseed $rndseed"); - return ''; + my $rndseed; + if ($ENV{'request.state'} eq "construct") { + $rndseed=$ENV{'form.rndseed'}; + if (!$rndseed) { $rndseed=time; } + } else { + $rndseed=&Apache::lonnet::rndseed(); + } + &Apache::lonxml::debug("randseed $rndseed"); + # $rndseed=unpack("%32i",$rndseed); + my $rndmod=(&Apache::lonnet::numval($Apache::inputtags::part) << 10); + if (defined($Apache::inputtags::response['-1'])) { + $rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]); + } + if ($rndseed =~/,/) { + my ($num1,$num2)=split(/,/,$rndseed); + $num1+=$rndmod; + $num2+=$rndmod; + $rndseed="$num1,$num2"; + } else { + $rndseed+=$rndmod; + } + &Apache::lonnet::setup_random_from_rndseed($rndseed); + &Apache::lonxml::debug("randseed $rndseed"); + return ''; } sub meta_parameter_write { @@ -101,8 +110,8 @@ sub meta_parameter_write { my $partref=$Apache::inputtags::part; my $result=''."\n"; return $result; @@ -128,8 +137,8 @@ sub meta_stores_write { my $partref=$Apache::inputtags::part; my $result = ' skip here @@ -169,157 +178,153 @@ sub mandatory_part_meta { } sub check_for_previous { - my ($curresponse,$partid,$id) = @_; - my %previous; - $previous{'used'} = 0; - foreach my $key (sort(keys(%Apache::lonhomework::history))) { - if ($key =~ /resource\.$partid\.$id\.submission/) { - &Apache::lonxml::debug("Trying $key"); - my $pastresponse=$Apache::lonhomework::history{$key}; - if ($pastresponse eq $curresponse) { - $previous{'used'} = 1; - my $history; - if ( $key =~ /^(\d+):/ ) { - $history=$1; - $previous{'award'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"}; - $previous{'last'}='0'; - push(@{ $previous{'version'} },$history); - } else { - $previous{'award'} = $Apache::lonhomework::history{"resource.$partid.$id.awarddetail"}; - $previous{'last'}='1'; + my ($curresponse,$partid,$id) = @_; + my %previous; + $previous{'used'} = 0; + foreach my $key (sort(keys(%Apache::lonhomework::history))) { + if ($key =~ /resource\.$partid\.$id\.submission/) { + &Apache::lonxml::debug("Trying $key"); + my $pastresponse=$Apache::lonhomework::history{$key}; + if ($pastresponse eq $curresponse) { + $previous{'used'} = 1; + my $history; + if ( $key =~ /^(\d+):/ ) { + $history=$1; + $previous{'award'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"}; + $previous{'last'}='0'; + push(@{ $previous{'version'} },$history); + } else { + $previous{'award'} = $Apache::lonhomework::history{"resource.$partid.$id.awarddetail"}; + $previous{'last'}='1'; + } + if (! $previous{'award'} ) { $previous{'award'} = 'UNKNOWN'; } + &Apache::lonxml::debug("got a match :$previous{'award'}:$previous{'used'}:"); + } } - if (! $previous{'award'} ) { $previous{'award'} = 'UNKNOWN'; } - &Apache::lonxml::debug("got a match :$previous{'award'}:$previous{'used'}:"); - } - } - } - &Apache::lonhomework::showhash(%previous); - return %previous; + } + &Apache::lonhomework::showhash(%previous); + return %previous; } sub handle_previous { - my ($previous,$ad)=@_; - if ($$previous{'used'} && ($$previous{'award'} eq $ad) ) { - if ($$previous{'last'}) { - push(@Apache::inputtags::previous,'PREVIOUSLY_LAST'); - } else { - push(@Apache::inputtags::previous,'PREVIOUSLY_USED'); + my ($previous,$ad)=@_; + if ($$previous{'used'} && ($$previous{'award'} eq $ad) ) { + if ($$previous{'last'}) { + push(@Apache::inputtags::previous,'PREVIOUSLY_LAST'); + } else { + push(@Apache::inputtags::previous,'PREVIOUSLY_USED'); + } + push(@Apache::inputtags::previous_version,$$previous{'version'}); } - push(@Apache::inputtags::previous_version,$$previous{'version'}); - } } sub view_or_modify { - my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); - my $myself=0; - if ( ($name eq $ENV{'user.name'}) && ($domain eq $ENV{'user.domain'}) ) { - $myself=1; - } - my $vgr=&Apache::lonnet::allowed('vgr',$courseid); - my $mgr=&Apache::lonnet::allowed('vgr',$courseid); - if ($mgr) { return "M"; } - if ($vgr) { return "V"; } - if ($myself) { return "V"; } - return ''; + my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); + my $myself=0; + if ( ($name eq $ENV{'user.name'}) && ($domain eq $ENV{'user.domain'}) ) { + $myself=1; + } + my $vgr=&Apache::lonnet::allowed('vgr',$courseid); + my $mgr=&Apache::lonnet::allowed('vgr',$courseid); + if ($mgr) { return "M"; } + if ($vgr) { return "V"; } + if ($myself) { return "V"; } + return ''; } sub start_dataresponse { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $id = &Apache::response::start_response($parstack,$safeeval); - my $result; - if ($target eq 'web') { - $result = $token->[2]->{'display'}.':'; - } elsif ($target eq 'meta') { - $result = &Apache::response::meta_stores_write($token->[2]->{'name'}, - $token->[2]->{'type'}, - $token->[2]->{'display'}); - $result .= &Apache::response::meta_package_write('dataresponse'); - } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $id = &Apache::response::start_response($parstack,$safeeval); + my $result; + if ($target eq 'web') { + $result = $token->[2]->{'display'}.':'; + } elsif ($target eq 'meta') { + $result = &Apache::response::meta_stores_write($token->[2]->{'name'}, + $token->[2]->{'type'}, + $token->[2]->{'display'}); + $result .= &Apache::response::meta_package_write('dataresponse'); + } + return $result; } sub end_dataresponse { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result; - if ( $target eq 'web' ) { - } elsif ($target eq 'grade' ) { - if ( defined $ENV{'form.submitted'}) { - my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser(); - my $allowed=&Apache::lonnet::allowed('mgr',$courseid); - if ($allowed) { - &Apache::response::setup_params('dataresponse'); - my $partid = $Apache::inputtags::part; - my $id = $Apache::inputtags::response['-1']; - my $response = $ENV{'form.HWVAL'.$id}; - my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); - if ( $response =~ /[^\s]/) { - $Apache::lonhomework::results{"resource.$partid.$id.$name"}= - $response; - $Apache::lonhomework::results{ - "resource.$partid.$id.submission"}= - $response; - $Apache::lonhomework::results{ - "resource.$partid.$id.awarddetail"}= - 'SUBMITTED'; - } - } else { - $result='Not Permitted to change values.' - } - } - } - &Apache::response::end_response; - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; + if ( $target eq 'web' ) { + } elsif ($target eq 'grade' ) { + if ( defined $ENV{'form.submitted'}) { + my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser(); + my $allowed=&Apache::lonnet::allowed('mgr',$courseid); + if ($allowed) { + &Apache::response::setup_params('dataresponse'); + my $partid = $Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; + my $response = $ENV{'form.HWVAL_'.$id}; + my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); + if ( $response =~ /[^\s]/) { + $Apache::lonhomework::results{"resource.$partid.$id.$name"}=$response; + $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; + $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}='SUBMITTED'; + } + } else { + $result='Not Permitted to change values.' + } + } + } + &Apache::response::end_response; + return $result; } sub start_responseparam { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=''; - if ($target eq 'meta') { - $result = &meta_parameter_write($token->[2]->{'name'}, - $token->[2]->{'type'}, - $token->[2]->{'default'}, - $token->[2]->{'description'}); - } elsif ($target eq 'edit') { - $result.=&Apache::edit::tag_start($target,$token); - $result.=&Apache::edit::text_arg('Name:','name',$token). - &Apache::edit::text_arg('Type:','type',$token). - &Apache::edit::text_arg('Description:','description',$token). - &Apache::edit::text_arg('Default:','default',$token). - ""; - $result.=&Apache::edit::end_table; - } elsif ($target eq 'modified') { - my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, - 'name','type','description', - 'default'); - if ($constructtag) { - $result = &Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::handle_insert(); - } - } elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' || - $target eq 'tex' || $target eq 'analyze' ) { - if ($ENV{'request.state'} eq 'construct') { - my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); - my $default = &Apache::lonxml::get_param('default',$parstack,$safeeval); - if ($name) {$Apache::inputtags::params{$name}=$default;} + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; + if ($target eq 'meta') { + $result = &meta_parameter_write($token->[2]->{'name'}, + $token->[2]->{'type'}, + $token->[2]->{'default'}, + $token->[2]->{'description'}); + } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Name:','name',$token). + &Apache::edit::text_arg('Type:','type',$token). + &Apache::edit::text_arg('Description:','description',$token). + &Apache::edit::text_arg('Default:','default',$token). + ""; + $result.=&Apache::edit::end_table; + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, + 'name','type','description', + 'default'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.=&Apache::edit::handle_insert(); + } + } elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' || + $target eq 'tex' || $target eq 'analyze' ) { + if ($ENV{'request.state'} eq 'construct') { + my $name =&Apache::lonxml::get_param('name',$parstack,$safeeval); + my $default=&Apache::lonxml::get_param('default',$parstack, + $safeeval); + if ($name) {$Apache::inputtags::params{$name}=$default;} + } } - } - return $result; + return $result; } sub end_responseparam { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'edit') { return ('','no'); } - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + if ($target eq 'edit') { return ('','no'); } + return ''; } sub start_parameter { - my $result = &start_responseparam(@_); - return $result; + my $result = &start_responseparam(@_); + return $result; } sub end_parameter { - my $result = &end_responseparam(@_); - return $result; + my $result = &end_responseparam(@_); + return $result; } sub reset_params { @@ -327,78 +332,196 @@ sub reset_params { } sub setup_params { - my ($tag) = @_; + my ($tag) = @_; - if ($ENV{'request.state'} eq 'construct') { return; } - my %paramlist=(); - foreach my $key (keys(%Apache::lonnet::packagetab)) { - if ($key =~ /^$tag/) { - my ($package,$name) = split(/&/,$key); - $paramlist{$name}=1; - } - } - foreach my $key (keys(%paramlist)) { - my $entry= 'resource.'.$Apache::inputtags::part; - if (defined($Apache::inputtags::response[-1])) { - $entry.='_'.$Apache::inputtags::response[-1]; + if ($ENV{'request.state'} eq 'construct') { return; } + my %paramlist=(); + foreach my $key (keys(%Apache::lonnet::packagetab)) { + if ($key =~ /^$tag/) { + my ($package,$name) = split(/&/,$key); + $paramlist{$name}=1; + } } - $entry.='.'.$key; - &Apache::lonxml::debug("looking for $entry"); - my $value = &Apache::lonnet::EXT("$entry"); - &Apache::lonxml::debug("$key has value :$value:"); - if ($value eq 'con_lost' || $value =~ /^error:/) { - &Apache::lonxml::debug("using nothing"); - $Apache::inputtags::params{$key}=''; - } else { - &Apache::lonxml::debug("using value"); - $Apache::inputtags::params{$key}=$value; + foreach my $key (keys(%paramlist)) { + my $entry= 'resource.'.$Apache::inputtags::part; + if (defined($Apache::inputtags::response[-1])) { + $entry.='_'.$Apache::inputtags::response[-1]; + } + $entry.='.'.$key; + &Apache::lonxml::debug("looking for $entry"); + my $value = &Apache::lonnet::EXT("$entry"); + &Apache::lonxml::debug("$key has value :$value:"); + if ($value eq 'con_lost' || $value =~ /^error:/) { + &Apache::lonxml::debug("using nothing"); + $Apache::inputtags::params{$key}=''; + } else { + &Apache::lonxml::debug("using value"); + $Apache::inputtags::params{$key}=$value; + } } - } } sub answer_header { - my ($type) = @_; - my $result; - if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) { - $result = ''."\n"; - } else { - $result = '
Answer for Part:'. - $Apache::inputtags::part. '
'."\n"; - } - return $result; + my ($type) = @_; + my $result; + if ($ENV{'form.answer_output_mode'} eq 'tex') { + $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: '. + $Apache::inputtags::part.' \\\\ \hline '; + } else { + if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) { + $result = '
Answer for Part:'. - $Apache::inputtags::part. '
'."\n"; + } else { + $result = '
Answer for Part:'. + $Apache::inputtags::part. '
'."\n"; + } + } + return $result; } sub answer_part { - my ($type,$answer) = @_; - my $result; - if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') { - $result = ''; - } else { - $result = ''; - } - return $result; + my ($type,$answer) = @_; + my $result; + if ($ENV{'form.answer_output_mode'} eq 'tex') { + $result = ' '.$answer.'\\\\ \hline '; + } else { + if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') { + $result = ''; + } else { + $result = ''; + } + } + return $result; } sub answer_footer { - my ($type) = @_; - my $result; - if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') { - $result = '
Answer for Part:'. + $Apache::inputtags::part. ''.$answer.''.$answer.''.$answer.''.$answer.'
'; - } else { - $result = ''; - } - return $result; + my ($type) = @_; + my $result; + if ($ENV{'form.answer_output_mode'} eq 'tex') { + $result = ' \end{tabular} \vskip 0 mm '; + } else { + if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') { + $result = ''; + } else { + $result = ''; + } + } + return $result; } sub showallfoils { - my $return=0; - if (defined($ENV{'form.showallfoils'}) && - $ENV{'request.state'} eq 'construct') { - $return=1; - } - return $return; + my $return=0; + if (defined($ENV{'form.showallfoils'}) && + $ENV{'request.state'} eq 'construct') { + $return=1; + } + return $return; +} + +sub getresponse { + my ($temp)=@_; + my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1']; + my $response; + if (!defined($temp)) { + $temp=1; + } else { + $formparm.=":$temp"; + } + my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7, + 'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14, + 'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, + 'W'=>22,'X'=>23,'Y'=>24,'Z'=>25); + if ($ENV{'form.submitted'} eq 'scantron') { + my $part = $Apache::inputtags::part; + my $id = $Apache::inputtags::response[-1]; + $response = $ENV{'scantron.'.($Apache::lonxml::counter+$temp-1). + '.answer'}; + # save bubbled letter for later + $Apache::lonhomework::results{"resource.$part.$id.scantron"}.= + $response; + $response = $let_to_num{$response}; + } else { + $response = $ENV{$formparm}; + } + return $response; } + +sub repetition { + my $id = $Apache::inputtags::part; + my $weight = &Apache::lonnet::EXT("resource.$id.weight"); + my $repetition = int $weight/9; + if ($weight % 9 != 0) {$repetition++;} + return $repetition; +} + +sub scored_response { + my ($part,$id)=@_; + my $repetition=&repetition(); + my $score=0; + for (my $i=0;$i<$repetition;$i++) { + my $increase=&Apache::response::getresponse($i+1); + if ($increase ne '') { $score+=$increase+1; } + } + my $weight = &Apache::lonnet::EXT("resource.$part.weight"); + my $pcr=$score/$weight; + $Apache::lonhomework::results{"resource.$part.$id.awarded"}=$pcr; + $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= + 'ASSIGNED_SCORE'; + return $repetition; +} + +sub whichorder { + my ($max,$randomize,$showall,$hash)=@_; + #&Apache::lonxml::debug("man $max randomize $randomize"); + if (!defined(@{ $$hash{'names'} })) { return; } + my @names = @{ $$hash{'names'} }; + my @whichopt =(); + my (%top,@toplist,%bottom,@bottomlist); + if (!($showall || ($randomize eq 'no'))) { + my $current=0; + foreach my $name (@names) { + $current++; + if ($$hash{"$name.location"} eq 'top') { + $top{$name}=$current; + } elsif ($$hash{"$name.location"} eq 'bottom') { + $bottom{$name}=$current; + } + } + } + my $topcount=0; + my $bottomcount=0; + while (((scalar(@whichopt)+$topcount+$bottomcount) < $max || $showall) + && ($#names > -1)) { + #&Apache::lonxml::debug("Have $#whichopt max is $max"); + my $aopt; + if ($showall || ($randomize eq 'no')) { + $aopt=0; + } else { + $aopt=int(&Math::Random::random_uniform() * ($#names+1)); + } + #&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); + $aopt=splice(@names,$aopt,1); + #&Apache::lonxml::debug("Picked $aopt"); + if ($top{$aopt}) { + $toplist[$top{$aopt}]=$aopt; + $topcount++; + } elsif ($bottom{$aopt}) { + $bottomlist[$bottom{$aopt}]=$aopt; + $bottomcount++; + } else { + push (@whichopt,$aopt); + } + } + for (my $i=0;$i<=$#toplist;$i++) { + if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) } + } + for (my $i=0;$i<=$#bottomlist;$i++) { + if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) } + } + + return @whichopt; +} + 1; __END__