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

Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.44 and 1.65

version 1.44, 2002/08/05 14:59:24 version 1.65, 2003/04/04 23:35:17
Line 42  sub start_radiobuttonresponse { Line 42  sub start_radiobuttonresponse {
   &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
   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=();
   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 51  sub start_radiobuttonresponse { Line 52  sub start_radiobuttonresponse {
  ."</td><td>&nbsp".&Apache::edit::end_row()   ."</td><td>&nbsp".&Apache::edit::end_row()
         .&Apache::edit::start_spanning_row();          .&Apache::edit::start_spanning_row();
   
     $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').      $result.=
  &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";   &Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
    &Apache::edit::select_arg('Randomize Foil Order','randomize',
     ['yes','no'],$token).
           &Apache::edit::end_row().&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');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
       $result .= '\begin{enumerate}';        $result .= '\begin{enumerate}';
Line 76  sub end_radiobuttonresponse { Line 80  sub end_radiobuttonresponse {
   
 %Apache::response::foilgroup=();  %Apache::response::foilgroup=();
 sub start_foilgroup {  sub start_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
   %Apache::response::foilgroup=();    %Apache::response::foilgroup=();
   $Apache::radiobuttonresponse::conceptgroup=0;    $Apache::radiobuttonresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();    &Apache::response::setrandomnumber();
   return '';    if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
         $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
     }
     return $result;
 }  }
   
 sub storesurvey {  sub storesurvey {
Line 98  sub storesurvey { Line 107  sub storesurvey {
 }  }
   
 sub grade_response {  sub grade_response {
   my ($max,$answer)=@_;    my ($max,$randomize)=@_;
     #keep the random numbers the same must always call this
     my ($answer,@whichfoils)=&whichfoils($max,$randomize);
   if (!defined($ENV{'form.submitted'})) { return; }    if (!defined($ENV{'form.submitted'})) { return; }
   my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};    my $response;
     if ($ENV{'form.submitted'} eq 'scantron') {
         my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,
         'H'=>7,'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,
         'O'=>14,'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,
         'V'=>21,'W'=>22,'X'=>23,'Y'=>24,'Z'=>25);
         $response = $ENV{'scantron.'.$Apache::lonxml::counter.'.answer'};
         $response = $let_to_num{$response};
     } else {
         $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;
   my $id = $Apache::inputtags::response['-1'];    my $id = $Apache::inputtags::response['-1'];
   my @whichfoils=&whichfoils($max,$answer);  
   my %responsehash;    my %responsehash;
   $responsehash{$whichfoils[$response]}=$response;    $responsehash{$whichfoils[$response]}=$response;
   my $responsestr=&Apache::lonnet::hash2str(%responsehash);    my $responsestr=&Apache::lonnet::hash2str(%responsehash);
Line 137  sub end_foilgroup { Line 157  sub end_foilgroup {
       }        }
     } else {      } else {
       my $name;        my $name;
       my ($truecnt,$falsecnt,$max) = &getfoilcounts($parstack,$safeeval);        my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
       my $count=0;        my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
       # we will add in 1 of the true statements   $safeeval,'-2');
       if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }  
       my $answer = int(rand ($count));  
       &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");  
       if ($target eq 'web' || $target eq 'tex') {        if ($target eq 'web' || $target eq 'tex') {
  $result=&displayfoils($target,$max,$answer);   $result=&displayfoils($target,$max,$randomize);
       } elsif ($target eq 'answer' ) {        } elsif ($target eq 'answer' ) {
  $result=&displayanswers($max,$answer);   $result=&displayanswers($max,$randomize);
       } elsif ( $target eq 'grade') {        } elsif ( $target eq 'grade') {
  &grade_response($max,$answer);   &grade_response($max,$randomize);
       }        }
     }      }
   }    }
     if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
         &Apache::lonxml::increment_counter();
     }
   return $result;    return $result;
 }  }
   
 sub getfoilcounts {  sub getfoilcounts {
   my ($parstack,$safeeval)=@_;  
   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');  
   my @names;    my @names;
   my $truecnt=0;    my $truecnt=0;
   my $falsecnt=0;    my $falsecnt=0;
Line 172  sub getfoilcounts { Line 190  sub getfoilcounts {
       $falsecnt++;        $falsecnt++;
     }      }
   }    }
   return ($truecnt,$falsecnt,$max);    return ($truecnt,$falsecnt);
 }  }
   
 sub displayallfoils {  sub displayallfoils {
Line 184  sub displayallfoils { Line 202  sub displayallfoils {
   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);
   &Apache::lonhomework::showhash(%lastresponse);    if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  '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 /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";   $result.="<br />".$Apache::response::foilgroup{$name.'.value'};
       if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }   if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
       $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";    $result.='<b>';
       $temp++;   }
    $result .= $Apache::response::foilgroup{$name.'.text'};
    if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
     $result.='</b>';
    }
         }
       }
     } else {
       foreach my $name (@names) {
         if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
    $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
    if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
    $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
    $temp++;
         }
     }      }
   }    }
   return $result;    return $result;
 }  }
   
 sub whichfoils {  sub whichfoils {
   my ($max,$answer)=@_;    my ($max,$randomize)=@_;
   
   my @truelist;    my @truelist;
   my @falselist;    my @falselist;
   my @whichfalse =();    my @whichfalse =();
     my ($truecnt,$falsecnt) = &getfoilcounts();
     my $count=0;
     # we will add in 1 of the true statements
     if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
     my $answer=int(&Math::Random::random_uniform() * ($count));
     &Apache::lonxml::debug("Count is $count, $answer is $answer");
   my @names;    my @names;
   if ( $Apache::response::foilgroup{'names'} ) {    if ( $Apache::response::foilgroup{'names'} ) {
     @names= @{ $Apache::response::foilgroup{'names'} };        @names= @{ $Apache::response::foilgroup{'names'} };
   }    }
   if (&Apache::response::showallfoils()) {    if (&Apache::response::showallfoils()) {
     @whichfalse=@names;        @whichfalse=@names;
     } elsif ($randomize eq 'no') {
         &Apache::lonxml::debug("No randomization");
         my $havetrue=0;
         foreach my $name (@names) {
     if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
         if (!$havetrue ) {
     push(@whichfalse,$name); $havetrue++; $answer=$#whichfalse;
         }
     } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
         push (@whichfalse,$name);
     } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
     } else {
         &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
     }
         }
   } else {    } else {
       my $current=0;
       &Apache::lonhomework::showhash(%Apache::response::foilgroup);
       my (%top,%bottom);
       #first find out where everyone wants to be
     foreach my $name (@names) {      foreach my $name (@names) {
       #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";   $current++;
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {   if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
  push (@truelist,$name);      push (@truelist,$name);
       } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {      if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
  push (@falselist,$name);   $top{$name}=$current;
       } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {      } elsif ($Apache::response::foilgroup{$name.'.location'} eq 'bottom') {
       } else {   $bottom{$name}=$current;
  &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));      }
       }   } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
       push (@falselist,$name);
       if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
    $top{$name}=$current;
       } elsif ($Apache::response::foilgroup{$name.'.location'} eq 'bottom') {
    $bottom{$name}=$current;
       }
    } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
    } else {
       &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
    }
     }      }
     my $whichtrue = int(rand($#truelist+1));      #pick a true statement
       my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1));
     &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");      &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
     while ((($#whichfalse+1) < $max-1) && ($#falselist > -1)) {      my (@toplist, @bottomlist);
       &Apache::lonxml::debug("Have $#whichfalse max is $max");      my $topcount=0;
       my $afalse=int(rand($#falselist+1));      # assign everyone to either toplist/bottomlist or whichfalse
       &Apache::lonxml::debug("From $#falselist elms, picking $afalse");      # which false is randomized, toplist bottomlist are in order
       $afalse=splice(@falselist,$afalse,1);      while ((($#whichfalse) < $max-2) && ($#falselist > -1)) {
       &Apache::lonxml::debug("Picked $afalse");   &Apache::lonxml::debug("Have $#whichfalse max is $max");
       push (@whichfalse,$afalse);   my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1));
    &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
    $afalse=splice(@falselist,$afalse,1);
    &Apache::lonxml::debug("Picked $afalse");
    &Apache::lonhomework::showhash(('names'=>\@names));
    &Apache::lonhomework::showhash(%top);
    if ($top{$afalse}) {
       $toplist[$top{$afalse}]=$afalse;
       $topcount++;
    } elsif ($bottom{$afalse}) {
       $bottomlist[$bottom{$afalse}]=$afalse;
    } else {
       push (@whichfalse,$afalse);
    }
       }
       my $truename=$truelist[$whichtrue];
       my $dosplice=1;
       #insert the true statement, keeping track of where it wants to be
       if ($Apache::response::foilgroup{$truename.'.location'} eq 'top' ) {
    $toplist[$top{$truename}]=$truename;
    $answer=-1;
    foreach my $top (reverse(@toplist)) {
       if ($top) { $answer++;}
       if ($top eq $truename) { last; }
    }
    $dosplice=0;
       } elsif ($Apache::response::foilgroup{$truename.'.location'} eq 'bottom') {
    $bottomlist[$bottom{$truename}]=$truename;
    $answer=-1;
    foreach my $bot (@bottomlist) {
       if ($bot) { $answer++;}
       if ($bot eq $truename) { last; }
    }
    $answer+=$topcount+$#whichfalse+1;
    $dosplice=0;
       } else {
    if ($topcount>0) { 
     $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1))
       + $topcount;
    }
       }
       #add the top items to the top, bottom items to the bottom
       for (my $i=0;$i<=$#toplist;$i++) {
    if ($toplist[$i]) { unshift(@whichfalse,$toplist[$i]) }
     }      }
     splice(@whichfalse,$answer,0,$truelist[$whichtrue]);      for (my $i=0;$i<=$#bottomlist;$i++) {
     &Apache::lonxml::debug("the true statement is $answer");   if ($bottomlist[$i]) { push(@whichfalse,$bottomlist[$i]) }
       }
       #if the true statement is randomized insert it into the list
       if ($dosplice) { splice(@whichfalse,$answer,0,$truelist[$whichtrue]); }
   }    }
   return @whichfalse;    &Apache::lonxml::debug("Answer is $answer");
     return ($answer,@whichfalse);
 }  }
   
 sub displayfoils {  sub displayfoils {
   my ($target,$max,$answer)=@_;    my ($target,$max,$randomize)=@_;
   my $result;    my $result;
   
   my @whichfoils=&whichfoils($max,$answer);    my ($answer,@whichfoils)=&whichfoils($max,$randomize);
   if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {    my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     my $status=$Apache::inputtags::status[-1];
     if ( ($target ne 'tex') &&
          (($solved =~ /^correct/) || ($status eq  'SHOW_ANSWER')) ) {
     foreach my $name (@whichfoils) {      foreach my $name (@whichfoils) {
       if ($target ne 'tex') {        if ($target ne 'tex') {
   $result.="<br />";    $result.="<br />";
       } else {        } else {
   $result.='\vskip 0 mm ';    $result.='\item \vskip -2 mm  ';
       }        }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {         if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
  $result.='Correct';    if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: \textbf{';}
         } else {
    $result.='Incorrect:';
         }
         if ($target ne 'tex') {
     $result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       } else {        } else {
  $result.='Incorrect';    $result.=$Apache::response::foilgroup{$name.'.text'};
         }
         if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
     if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}
       }        }
       $result.=":".$Apache::response::foilgroup{$name.'.text'}."</input>\n";  
     }      }
   } else {    } else {
     my $temp=0;      my @alphabet = ('A'..'Z');
       my $i = 0;
       my $temp=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=$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);
     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\" ";            my $ValueForInput;
     if ($Apache::lonhomework::type ne 'exam') {$ValueForInput=$temp;} else {$ValueForInput=$alphabet[$temp];}
     $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$ValueForInput\" ";
   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'}."</input>\n";
       } else {        } else {
   $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};    if ($Apache::lonhomework::type eq 'exam') {
         $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
         $i++;
     } else {
         $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
     }
       }        }
       $temp++;        $temp++;
     }      }
Line 278  sub displayfoils { Line 412  sub displayfoils {
 }  }
   
 sub displayanswers {  sub displayanswers {
   my ($max,$answer)=@_;    my ($max,$randomize)=@_;
   my @whichopt = &whichfoils($max,$answer);    my ($answer,@whichopt) = &whichfoils($max,$randomize);
   my $result=&Apache::response::answer_header('radiobuttonresponse');    my $result=&Apache::response::answer_header('radiobuttonresponse');
   foreach my $name (@whichopt) {    foreach my $name (@whichopt) {
     $result.=&Apache::response::answer_part('radiobuttonresponse',      $result.=&Apache::response::answer_part('radiobuttonresponse',
Line 313  sub end_conceptgroup { Line 447  sub end_conceptgroup {
   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') {
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {      if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };        my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int(rand($#names+1));        my $pick=int(&Math::Random::random_uniform() * ($#names+1));
       my $name=$names[$pick];        my $name=$names[$pick];
       push @{ $Apache::response::foilgroup{'names'} }, $name;        push @{ $Apache::response::foilgroup{'names'} }, $name;
       $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};        $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
       $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"};        $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"};
         $Apache::response::foilgroup{"$name.location"} = $Apache::response::conceptgroup{"$name.location"};
       my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);        my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
       $Apache::response::foilgroup{"$name.concept"} = $concept;        $Apache::response::foilgroup{"$name.concept"} = $concept;
       &Apache::lonxml::debug("Selecting $name in $concept");        &Apache::lonxml::debug("Selecting $name in $concept");
         my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
         push(@{ $Apache::hint::radiobutton{"$part_id.concepts"} },$concept);
         $Apache::hint::radiobutton{"$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 343  sub start_foil { Line 482  sub start_foil {
     $result.=&Apache::edit::text_arg('Name:','name',$token);      $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',      $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',
        ['unused','true','false'],$token);         ['unused','true','false'],$token);
       my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
        $safeeval,'-3');
       if ($randomize ne 'no') {
         $result.=&Apache::edit::select_arg('Location:','location',
    ['random','top','bottom'],$token);
       }
     $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();      $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,       my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
   'value','name');    'value','name','location');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }     } 
   return $result;    return $result;
Line 360  sub end_foil { Line 505  sub end_foil {
     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) { $name=$Apache::lonxml::curdepth; }        if (!$name) { $name=$Apache::lonxml::curdepth; }
       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;
  $Apache::response::conceptgroup{"$name.value"} = $value;   $Apache::response::conceptgroup{"$name.value"} = $value;
  $Apache::response::conceptgroup{"$name.text"} = $text;   $Apache::response::conceptgroup{"$name.text"} = $text;
    $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;   $Apache::response::foilgroup{"$name.text"} = $text;
    $Apache::response::foilgroup{"$name.location"} = $location;
       }        }
     }      }
   }    }
Removed from v.1.44  
changed lines
  Added in v.1.65

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