[LON-CAPA-cvs] cvs: loncom /homework response.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Wed, 30 Apr 2003 21:19:13 -0000
This is a MIME encoded message
--albertel1051737553
Content-Type: text/plain
albertel Wed Apr 30 17:19:13 2003 EDT
Modified files:
/loncom/homework response.pm
Log:
- retabinate
--albertel1051737553
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20030430171913.txt"
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.72 loncom/homework/response.pm:1.73
--- loncom/homework/response.pm:1.72 Mon Apr 21 16:59:02 2003
+++ loncom/homework/response.pm Wed Apr 30 17:19:13 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.72 2003/04/21 20:59:02 albertel Exp $
+# $Id: response.pm,v 1.73 2003/04/30 21:19:13 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,70 +33,70 @@
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::paramstack,[%Apache::inputtags::params]);
+ return $id;
}
sub end_hintresponse {
- pop @Apache::inputtags::response;
- if (defined($Apache::inputtags::paramstack[-1])) {
- %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'])) {
+ 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::response['-1']);
- }
- &Math::Random::random_set_seed_from_phrase($rndseed);
- &Apache::lonxml::debug("randseed $rndseed");
- return '';
+ +(&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 '';
}
sub meta_parameter_write {
@@ -104,8 +104,8 @@
my $partref=$Apache::inputtags::part;
my $result='<parameter part="'.$Apache::inputtags::part.'"';
if (defined($Apache::inputtags::response[-1])) {
- $result.= ' id="'.$Apache::inputtags::response[-1].'"';
- $partref.='_'.$Apache::inputtags::response[-1];
+ $result.= ' id="'.$Apache::inputtags::response[-1].'"';
+ $partref.='_'.$Apache::inputtags::response[-1];
}
$result.= ' name="'.$name.'"'.
' type="'.$type.'"'.
@@ -120,7 +120,7 @@
my $name=shift;
my $result = '<parameter part="'.$Apache::inputtags::part.'"';
if(defined($Apache::inputtags::response[-1])) {
- $result.= ' id="'.$Apache::inputtags::response[-1].'"';
+ $result.= ' id="'.$Apache::inputtags::response[-1].'"';
}
$result.=' package="'.$name.'"></parameter>'."\n";
return $result;
@@ -131,8 +131,8 @@
my $partref=$Apache::inputtags::part;
my $result = '<stores part="'.$Apache::inputtags::part.'"';
if (defined($Apache::inputtags::response[-1])) {
- $result.= ' id="'.$Apache::inputtags::response[-1].'"';
- $partref.='_'.$Apache::inputtags::response[-1];
+ $result.= ' id="'.$Apache::inputtags::response[-1].'"';
+ $partref.='_'.$Apache::inputtags::response[-1];
}
$result.= ' name="'.$name.'"'.
' type="'.$type.'"'.
@@ -147,7 +147,7 @@
# output (to lonspreadsheet)
# of each part
#
- return
+ return
# &meta_parameter_write('opendate','date_start','',
# 'Opening Date').
# &meta_parameter_write('duedate','date_end','',
@@ -158,13 +158,13 @@
# '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 Attempts').
- &meta_stores_write('awarded','float',
- 'Partial Credit Factor');
+ &meta_package_write('part').
+ &meta_stores_write('solved','string',
+ 'Problem Status').
+ &meta_stores_write('tries','int_zeropos',
+ 'Number of Attempts').
+ &meta_stores_write('awarded','float',
+ 'Partial Credit Factor');
#
# Note: responseid-specific data 'submission' and 'awarddetail'
# not available to spreadsheet -> skip here
@@ -172,157 +172,153 @@
}
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';
+ 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.'
+ }
}
- } else {
- $result='Not Permitted to change values.'
- }
- }
- }
- &Apache::response::end_response;
- return $result;
+ }
+ &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).
- "</td></tr>";
- $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).
+ "</td></tr>";
+ $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 {
@@ -330,77 +326,77 @@
}
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 = '<table border="1"><tr><th>Answer for Part:'.
- $Apache::inputtags::part. '</th></tr><tr>'."\n";
- } else {
- $result = '<table border="1"><tr><td>Answer for Part:'.
- $Apache::inputtags::part. '</td>'."\n";
- }
- return $result;
+ my ($type) = @_;
+ my $result;
+ if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) {
+ $result = '<table border="1"><tr><th>Answer for Part:'.
+ $Apache::inputtags::part. '</th></tr><tr>'."\n";
+ } else {
+ $result = '<table border="1"><tr><td>Answer for Part:'.
+ $Apache::inputtags::part. '</td>'."\n";
+ }
+ return $result;
}
sub answer_part {
- my ($type,$answer) = @_;
- my $result;
- if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
- $result = '<td>'.$answer.'</td>';
- } else {
- $result = '<td>'.$answer.'</td>';
- }
- return $result;
+ my ($type,$answer) = @_;
+ my $result;
+ if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
+ $result = '<td>'.$answer.'</td>';
+ } else {
+ $result = '<td>'.$answer.'</td>';
+ }
+ return $result;
}
sub answer_footer {
- my ($type) = @_;
- my $result;
- if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
- $result = '</tr></table>';
- } else {
- $result = '</tr></table>';
- }
- return $result;
+ my ($type) = @_;
+ my $result;
+ if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
+ $result = '</tr></table>';
+ } else {
+ $result = '</tr></table>';
+ }
+ 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 {
--albertel1051737553--