[BACK]Return to matchresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/matchresponse.pm between versions 1.6 and 1.35

version 1.6, 2003/03/18 21:26:33 version 1.35, 2004/02/09 19:47:53
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 2/21 Guy  
   
 package Apache::matchresponse;  package Apache::matchresponse;
 use strict;  use strict;
Line 33  use HTML::Entities(); Line 32  use HTML::Entities();
 use Math::Random();  use Math::Random();
 use Apache::optionresponse;  use Apache::optionresponse;
   
 my @Items;  
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));      &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
 }  }
Line 68  sub start_matchresponse { Line 65  sub start_matchresponse {
      $safeeval,'max',       $safeeval,'max',
      'randomize');       'randomize');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
       } elsif ($target eq 'analyze') {
    my $part_id="$Apache::inputtags::part.$id";
    push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
     }      }
     return $result;      return $result;
 }  }
Line 89  sub start_itemgroup { Line 89  sub start_itemgroup {
     my $result;      my $result;
     %Apache::response::itemgroup=();      %Apache::response::itemgroup=();
     %Apache::matchresponse::itemtable=();      %Apache::matchresponse::itemtable=();
   
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result=&Apache::edit::tag_start($target,$token);   $result=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::select_arg('Randomize Order:','randomize',   $result.=&Apache::edit::select_arg('Randomize Order:','randomize',
Line 103  sub start_itemgroup { Line 104  sub start_itemgroup {
      $safeeval,'randomize',       $safeeval,'randomize',
      'location');       'location');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'web') {      } elsif ($target eq 'web' or $target eq 'tex') {
  $Apache::matchresponse::itemtable{'location'}=   $Apache::matchresponse::itemtable{'location'}=
     &Apache::lonxml::get_param('location',$parstack,$safeeval);      &Apache::lonxml::get_param('location',$parstack,$safeeval);
     }      }
Line 114  sub end_itemgroup { Line 115  sub end_itemgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
   
       if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
     if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; }      if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; }
     my @names=@{ $Apache::response::itemgroup{'names'} };      my @names=@{ $Apache::response::itemgroup{'names'} };
     my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval);      my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval);
     if ($randomize ne 'no' ) {      if ($randomize ne 'no' ) {
  @names=&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;
Line 128  sub end_itemgroup { Line 134  sub end_itemgroup {
     foreach my $name (@names) {      foreach my $name (@names) {
  $letter_name_map{$alphabet[$i]}=$name;   $letter_name_map{$alphabet[$i]}=$name;
  $name_letter_map{$name}=$alphabet[$i];   $name_letter_map{$name}=$alphabet[$i];
  push @Items, $alphabet[$i];  
  $i++;   $i++;
     }      }
      $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;      $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
     $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;      $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
     if ($target eq 'web') {      if ($target eq 'web') {
  my $table='<table>';   my $table='<table>';
Line 145  sub end_itemgroup { Line 150  sub end_itemgroup {
  $table.='</table>';   $table.='</table>';
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $table=' \\\\\\\\ \begin{tabular}{ll} ';   my $table=' \begin{description} ';
  my $i=0;   my $i=0;
  foreach my $name (@names) {   foreach my $name (@names) {
     $table.=' '.$alphabet[$i].' & '.      $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
  $Apache::response::itemgroup{$name.'.text'}.      $table.='\item['.$alphabet[$i].'] '.
     ' \\\\ ';   $Apache::response::itemgroup{$name.'.text'};
     $i++;      $i++;
  }   }
  $table.=' \end{tabular} \\\\ ';   $table.=' \end{description} \strut ';
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); }      }
     return $result;      return $result;
 }  }
   
 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 188  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 237  sub start_foilgroup { Line 242  sub start_foilgroup {
 sub end_foilgroup {  sub end_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
  my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
  my $randomize = &Apache::lonxml::get_param('randomize',$parstack,   my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
    $safeeval,'-2');     $safeeval,'-2');
Line 247  sub end_foilgroup { Line 252  sub end_foilgroup {
     $result=&displayanswers($max,$randomize);      $result=&displayanswers($max,$randomize);
  } elsif ( $target eq 'grade') {   } elsif ( $target eq 'grade') {
     &grade_response($max,$randomize);      &grade_response($max,$randomize);
    } elsif ( $target eq 'analyze') {
       my @shown=&whichfoils($max,$randomize);
       &Apache::response::analyze_store_foilgroup(\@shown,
    ['text','value','location']);
       #FIXME need to store options in some way
  }   }
    &Apache::lonxml::increment_counter(&getfoilcounts($max));
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     }      }
     return $result;      return $result;
 }  }
   
   sub whichfoils {
       my ($max,$randomize)=@_;
       return &Apache::response::whichorder(&getfoilcounts($max),
    $randomize,
    &Apache::response::showallfoils(),
    \%Apache::response::foilgroup);
   }
   
 sub displayanswers {  sub displayanswers {
     my ($max,$randomize,@opt)=@_;      my ($max,$randomize,@opt)=@_;
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }      if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
     my @names = @{ $Apache::response::foilgroup{'names'} };      my @names = @{ $Apache::response::foilgroup{'names'} };
     my @whichfoils = &whichorder(&getfoilcounts($max),$randomize,      my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max),
  &Apache::response::showallfoils(),     $randomize,
  \%Apache::response::foilgroup);    &Apache::response::showallfoils(),
    \%Apache::response::foilgroup);
     my $result=&Apache::response::answer_header('matchresponse');      my $result=&Apache::response::answer_header('matchresponse');
     my %name_letter_map;      my %name_letter_map;
     if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {      if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
Line 279  sub displayanswers { Line 299  sub displayanswers {
   
 sub grade_response {  sub grade_response {
     my ($max,$randomize)=@_;      my ($max,$randomize)=@_;
     my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,      my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
  &Apache::response::showallfoils(),     $randomize,
  \%Apache::response::foilgroup);              &Apache::response::showallfoils(),
              \%Apache::response::foilgroup);
     if (!defined($ENV{'form.submitted'})) { return; }      if (!defined($ENV{'form.submitted'})) { return; }
     my %responsehash;      my %responsehash;
     my %grade;      my %grade;
     my ($temp,$right,$wrong,$ignored)=(0,0,0,0);      my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
     my %letter_name_map;      my %letter_name_map;
     if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {      if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {
  %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 = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};   my $response = &Apache::response::getresponse($temp,'letter');
    push(@items,$response);
  my $responsename = $letter_name_map{$response};   my $responsename = $letter_name_map{$response};
  $responsehash{$name}=$responsename;  
  my $value=$Apache::response::foilgroup{$name.'.value'};   my $value=$Apache::response::foilgroup{$name.'.value'};
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
     &Apache::lonxml::debug("submitted a $response for $value<br />\n");      $responsehash{$name}=$responsename;
       &Apache::lonxml::debug("submitted a $response($responsename) for $value<br />\n");
     if ($value eq $responsename) {      if ($value eq $responsename) {
  $grade{$name}='1'; $right++;   $grade{$name}='1'; $right++;
     } else {      } else {
Line 311  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;  
     if ($wrong==0 && $ignored==0) {  
  $ad='EXACT_ANS';  
     } elsif ($wrong==0 && $right==0) {  
  #nothing submitted  
     } else {  
  if ($ignored==0) {  
     $ad='INCORRECT';  
  } else {  
     $ad='MISSING_ANSWER';  
  }  
     }  
     $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;      if (!$Apache::lonhomework::scantronmode) {
     &Apache::response::handle_previous(\%previous,$ad);   my $ad;
    if ($wrong==0 && $ignored==0) {
       $ad='EXACT_ANS';
    } elsif ($wrong==0 && $right==0) {
       #nothing submitted
    } else {
       if ($ignored==0) {
    $ad='INCORRECT';
       } else {
    $ad='MISSING_ANSWER';
       }
    }
    $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
    &Apache::response::handle_previous(\%previous,$ad);
       } else {
    my $ad;
    if ($wrong==0 && $right==0) {
       #nothing submitted
    } else {
       $ad='ASSIGNED_SCORE';
       $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
    $ad;
       $Apache::lonhomework::results{"resource.$part.$id.awarded"}=
    $right/(scalar(@whichfoils));
       $Apache::lonhomework::results{"resource.$part.$id.numfoils"}=
    scalar(@whichfoils);
    }
       }
 }  }
   
 sub itemdisplay {  sub itemdisplay {
Line 350  sub displayfoils { Line 390  sub displayfoils {
     my ($target,$max,$randomize)=@_;      my ($target,$max,$randomize)=@_;
     my $result;      my $result;
     my $question;      my $question;
     my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,      my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
  &Apache::response::showallfoils(),     $randomize,
  \%Apache::response::foilgroup);              &Apache::response::showallfoils(),
              \%Apache::response::foilgroup);
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};      my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     my $status=$Apache::inputtags::status[-1];  
     my %letter_name_map;      my %letter_name_map;
     if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {      if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {
  %letter_name_map=   %letter_name_map=
Line 366  sub displayfoils { Line 406  sub displayfoils {
  %name_letter_map=   %name_letter_map=
     %{ $Apache::response::itemgroup{'name_letter_map'} };      %{ $Apache::response::itemgroup{'name_letter_map'} };
     }      }
     if (($solved =~ /^correct/) || ($status eq  'SHOW_ANSWER')) {      if ( &Apache::response::show_answer() && ($target ne 'tex')) {
  foreach my $name (@whichfoils) {   foreach my $name (@whichfoils) {
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     my $value=$Apache::response::foilgroup{$name.'.value'};      my $value=$Apache::response::foilgroup{$name.'.value'};
Line 383  sub displayfoils { Line 423  sub displayfoils {
  my $id=$Apache::inputtags::response[-1];   my $id=$Apache::inputtags::response[-1];
  my $part=$Apache::inputtags::part;   my $part=$Apache::inputtags::part;
  my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};   my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
  my %lastresponse=&Apache::lonnet::str2hash($lastresponse);   my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    
    my @alphabet=('A'..'Z');
    my @used_letters=sort(keys(%letter_name_map));
    my $internal_counter=$Apache::lonxml::counter;
  foreach my $name (@whichfoils) {   foreach my $name (@whichfoils) {
     my $lastopt=$lastresponse{$name};      my $lastopt=$lastresponse{$name};
     my $last_letter=$name_letter_map{$lastopt};      my $last_letter=$name_letter_map{$lastopt};
     my $optionlist = '';      my $optionlist = '';
     if ($target ne 'tex') {$optionlist="<option></option>\n";}       if ($target ne 'tex') {
        else {$optionlist='\framebox[5 mm][s]{\tiny\strut}';}   $optionlist="<option></option>\n";
       } else {
    if ($Apache::lonhomework::type ne 'exam') {
       $optionlist='\framebox[5 mm][s]{\tiny\strut}';
    }
       }
     my $option;      my $option;
     foreach $option (sort(keys(%letter_name_map))) {      foreach $option (@used_letters) {
  if ($option eq $last_letter) {   if ($option eq $last_letter) {
     if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}      if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
  } else {   } else {
     if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}      if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
  }   }
     }      }
     if ($target ne 'tex') {      if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
         $optionlist='<select name="HWVAL_'.          $optionlist='<select name="HWVAL_'.
     $Apache::inputtags::response[-1].':'.$temp.'">'.      $Apache::inputtags::response[-1].':'.$temp.'">'.
         $optionlist."</select>\n";          $optionlist."</select>\n";
     } else {  
  $optionlist=$optionlist;  
     }      }
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     if ($target ne 'tex') {      if ($target ne 'tex') {
  $question.='<br />'.$optionlist.$text."\n";   if ($Apache::lonhomework::type ne 'exam') {
       $question.='<br />'.$optionlist.$text."\n";
    } else {
       $question.='<br />'.$text."\n";
    }
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $question.=&Apache::optionresponse::webbubbles(\@Items,\@Items);      $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp,$last_letter);
  }   }
     } else {      } else {
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $question.=' '.$optionlist.$text."\n";      $question.=' '.$optionlist.$text."\n";
     $question.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.&Apache::optionresponse::bubbles(\@Items,\@Items).'\end{enumerate}\strut ';      my @emptyItems = ();
     &Apache::lonxml::increment_counter();      for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
       $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
       $internal_counter++;
         } else {          } else {
     $question.=' \\\\ '.$optionlist.$text."\n";      $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
  }   }
             }               } 
     $temp++;      $temp++;
Line 428  sub displayfoils { Line 480  sub displayfoils {
     } elsif ($result=&itemdisplay('bottom')) {      } elsif ($result=&itemdisplay('bottom')) {
  $result=$question.$result;   $result=$question.$result;
     } elsif ($result=&itemdisplay('right')) {      } elsif ($result=&itemdisplay('right')) {
  $result='<table><tr><td>'.$question.'</td><td>'.$result.   if ($target ne 'tex') {
     '</td></tr></table>';      $result='<table><tr><td>'.$question.'</td><td>'.$result.
    '</td></tr></table>';
    } else {
       $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}\end{tabular}';
    }
     } elsif ($result=&itemdisplay('left')) {      } elsif ($result=&itemdisplay('left')) {
  $result='<table><tr><td>'.$result.'</td><td>'.$question.   if ($target ne 'tex') {
     '</td></tr></table>';      $result='<table><tr><td>'.$result.'</td><td>'.$question.
    '</td></tr></table>';
    } else {
       $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}\end{tabular}';
    }
     }      }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}      if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
     return $result;      return $result;
Line 448  sub getfoilcounts { Line 508  sub getfoilcounts {
     return $count;      return $count;
 }  }
   
 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;  
     }  
  }  
     }  
     while ((($#whichopt+1) < $max) && ($#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;  
  } elsif ($bottom{$aopt}) {  
     $bottomlist[$bottom{$aopt}]=$aopt;  
  } 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;  
 }  
   
 sub start_conceptgroup {  sub start_conceptgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
Line 518  sub end_conceptgroup { Line 532  sub end_conceptgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     $Apache::matchresponse::conceptgroup=0;      $Apache::matchresponse::conceptgroup=0;
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
  #if not there aren't any foils to display and thus no question   $target eq 'tex' || $target eq 'analyze') {
  if (defined(@{ $Apache::response::conceptgroup{'names'} })) {   &Apache::response::pick_foil_for_concept($target,
     my @names = @{ $Apache::response::conceptgroup{'names'} };   ['value','text','location'],
     my $pick=int(&Math::Random::random_uniform() * ($#names+1));   \%Apache::hint::match,
     my $name=$names[$pick];   $parstack,$safeeval);
     push @{ $Apache::response::foilgroup{'names'} }, $name;  
     $Apache::response::foilgroup{"$name.value"} =  
  $Apache::response::conceptgroup{"$name.value"};  
     $Apache::response::foilgroup{"$name.text"} =  
  $Apache::response::conceptgroup{"$name.text"};  
     $Apache::response::foilgroup{"$name.location"} =  
  $Apache::response::conceptgroup{"$name.location"};  
     my $concept = &Apache::lonxml::get_param('concept',$parstack,  
      $safeeval);  
     $Apache::response::foilgroup{"$name.concept"} = $concept;  
     &Apache::lonxml::debug("Selecting $name in $concept");  
     if ($target eq 'web') {  
  my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";  
  push(@{ $Apache::hint::match{"$part_id.concepts"} },  
      $concept);  
  $Apache::hint::match{"$part_id.concept.$concept"}=  
     $Apache::response::conceptgroup{'names'};  
     }  
  }  
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     }      }
Line 557  sub insert_conceptgroup { Line 552  sub insert_conceptgroup {
 sub start_foil {  sub start_foil {
     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') {
  $result=&Apache::edit::tag_start($target,$token,"Foil");   $result=&Apache::edit::tag_start($target,$token,"Foil");
Line 589  sub end_foil { Line 584  sub end_foil {
     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' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
    $target eq 'tex' || $target eq 'analyze') {
  my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);   my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
  if ($value ne 'unused') {   if ($value ne 'unused') {
     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
Line 604  sub end_foil { Line 600  sub end_foil {
  && !&Apache::response::showallfoils() ) {   && !&Apache::response::showallfoils() ) {
  push @{ $Apache::response::conceptgroup{'names'} }, $name;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
  $Apache::response::conceptgroup{"$name.value"} = $value;   $Apache::response::conceptgroup{"$name.value"} = $value;
  $Apache::response::conceptgroup{"$name.text"} = $text;   if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
       $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
    } else {
       $Apache::response::conceptgroup{"$name.text"} = $text;
    }
  $Apache::response::conceptgroup{"$name.location"} = $location;   $Apache::response::conceptgroup{"$name.location"} = $location;
     } else {      } else {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
  $Apache::response::foilgroup{"$name.value"} = $value;   $Apache::response::foilgroup{"$name.value"} = $value;
  $Apache::response::foilgroup{"$name.text"} = $text;   if ($Apache::lonhomework::type eq 'exam') {
       if ($target eq 'tex') {
    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
       } else {
    $Apache::response::foilgroup{"$name.text"} = $text;
       }
    } else {
       if ($target eq 'tex') {
    $Apache::response::foilgroup{"$name.text"} = $text;
       } else {
    $Apache::response::foilgroup{"$name.text"} = $text;
       }
    }
  $Apache::response::foilgroup{"$name.location"} = $location;   $Apache::response::foilgroup{"$name.location"} = $location;
     }      }
  }   }
Removed from v.1.6  
changed lines
  Added in v.1.35

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