Diff for /loncom/interface/lonprintout.pm between versions 1.166 and 1.173

version 1.166, 2003/05/14 13:10:11 version 1.173, 2003/05/15 13:32:02
Line 486  ENDPART Line 486  ENDPART
         }          }
         $moreenv{'request.filename'}=$ENV{'form.url'};          $moreenv{'request.filename'}=$ENV{'form.url'};
  my %form;   my %form;
         $from{'textwidth'}=$LaTeXwidth;          $form{'textwidth'}=$LaTeXwidth;
         $form{'grade_target'}='tex';          $form{'grade_target'}='tex';
         &Apache::lonnet::appenv(%moreenv);          &Apache::lonnet::appenv(%moreenv);
         my $texversion=&Apache::lonnet::ssi($ENV{'form.url'},%form);          my $texversion=&Apache::lonnet::ssi($ENV{'form.url'},%form);
Line 1375  ENDPART Line 1375  ENDPART
     my %form;      my %form;
     $form{'grade_target'}='tex';      $form{'grade_target'}='tex';
     $form{'textwidth'}=$LaTeXwidth;      $form{'textwidth'}=$LaTeXwidth;
       my $rndseed=time;
       $form{'rndseed'}=$rndseed;
     &Apache::lonnet::appenv(%moreenv);      &Apache::lonnet::appenv(%moreenv);
     my $texversion=&Apache::lonnet::ssi($currentURL,$form);      my $texversion=&Apache::lonnet::ssi($currentURL,%form);
     &Apache::lonnet::delenv('form.counter');      &Apache::lonnet::delenv('form.counter');
     &Apache::lonnet::delenv('request.filename');      &Apache::lonnet::delenv('request.filename');
     if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {      if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
  my %form;   my %form;
  $form{'grade_target'}='answer';   $form{'grade_target'}='answer';
  $form{'print_answer'}='yes';   $form{'answer_output_mode'}='tex';
    $form{'rndseed'}=$rndseed;
  my $answer=&Apache::lonnet::ssi($currentURL,%form);   my $answer=&Apache::lonnet::ssi($currentURL,%form);
 # $r->print('<pre>'.$answer.'</pre>'); return OK;   $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
  $texversion=~s/(\\end{document})/$answer$1/;  
     }      }
     $result .= $texversion;      $result .= $texversion;
     if ($currentURL=~m/\.page\s*$/) {      if ($currentURL=~m/\.page\s*$/) {
Line 1417  ENDPART Line 1419  ENDPART
     } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {      } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
  $selectionmade = 4;   $selectionmade = 4;
     }      }
     my %form;      my %form;   
     $form{'grade_target'}='tex';      $form{'grade_target'}='tex';
     $form{'textwidth'}=$LaTeXwidth;      $form{'textwidth'}=$LaTeXwidth;
     $form{'symb'}=$master_seq[$i];      $form{'symb'}=$master_seq[$i];
Line 1434  ENDPART Line 1436  ENDPART
     } else {      } else {
  $texversion =~ s/\\end{document}//;   $texversion =~ s/\\end{document}//;
     }      }
       if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
    my %form;
    $form{'grade_target'}='answer';
    $form{'answer_output_mode'}='tex';
    my $answer=&Apache::lonnet::ssi($urlp,%form);
    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
       }
     $result .= $texversion;               $result .= $texversion;         
     $flag_latex_header_remove = 'YES';         $flag_latex_header_remove = 'YES';   
  }   }
Line 1468  ENDPART Line 1477  ENDPART
  } else {   } else {
     $rendered =~ s/\\end{document}//;      $rendered =~ s/\\end{document}//;
  }   }
    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
       my %form;
       $form{'answer_output_mode'}='tex';
       my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,
         $ENV{'request.course.id'},%form);
       $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
    }
  $current_output .= $rendered;   $current_output .= $rendered;
     }      }
     $flag_latex_header_remove = 'YES';      $flag_latex_header_remove = 'YES';
Line 1826  HELPERFRAGMENT Line 1842  HELPERFRAGMENT
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);          &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">    <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
     <message>(mark them then click "next" button) <br /></message>      <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1">      <resource variable="RESOURCES" multichoice="1" suppressEmptySequences='1'>
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblemOrMap</filterfunc>        <filterfunc>return $isProblemOrMap</filterfunc>
       <choicefunc>return $isProblem</choicefunc>        <choicefunc>return $isProblem</choicefunc>
Line 1888  CHOOSE_FROM_SUBDIR Line 1904  CHOOSE_FROM_SUBDIR
     $paramHash->{CHOICES} = $printChoices;      $paramHash->{CHOICES} = $printChoices;
     Apache::lonhelper::choices->new();      Apache::lonhelper::choices->new();
   
     if ($ENV{'request.role.adv'}) {      if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
    ($helper->{VARS}->{'construction'} eq '1')) {
         $paramHash = Apache::lonhelper::getParamHash();          $paramHash = Apache::lonhelper::getParamHash();
         $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users:</i></b></big><br />";          $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users:</i></b></big><br />";
         Apache::lonhelper::message->new();          Apache::lonhelper::message->new();

Removed from v.1.166  
changed lines
  Added in v.1.173


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