--- loncom/homework/response.pm 2001/08/09 15:35:47 1.42 +++ loncom/homework/response.pm 2001/08/18 07:56:51 1.44 @@ -9,7 +9,7 @@ package Apache::response; use strict; sub BEGIN { - &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse')); + &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse')); } sub start_response { @@ -209,9 +209,47 @@ sub start_essayresponse { 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,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result='' + my $result=''; if ($target eq 'meta') { $result = &meta_parameter_write($token->[2]->{'name'}, $token->[2]->{'type'}, @@ -248,14 +286,14 @@ sub setup_params { my ($tag) = @_; @Apache::inputtags::params=(); - my @paramlist=(); + my %paramlist=(); foreach my $key (keys(%Apache::lonnet::packagetab)) { if ($key =~ /^$tag/) { my ($package,$name) = split(/&/,$key); - push(@paramlist,$name); + $paramlist{$name}=1; } } - foreach my $key (@paramlist) { + foreach my $key (keys(%paramlist)) { my $entry= 'resource.'.$Apache::inputtags::part; if (defined($Apache::inputtags::response[-1])) { $entry.='_'.$Apache::inputtags::response[-1];