Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.83 and 1.113

version 1.83, 2004/03/05 22:59:48 version 1.113, 2007/03/27 19:20:49
Line 29 Line 29
 package Apache::radiobuttonresponse;  package Apache::radiobuttonresponse;
 use strict;  use strict;
 use HTML::Entities();  use HTML::Entities();
   use Apache::lonlocal;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));      &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
Line 42  sub start_radiobuttonresponse { Line 44  sub start_radiobuttonresponse {
     push (@Apache::lonxml::namespace,'radiobuttonresponse');      push (@Apache::lonxml::namespace,'radiobuttonresponse');
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     %Apache::hint::radiobutton=();      %Apache::hint::radiobutton=();
       undef(%Apache::response::foilnames);
     if ($target eq 'meta') {      if ($target eq 'meta') {
  $result=&Apache::response::meta_package_write('radiobuttonresponse');   $result=&Apache::response::meta_package_write('radiobuttonresponse');
     } elsif ($target eq 'edit' ) {      } elsif ($target eq 'edit' ) {
Line 57  sub start_radiobuttonresponse { Line 60  sub start_radiobuttonresponse {
     $token,'4').      $token,'4').
     &Apache::edit::select_arg('Randomize Foil Order','randomize',      &Apache::edit::select_arg('Randomize Foil Order','randomize',
       ['yes','no'],$token).        ['yes','no'],$token).
       &Apache::edit::select_arg('Display Direction','direction',
         ['vertical','horizontal'],$token).
       &Apache::edit::end_row().        &Apache::edit::end_row().
       &Apache::edit::start_spanning_row()."\n";        &Apache::edit::start_spanning_row()."\n";
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'max',       $safeeval,'max',
      'randomize');       'randomize','direction');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $type=&Apache::lonxml::get_param('TeXtype',$parstack,$safeeval,   my $type=&Apache::lonxml::get_param('TeXtype',$parstack,$safeeval,
Line 75  sub start_radiobuttonresponse { Line 80  sub start_radiobuttonresponse {
     $result .= ' \renewcommand{\labelenumi}{\alph{enumi}.}';      $result .= ' \renewcommand{\labelenumi}{\alph{enumi}.}';
  } elsif ($type eq 'i') {   } elsif ($type eq 'i') {
     $result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}';      $result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}';
    } else {
       $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}';
  }   }
  $result .= '\begin{enumerate}';   $result .= '\begin{enumerate}';
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
Line 92  sub end_radiobuttonresponse { Line 99  sub end_radiobuttonresponse {
     &Apache::response::end_response;      &Apache::response::end_response;
     pop @Apache::lonxml::namespace;      pop @Apache::lonxml::namespace;
     &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));      &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
       undef(%Apache::response::foilnames);
     return $result;      return $result;
 }  }
   
Line 101  sub start_foilgroup { Line 109  sub start_foilgroup {
     my $result;      my $result;
     %Apache::response::foilgroup=();      %Apache::response::foilgroup=();
     $Apache::radiobuttonresponse::conceptgroup=0;      $Apache::radiobuttonresponse::conceptgroup=0;
     &Apache::response::setrandomnumber();      &Apache::response::pushrandomnumber();
     if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {      if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
  $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';   $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
     }      }
Line 109  sub start_foilgroup { Line 117  sub start_foilgroup {
 }  }
   
 sub storesurvey {  sub storesurvey {
     if ( !defined($ENV{'form.submitted'})) { return ''; }      if ( !&Apache::response::submitted() ) { return ''; }
     my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};      my $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
     &Apache::lonxml::debug("Here I am!:$response:");      &Apache::lonxml::debug("Here I am!:$response:");
     if ( $response !~ /[0-9]+/) { return ''; }      if ( $response !~ /[0-9]+/) { return ''; }
       my $part = $Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];      my $id = $Apache::inputtags::response['-1'];
     my @whichfoils=@{ $Apache::response::foilgroup{'names'} };      my @whichfoils=@{ $Apache::response::foilgroup{'names'} };
     my %responsehash;      my %responsehash;
     $responsehash{$whichfoils[$response]}=$response;      $responsehash{$whichfoils[$response]}=$response;
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);      my $responsestr=&Apache::lonnet::hash2str(%responsehash);
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='SUBMITTED';      $Apache::lonhomework::results{"resource.$part.$id.submission"}=
    $responsestr;
       my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
       my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
       &Apache::response::handle_previous(\%previous,$ad);
     &Apache::lonxml::debug("submitted a $response<br />\n");      &Apache::lonxml::debug("submitted a $response<br />\n");
     return '';      return '';
 }  }
Line 127  sub grade_response { Line 140  sub grade_response {
     my ($max,$randomize)=@_;      my ($max,$randomize)=@_;
     #keep the random numbers the same must always call this      #keep the random numbers the same must always call this
     my ($answer,@whichfoils)=&whichfoils($max,$randomize);      my ($answer,@whichfoils)=&whichfoils($max,$randomize);
     if (!defined($ENV{'form.submitted'})) { return; }      if ( !&Apache::response::submitted() ) { return; }
     my $response;      my $response;
     if ($ENV{'form.submitted'} eq 'scantron') {      if ($env{'form.submitted'} eq 'scantron') {
  $response=&Apache::response::getresponse();   $response=&Apache::response::getresponse();
     } else {      } else {
  $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};   $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
     }      }
     if ( $response !~ /[0-9]+/) { return; }      if ( $response !~ /[0-9]+/) { return; }
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
Line 162  sub end_foilgroup { Line 175  sub end_foilgroup {
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  my $style = $Apache::lonhomework::type;   my $style = $Apache::lonhomework::type;
    my $direction = &Apache::lonxml::get_param('direction',$parstack,
      $safeeval,'-2');
  if ( $style eq 'survey'  && $target ne 'analyze') {   if ( $style eq 'survey'  && $target ne 'analyze') {
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  $result=&displayallfoils();   $result=&displayallfoils($direction, $target);
    if ($target eq 'web') {
       &setup_prior_tries_hash();
    }
     } elsif ( $target eq 'answer' ) {      } elsif ( $target eq 'answer' ) {
  $result=&displayallanswers();   $result=&displayallanswers();
     } elsif ( $target eq 'grade' ) {      } elsif ( $target eq 'grade' ) {
Line 177  sub end_foilgroup { Line 195  sub end_foilgroup {
     my $randomize = &Apache::lonxml::get_param('randomize',$parstack,      my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
        $safeeval,'-2');         $safeeval,'-2');
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  $result=&displayfoils($target,$max,$randomize);   $result=&displayfoils($target,$max,$randomize,$direction);
    if ($target eq 'web') {
       &setup_prior_tries_hash();
    }
     } elsif ($target eq 'answer' ) {      } elsif ($target eq 'answer' ) {
  $result=&displayanswers($max,$randomize);   $result=&displayanswers($max,$randomize);
     } elsif ( $target eq 'grade') {      } elsif ( $target eq 'grade') {
Line 191  sub end_foilgroup { Line 212  sub end_foilgroup {
       ('true','false'));        ('true','false'));
     }      }
  }   }
    $Apache::lonxml::post_evaluate=0;
     }      }
       &Apache::response::poprandomnumber();
     &Apache::lonxml::increment_counter();      &Apache::lonxml::increment_counter();
     return $result;      return $result;
 }  }
Line 214  sub getfoilcounts { Line 237  sub getfoilcounts {
     return ($truecnt,$falsecnt);      return ($truecnt,$falsecnt);
 }  }
   
   sub setup_prior_tries_hash {
       my $part=$Apache::inputtags::part;
       my $id=$Apache::inputtags::response[-1];
       foreach my $i (1..$Apache::lonhomework::history{'version'}) {
    my $key = "$i:resource.$part.$id.submission";
    next if (!exists($Apache::lonhomework::history{"$key"}));
    my %response = 
       &Apache::lonnet::str2hash($Apache::lonhomework::history{$key});
    my ($name) = keys(%response);
    $Apache::inputtags::submission_display{$key} = 
       $Apache::response::foilgroup{$name.'.text'}
       }
   }
   
 sub displayallfoils {  sub displayallfoils {
       my ($direction, $target)=@_;
     my $result;      my $result;
     &Apache::lonxml::debug("survey style display");      &Apache::lonxml::debug("survey style display");
     my @names = @{ $Apache::response::foilgroup{'names'} };      my @names;
       if ( $Apache::response::foilgroup{'names'} ) {
    @names= @{ $Apache::response::foilgroup{'names'} };
       }
     my $temp=0;      my $temp=0;
       my $i   =0;
     my $id=$Apache::inputtags::response['-1'];      my $id=$Apache::inputtags::response['-1'];
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $lastresponse=      my $lastresponse=
  $Apache::lonhomework::history{"resource.$part.$id.submission"};   $Apache::lonhomework::history{"resource.$part.$id.submission"};
       if ($direction eq 'horizontal') { $result.='<table><tr>'; }
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);      my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     if (&Apache::response::show_answer() ) {      if (&Apache::response::show_answer() ) {
  foreach my $name (@names) {   foreach my $name (@names) {
     if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
  $result.="<br />".$Apache::response::foilgroup{$name.'.value'};   if (($direction eq 'horizontal') && ($target ne 'tex')) {
  if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {      $result.="<td>";
     $result.='<b>';   } else {
       if ($target eq 'tex') {
    $result .= '\item \vskip -2mm ';
       } else {
    $result.="<br />";
       }
    }
    if (defined($lastresponse{$name})) {
       if ($target eq 'tex') {
    $result .= '}';
       } else {
    $result.='<b>';
       }
  }   }
  $result .= $Apache::response::foilgroup{$name.'.text'};   $result .= $Apache::response::foilgroup{$name.'.text'};
  if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {   if (defined($lastresponse{$name}) && ($target ne 'tex')) {
     $result.='</b>';      $result.='</b>';
  }   }
    if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.="</td>"; }
     }      }
  }   }
     } else {      } else {
  foreach my $name (@names) {   foreach my $name (@names) {
     if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
  $result.="<br /><input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";   if ($direction eq 'horizontal') {
  if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }      $result.="<td>";
  $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";   } else {
       if ($target eq 'tex') {
    $result .= '\item \vskip -2mm ';
       } else {
    $result.="<br />";
       }
    }
    if ($target eq 'tex') {
       $result .= '$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
       $i++;
    } else {
       $result .= '<label>';
       $result.="<input
                          onchange=\"javascript:setSubmittedPart('$part');\"
                          type=\"radio\"
                          name=\"HWVAL_$Apache::inputtags::response['-1']\"
                          value=\"$temp\" ";
       if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
       $result .= ' />'.$Apache::response::foilgroup{$name.'.text'}.
    '</label>';
    }
  $temp++;   $temp++;
    if ($target ne 'tex') {
       if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.="</td>"; }
    } else {
       $result.='\vskip 0 mm ';
    }
     }      }
  }   }
     }      }
       if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.='</tr></table>'; }
     return $result;      return $result;
 }  }
   
Line 259  sub whichfoils { Line 341  sub whichfoils {
     my ($truecnt,$falsecnt) = &getfoilcounts();      my ($truecnt,$falsecnt) = &getfoilcounts();
     my $count=0;      my $count=0;
     # we will add in 1 of the true statements      # we will add in 1 of the true statements
     if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }      if ( $max>0 && ($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; $max=$count; }
     my $answer=int(&Math::Random::random_uniform() * ($count));      my $answer=int(&Math::Random::random_uniform() * ($count));
     &Apache::lonxml::debug("Count is $count, $answer is $answer");      &Apache::lonxml::debug("Count is $count, $answer is $answer");
     my @names;      my @names;
Line 280  sub whichfoils { Line 362  sub whichfoils {
  push (@whichfalse,$name);   push (@whichfalse,$name);
     } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {      } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
     } else {      } else {
  &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));   &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
     }      }
  }   }
    if (!$havetrue && $Apache::lonhomework::type ne 'survey') {
       &Apache::lonxml::error("There are no true statements available.<br />");
    }
     } else {      } else {
  my $current=0;   my $current=0;
  &Apache::lonhomework::showhash(%Apache::response::foilgroup);   &Apache::lonhomework::showhash(%Apache::response::foilgroup);
Line 306  sub whichfoils { Line 391  sub whichfoils {
  }   }
     } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {      } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
     } else {      } else {
  &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));   &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
     }      }
  }   }
  #pick a true statement   #pick a true statement
Line 384  sub whichfoils { Line 469  sub whichfoils {
 }  }
   
 sub displayfoils {  sub displayfoils {
     my ($target,$max,$randomize)=@_;      my ($target,$max,$randomize,$direction)=@_;
     my $result;      my $result;
   
     my ($answer,@whichfoils)=&whichfoils($max,$randomize);      my ($answer,@whichfoils)=&whichfoils($max,$randomize);
Line 392  sub displayfoils { Line 477  sub displayfoils {
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};      my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     if ( ($target ne 'tex') &&      if ( ($target ne 'tex') &&
  &Apache::response::show_answer() ) {   &Apache::response::show_answer() ) {
    if ($direction eq 'horizontal') {
       if ($target ne 'tex') {
    $result.='<table><tr>';
       }
    }
  foreach my $name (@whichfoils) {   foreach my $name (@whichfoils) {
       if ($direction eq 'horizontal') {
    if ($target ne 'tex') { $result.='<td>'; }
       }
     if ($target ne 'tex') {      if ($target ne 'tex') {
  $result.="<br />";   $result.="<br />";
     } else {      } else {
Line 403  sub displayfoils { Line 496  sub displayfoils {
     } else {      } else {
  $result.='Incorrect:';   $result.='Incorrect:';
     }      }
     if ($target ne 'tex') {      if ($target eq 'web') { $result.="<label>"; }
  $result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n";      $result.=$Apache::response::foilgroup{$name.'.text'};
     } else {      if ($target eq 'web') { $result.="</label>"; }
  $result.=$Apache::response::foilgroup{$name.'.text'};  
     }  
     if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {      if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
  if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}   if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}
     }      }
       if ($direction eq 'horizontal') {
    if ($target ne 'tex') { $result.='</td>'; }
       }
    }
    if ($direction eq 'horizontal') {
       if ($target ne 'tex') {
    $result.='</tr></table>';
       }
  }   }
     } else {      } else {
  my @alphabet = ('A'..'Z');   my @alphabet = ('A'..'Z');
Line 420  sub displayfoils { Line 519  sub displayfoils {
  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);
    if ($target ne 'tex' && $direction eq 'horizontal') {
       $result.="<table><tr>";
    }
  foreach my $name (@whichfoils) {   foreach my $name (@whichfoils) {
     if ($target ne 'tex') {      if ($target ne 'tex') {
  $result.="<br /><input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";   if ($direction eq 'horizontal') {
       $result.="<td>"; 
    } else { 
       $result.="<br />";
    } 
       }
       if ($target ne 'tex') { 
                   $result.= '<label>';
    $result.=
       "<input type=\"radio\"
                               onchange=\"javascript:setSubmittedPart('$part');\"
                               name=\"HWVAL_$Apache::inputtags::response['-1']\"
                               value=\"$temp\" ";
  if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }   if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
  $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";   $result .= ' />'.$Apache::response::foilgroup{$name.'.text'}."</label>";
     } else {      } else {
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs      $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
Line 433  sub displayfoils { Line 547  sub displayfoils {
     $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};      $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
  }   }
     }      }
       if ($target ne 'tex' && $direction eq 'horizontal') {
    $result.="</td>"; 
       }
     $temp++;      $temp++;
  }   }
    if ($target ne 'tex' && $direction eq 'horizontal') {
       $result.="</tr></table>";
    }
     }      }
     if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; }      if ($target ne 'tex') { if ($direction ne 'horizontal') { $result.="<br />";} } else { $result.='\vskip 0 mm '; }
     return $result;      return $result;
 }  }
   
 sub displayallanswers {  sub displayallanswers {
     my @names = @{ $Apache::response::foilgroup{'names'} };      my @names;
       if ( $Apache::response::foilgroup{'names'} ) {
    @names= @{ $Apache::response::foilgroup{'names'} };
       }
       
     my $result=&Apache::response::answer_header('radiobuttonresponse');      my $result=&Apache::response::answer_header('radiobuttonresponse');
     foreach my $name (@names) {      foreach my $name (@names) {
Line 456  sub displayanswers { Line 579  sub displayanswers {
     my ($max,$randomize)=@_;      my ($max,$randomize)=@_;
     my ($answer,@whichopt) = &whichfoils($max,$randomize);      my ($answer,@whichopt) = &whichfoils($max,$randomize);
     my $result=&Apache::response::answer_header('radiobuttonresponse');      my $result=&Apache::response::answer_header('radiobuttonresponse');
       if ($Apache::lonhomework::type eq 'exam') {
    my $correct = ('A'..'Z')[$answer];
    $result.=&Apache::response::answer_part('radiobuttonresponse',
    $correct);
       }
     foreach my $name (@whichopt) {      foreach my $name (@whichopt) {
  $result.=&Apache::response::answer_part('radiobuttonresponse',   $result.=&Apache::response::answer_part('radiobuttonresponse',
  $Apache::response::foilgroup{$name.'.value'})   $Apache::response::foilgroup{$name.'.value'});
  }      }
     $result.=&Apache::response::answer_footer('radiobuttonresponse');      $result.=&Apache::response::answer_footer('radiobuttonresponse');
     return $result;      return $result;
 }  }
Line 507  sub start_foil { Line 635  sub start_foil {
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::startredirection;   &Apache::lonxml::startredirection;
    if ($target eq 'analyze') {
       &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
    }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::tag_start($target,$token);   $result=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::text_arg('Name:','name',$token);   $result.=&Apache::edit::text_arg('Name:','name',$token);
Line 535  sub end_foil { Line 666  sub end_foil {
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {      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' || $target eq 'analyze') {      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);
     my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);      if ($name eq "") {
     if (!$name) { $name=$Apache::lonxml::curdepth; }   &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
    $name=$Apache::lonxml::curdepth;
       }
       if (defined($Apache::response::foilnames{$name})) {
    &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
       }
       $Apache::response::foilnames{$name}++;
       my $location =&Apache::lonxml::get_param('location',$parstack,
        $safeeval);
     if ( $Apache::radiobuttonresponse::conceptgroup      if ( $Apache::radiobuttonresponse::conceptgroup
  && !&Apache::response::showallfoils() ) {   && !&Apache::response::showallfoils() ) {
  push @{ $Apache::response::conceptgroup{'names'} }, $name;   push @{ $Apache::response::conceptgroup{'names'} }, $name;

Removed from v.1.83  
changed lines
  Added in v.1.113


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