--- loncom/homework/response.pm 2001/01/22 19:58:09 1.20 +++ loncom/homework/response.pm 2001/08/18 07:56:51 1.44 @@ -2,19 +2,19 @@ # various response type definitons response definition # 11/23,11/24,11/28 Gerd Kortemeyer +# Guy Albertelli +# 08/04,08/07 Gerd Kortemeyer package Apache::response; use strict; sub BEGIN { - &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','radiobuttonresponse','optionresponse')); + &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse')); } sub start_response { - my ($parstack,$safeeval)=@_; - my $args =''; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $id = &Apache::run::run("{$args;".'return $id}',$safeeval); + 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); @@ -28,25 +28,75 @@ sub end_response { 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); + return $id; +} + +sub end_hintresponse { + pop @Apache::inputtags::response; + 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=&Apache::lonnet::rndseed(); + &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']); + } + srand($rndseed); + &Apache::lonxml::debug("randseed $rndseed"); + return ''; +} + sub meta_parameter_write { my ($name,$type,$default,$display)=@_; - return '' - ."\n"; + my $partref=$Apache::inputtags::part; + my $result='' + ."\n"; + return $result; +} + +sub meta_package_write { + my $name=shift; + my $result = ''."\n"; + return $result; } sub meta_stores_write { my ($name,$type,$display)=@_; - return '' - ."\n"; + my $partref=$Apache::inputtags::part; + my $result = '\n"; } sub mandatory_part_meta { @@ -57,21 +107,21 @@ sub mandatory_part_meta { # of each part # return - &meta_parameter_write('opendate','date_start','', - 'Opening Date'). - &meta_parameter_write('duedate','date_end','', - 'Due Date'). - &meta_parameter_write('answerdate','date_start','', - 'Show Answer Date'). - &meta_parameter_write('weight','int_zeropos','', - 'Available Points'). - &meta_parameter_write('maxtries','int_pos','', - 'Maximum Number of Tries'). - +# &meta_parameter_write('opendate','date_start','', +# 'Opening Date'). +# &meta_parameter_write('duedate','date_end','', +# 'Due Date'). +# &meta_parameter_write('answerdate','date_start','', +# 'Show Answer Date'). +# &meta_parameter_write('weight','int_zeropos','', +# 'Available Points'). +# &meta_parameter_write('maxtries','int_pos','', +# 'Maximum Number of Tries'). + &meta_package_write('part'). &meta_stores_write('solved','string', 'Problem Status'). &meta_stores_write('tries','int_zeropos', - 'Number of Unsuccessful Tries'). + 'Number of Attempts'). &meta_stores_write('awarded','float', 'Partial Credit Factor'); # @@ -81,71 +131,185 @@ sub mandatory_part_meta { } sub check_for_previous { - return '0'; + my ($curresponse,$partid,$id) = @_; + my %previous; + $previous{'used'} = 0; + foreach my $key (reverse(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'; + } 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'}:"); + last; + } + } + } + return %previous; } -sub start_numericalresponse { +sub start_caparesponse { require Apache::caparesponse; import Apache::caparesponse; - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - Apache::caparesponse::start_numericalresponse($target,$token,$parstack,$parser,$safeeval,$style);; - return ""; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; +# print "\n
\nsimple caparesponse\n"; + return &Apache::caparesponse::start_caparesponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); } -sub start_caparesponse { +sub start_stringresponse { + require Apache::caparesponse; + import Apache::caparesponse; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + return &Apache::caparesponse::start_stringresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); +} + +sub start_numericalresponse { require Apache::caparesponse; import Apache::caparesponse; - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; -# print "\n
\nsimple caparesponse\n"; - Apache::caparesponse::start_caparesponse($target,$token,$parstack,$parser,$safeeval,$style);; - return ""; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + return &Apache::caparesponse::start_numericalresponse + ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); } sub start_radiobuttonresponse { require Apache::radiobuttonresponse; import Apache::radiobuttonresponse; - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - Apache::radiobuttonresponse::start_radiobuttonresponse($target,$token,$parstack,$parser,$safeeval,$style);; - return ""; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + return &Apache::radiobuttonresponse::start_radiobuttonresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); } sub start_optionresponse { require Apache::optionresponse; import Apache::optionresponse; - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - Apache::optionresponse::start_optionresponse($target,$token,$parstack,$parser,$safeeval,$style);; - return ""; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + return &Apache::optionresponse::start_optionresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); +} + +sub start_imageresponse { + require Apache::imageresponse; + import Apache::imageresponse; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + return &Apache::imageresponse::start_imageresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); +} + +sub start_essayresponse { + require Apache::essayresponse; + import Apache::essayresponse; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + return &Apache::essayresponse::start_essayresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); +} + +sub start_dataresponse { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $id = &Apache::response::start_response($parstack,$safeeval); + my $result; + if ($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'}) { + &Apache::response::setup_params('datasubmission'); + 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'; + } + } + } + &Apache::response::end_response; + return $result; } sub start_responseparam { - my ($target,$token,$parstack,$parser,$safeeval)=@_; - if ($target eq 'grade' || $target eq 'web') { - my $args=''; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $default = &Apache::run::run("{$args;".'return $default}',$safeeval); - my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); - &Apache::lonxml::debug("looking for resource.$Apache::inputtags::part.$name"); - my $value = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.$name"); - &Apache::lonxml::debug("$name has value :$value: and default :$default:"); - if ($value eq '' || $value eq 'con_lost') { - &Apache::lonxml::debug("defaulting"); - $Apache::inputtags::params{$name}=$default; - } else { - &Apache::lonxml::debug("using value"); - $Apache::inputtags::params{$name}=$value; + 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, + &Apache::lonxml::description($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(); } - return ''; - } elsif ($target eq 'meta') { - return &meta_parameter_write($token->[2]->{'name'}, - $token->[2]->{'type'}, - $token->[2]->{'default'}, - $token->[2]->{'description'}); - } else { - return ''; } + return $result; } sub end_responseparam { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + if ($target eq 'edit') { return ('','no'); } + return ''; +} + +sub setup_params { + my ($tag) = @_; + + @Apache::inputtags::params=(); + 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]; + } + $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; + } + } } 1;