Diff for /loncom/homework/matchresponse.pm between versions 1.29 and 1.30

version 1.29, 2003/10/27 20:04:34 version 1.30, 2003/11/07 08:52:20
Line 123  sub end_itemgroup { Line 123  sub end_itemgroup {
  @names=&Apache::response::whichorder($#names+1,$randomize,0,   @names=&Apache::response::whichorder($#names+1,$randomize,0,
  \%Apache::response::itemgroup);   \%Apache::response::itemgroup);
     }      }
       if ($target eq 'analyze') {
    my $partid="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
    push (@{ $Apache::lonhomework::analyze{"$partid.items"} }, @names);
       }
     my %letter_name_map;      my %letter_name_map;
     my %name_letter_map;      my %name_letter_map;
     my @alphabet=('A'..'Z');      my @alphabet=('A'..'Z');
Line 163  sub end_itemgroup { Line 167  sub end_itemgroup {
 sub start_item {  sub start_item {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::startredirection;   &Apache::lonxml::startredirection;
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $randomize=&Apache::lonxml::get_param('randomize',$parstack,   my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
Line 189  sub end_item { Line 193  sub end_item {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $text ='';      my $text ='';
     my $result = '';      my $result = '';
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
  $text=&Apache::lonxml::endredirection;   $text=&Apache::lonxml::endredirection;
     }      }
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
  $target eq 'edit' || $target eq 'tex') {   $target eq 'edit' || $target eq 'tex' || $target eq 'analyze') {
  my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
  my $location=&Apache::lonxml::get_param('location',$parstack,   my $location=&Apache::lonxml::get_param('location',$parstack,
  $safeeval);   $safeeval);
Line 308  sub grade_response { Line 312  sub grade_response {
  %letter_name_map=   %letter_name_map=
     %{ $Apache::response::itemgroup{'letter_name_map'} };      %{ $Apache::response::itemgroup{'letter_name_map'} };
     }      }
       my @items;
     foreach my $name (@whichfoils) {      foreach my $name (@whichfoils) {
  my $response = &Apache::response::getresponse($temp);   my $response = &Apache::response::getresponse($temp);
    push(@items,$response);
  my $responsename = $letter_name_map{$response};   my $responsename = $letter_name_map{$response};
  $responsehash{$name}=$responsename;   $responsehash{$name}=$responsename;
  my $value=$Apache::response::foilgroup{$name.'.value'};   my $value=$Apache::response::foilgroup{$name.'.value'};
Line 328  sub grade_response { Line 334  sub grade_response {
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];      my $id = $Apache::inputtags::response['-1'];
     my $responsestr=&Apache::lonnet::hash2str(%responsehash);      my $responsestr=&Apache::lonnet::hash2str(%responsehash);
       my $itemstr    =&Apache::lonnet::array2str(@items);
     my $gradestr   =&Apache::lonnet::hash2str(%grade);      my $gradestr   =&Apache::lonnet::hash2str(%grade);
     my %previous =&Apache::response::check_for_previous($responsestr,      my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
  $part,$id);  
     &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored ");      &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored ");
     my $ad;      my $ad;
     if ($wrong==0 && $ignored==0) {      if ($wrong==0 && $ignored==0) {
Line 346  sub grade_response { Line 352  sub grade_response {
     }      }
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=      $Apache::lonhomework::results{"resource.$part.$id.submission"}=
  $responsestr;   $responsestr;
       $Apache::lonhomework::results{"resource.$part.$id.submissionitems"}=
    $itemstr;
     $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=      $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=
  $gradestr;   $gradestr;
     $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;      $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;

Removed from v.1.29  
changed lines
  Added in v.1.30


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>