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

Diff for /loncom/homework/optionresponse.pm between versions 1.45 and 1.47

version 1.45, 2002/08/05 15:55:39 version 1.47, 2002/09/26 20:45:00
Line 1 Line 1
 # The LearningOnline Network with CAPA  # LearningOnline Network with CAPA
 # option list style responses  # option list style responses
 #  #
 # $Id$  # $Id$
Line 243  sub whichfoils { Line 243  sub whichfoils {
     if (&Apache::response::showallfoils()) {      if (&Apache::response::showallfoils()) {
       $aopt=0;        $aopt=0;
     } else {      } else {
       $aopt=int(rand($#names+1));        $aopt=int(&Math::Random::random_uniform() * ($#names+1));
     }      }
     &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");      &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);      $aopt=splice(@names,$aopt,1);
Line 281  sub displayfoils { Line 281  sub displayfoils {
     foreach $name (@whichopt) {      foreach $name (@whichopt) {
       if ($target eq 'web') {        if ($target eq 'web') {
   $result.="<br />";    $result.="<br />";
         } elsif ($target eq 'tex') {
     $result.='\vskip 0 mm ';
         }
         if ($target ne 'tex') {
     $result .=$Apache::response::foilgroup{$name.'.value'}.
         ":".$Apache::response::foilgroup{$name.'.text'}."\n";
         } else {
      $result .='\item '.$Apache::response::foilgroup{$name.'.value'}.
         ":".$Apache::response::foilgroup{$name.'.text'}."\n";
       }        }
       $result .=$Apache::response::foilgroup{$name.'.value'}.  
   ":".$Apache::response::foilgroup{$name.'.text'}."\n";  
     }      }
   } else {    } else {
     my $temp=1;      my $temp=1;
Line 309  sub displayfoils { Line 316  sub displayfoils {
               my $texoptionlist = $optionlist;                my $texoptionlist = $optionlist;
       $texoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;        $texoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
       $texoptionlist =~ s/<option>/{\\bf /g;        $texoptionlist =~ s/<option>/{\\bf /g;
         $texoptionlist =~ s/<option selected="on">/{\\bf /g;
       $texoptionlist =~ s/<\/option>/},/g;        $texoptionlist =~ s/<\/option>/},/g;
       $texoptionlist =~ s/,$/\./g;        $texoptionlist =~ s/,$/\./g;
       $texoptionlist =~ s/>/\$>\$/g;        $texoptionlist =~ s/>/\$>\$/g;
       $texoptionlist =~ s/</\$<\$/g;        $texoptionlist =~ s/</\$<\$/g;
       $texoptionlist =~ s/=/\$=\$/g;        $texoptionlist =~ s/=/\$=\$/g;
       $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};        if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
     $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
         } else {
     $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
         }
       $displayoptionintex=1;        $displayoptionintex=1;
   } else {    } else {
       $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};        if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
     $result.= $Apache::response::foilgroup{$name.'.text'};
         } else {
     $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
         }
   }    }
       }         } 
     }      }
Line 357  sub end_conceptgroup { Line 373  sub end_conceptgroup {
     #if not there aren't any foils to display and thus no question      #if not there aren't any foils to display and thus no question
     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.value"} =        $Apache::response::foilgroup{"$name.value"} =
Line 434  sub end_foil { Line 450  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;   $Apache::response::conceptgroup{"$name.text"} = $text;
       } else {        } else {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
         if ($target eq 'tex') {          if ($target eq 'tex') {
     $Apache::response::foilgroup{"$name.value"} = '\item '.$value;      $Apache::response::foilgroup{"$name.text"} = '\item '.$text;
  } else {   } else {
     $Apache::response::foilgroup{"$name.value"} = $value;      $Apache::response::foilgroup{"$name.value"} = $value;
       $Apache::response::foilgroup{"$name.text"} = $text;
  }   }
  $Apache::response::foilgroup{"$name.text"} = $text;  
       }        }
     }      }
   }    }
Removed from v.1.45  
changed lines
  Added in v.1.47

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