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

Diff for /loncom/interface/lonprintout.pm between versions 1.169 and 1.176

version 1.169, 2003/05/14 17:33:59 version 1.176, 2003/05/15 16:16:36
Line 1041  sub character_chart { Line 1041  sub character_chart {
     sub page_format {      sub page_format {
  my ($papersize,$layout,$numberofcolumns) = @_;    my ($papersize,$layout,$numberofcolumns) = @_; 
  my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);   my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);
   
   
  if ($papersize=~/Letter/) {   if ($papersize=~/Letter/) {
     if ($layout eq 'CAPA') {      if ($layout eq 'CAPA') {
  if ($numberofcolumns == 1) {   if ($numberofcolumns == 1) {
Line 1387  ENDPART Line 1389  ENDPART
  $form{'answer_output_mode'}='tex';   $form{'answer_output_mode'}='tex';
  $form{'rndseed'}=$rndseed;   $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 1420  ENDPART Line 1421  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 1437  ENDPART Line 1438  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 1471  ENDPART Line 1479  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 1498  ENDPART Line 1513  ENDPART
  $selectionmade = 6;   $selectionmade = 6;
         my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};          my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
  @list_of_files=sort @list_of_files;   @list_of_files=sort @list_of_files;
  my $flag_latex_header_remove = 'NO';     my $flag_latex_header_remove = 'NO'; 
    my $rndseed=time;
  for (my $i=0;$i<=$#list_of_files;$i++) {   for (my $i=0;$i<=$#list_of_files;$i++) {
     my $urlp = $list_of_files[$i];      my $urlp = $list_of_files[$i];
     if ($urlp=~/\//) {      if ($urlp=~/\//) {
  my %form;   my %form;
  $form{'grade_target'}='tex';   $form{'grade_target'}='tex';
  $form{'textwidth'}=$LaTeXwidth;   $form{'textwidth'}=$LaTeXwidth;
    $form{'rndseed'}=$rndseed;
  if ($urlp =~ m|/home/([^/]+)/public_html|) {   if ($urlp =~ m|/home/([^/]+)/public_html|) {
     $urlp =~ s|/home/([^/]*)/public_html|/~$1|;      $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
  } else {   } else {
     $urlp =~ s|^/home/httpd/html||;      $urlp =~ s|^/home/httpd/html||;
  }   }
  my $texversion=&Apache::lonnet::ssi($urlp,%form);   my $texversion=&Apache::lonnet::ssi($urlp,%form);
    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
       my %form;
       $form{'grade_target'}='answer';
       $form{'answer_output_mode'}='tex';
       $form{'rndseed'}=$rndseed;
       my $answer=&Apache::lonnet::ssi($urlp,%form);
       $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
    }
                 #this chunck is responsible for printing the path to problem                  #this chunck is responsible for printing the path to problem
  my $newurlp = '';   my $newurlp = '';
  my $HowMany = length($urlp)*2;   my $HowMany = length($urlp)*2;
Line 1540  ENDPART Line 1565  ENDPART
     }      }
     $flag_latex_header_remove = 'YES';        $flag_latex_header_remove = 'YES';  
  }   }
    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\typeout)/ RANDOM SEED IS $rndseed $1/;}
  $result .= '\end{document}';         $result .= '\end{document}';      
     }      }
 #-------------------------------------------------------- corrections for the different page formats  #-------------------------------------------------------- corrections for the different page formats
Line 1693  sub printHelper { Line 1719  sub printHelper {
   
     Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});      Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
           
     my $helper = Apache::lonhelper::helper->new("Printing Wizard");      my $helper = Apache::lonhelper::helper->new("Printing Helper");
     $helper->declareVar('symb');      $helper->declareVar('symb');
     $helper->declareVar('postdata');          $helper->declareVar('postdata');    
     $helper->declareVar('filename');      $helper->declareVar('filename');
Line 1829  HELPERFRAGMENT Line 1855  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 1891  CHOOSE_FROM_SUBDIR Line 1917  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.169  
changed lines
  Added in v.1.176

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