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

Diff for /loncom/interface/lonprintout.pm between versions 1.510 and 1.511

version 1.510, 2007/10/11 22:49:49 version 1.511, 2008/01/14 10:43:12
Line 38  use Apache::grades; Line 38  use Apache::grades;
 use Apache::edit;  use Apache::edit;
 use Apache::File();  use Apache::File();
 use Apache::lonnavmaps;  use Apache::lonnavmaps;
   use Apache::admannotations;
   
 use LONCAPA::map();  use LONCAPA::map();
 use POSIX qw(strftime);  use POSIX qw(strftime);
 use Apache::lonlocal;  use Apache::lonlocal;
Line 70  sub fetch_raw_resource { Line 72  sub fetch_raw_resource {
           
 }  }
   
   #  Fetch the annotations associated with a URL and 
   #  put a centered 'annotations:' title.
   #  This is all suppressed if the annotations are empty.
   #
   sub annotate {
       my ($symb) = @_;
   
       my $annotation_text = &Apache::admannotations::get_annotation($symb, 1);
   
   
       my $result = "";
   
       if (length($annotation_text) > 0) {
    $result .= '\\hspace*{\\fill} \\\\[\\baselineskip] \textbf{Annotations:} \\\\ ';
    $result .= "\n";
    $result .= &Apache::lonxml::latex_special_symbols($annotation_text,""); # Escape latex.
    $result .= "\n\n";
       }
       return $result;
   }
   
 #  #
 #   printf_style_subst  item format_string repl  #   printf_style_subst  item format_string repl
 #    #  
Line 1407  ENDPART Line 1430  ENDPART
  $form{'suppress_tries'}=$parmhash{'suppress_tries'};   $form{'suppress_tries'}=$parmhash{'suppress_tries'};
  $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};   $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  $form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};   $form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
  if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}   $form{'print_annotations'}=$helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
    if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') ||
       ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
       $form{'problem_split'}='yes';
    }
  if ($helper->{'VARS'}->{'curseed'}) {   if ($helper->{'VARS'}->{'curseed'}) {
     $rndseed=$helper->{'VARS'}->{'curseed'};      $rndseed=$helper->{'VARS'}->{'curseed'};
  }   }
Line 1419  ENDPART Line 1446  ENDPART
  $resources_printed .= $currentURL.':';   $resources_printed .= $currentURL.':';
  $texversion.=&Apache::lonnet::ssi($currentURL,%form);   $texversion.=&Apache::lonnet::ssi($currentURL,%form);
   
    #  Add annotations if required:
       
  &Apache::lonxml::clear_problem_counter();   &Apache::lonxml::clear_problem_counter();
   
  &Apache::lonnet::delenv('request.filename');   &Apache::lonnet::delenv('request.filename');
Line 1437  ENDPART Line 1466  ENDPART
  }   }
  $resources_printed .= $currentURL.':';   $resources_printed .= $currentURL.':';
  my $answer=&Apache::lonnet::ssi($currentURL,%form);   my $answer=&Apache::lonnet::ssi($currentURL,%form);
   
   
  if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {   if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
     $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;      $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
  } else {   } else {
Line 1454  ENDPART Line 1485  ENDPART
     }      }
     $texversion.='\vskip 1 mm '.$answer.'\end{document}';      $texversion.='\vskip 1 mm '.$answer.'\end{document}';
  }   }
   
   
   
   
       }
       # Print annotations.
   
   
       if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
    my $annotation .= &annotate($currentURL);
    $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
     }      }
   
   
     if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {      if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
  $texversion=&IndexCreation($texversion,$currentURL);   $texversion=&IndexCreation($texversion,$currentURL);
     }      }
Line 1483  ENDPART Line 1527  ENDPART
  if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}   if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
  $resources_printed .= $currentURL.':';   $resources_printed .= $currentURL.':';
  my $texversion=&Apache::lonnet::ssi($currentURL,%form);   my $texversion=&Apache::lonnet::ssi($currentURL,%form);
    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
       my $annotation = &annotate($currentURL);
       $texversion    =~ s/(\\end{document})/$annotation$1/;
    }
  $result .= $texversion;   $result .= $texversion;
  } elsif ($cleanURL =~/.tex$/) {   } elsif ($cleanURL =~/.tex$/) {
     # For this sort of print of a single LaTeX file,      # For this sort of print of a single LaTeX file,
Line 1490  ENDPART Line 1538  ENDPART
     #      #
   
     $result = &fetch_raw_resource($currentURL);      $result = &fetch_raw_resource($currentURL);
       if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
    my $annotation = &annotate($currentURL);
    $result =~ s/(\\end{document})/$annotation$1/;
       }
   
     $do_postprocessing = 0; # Don't massage the result.      $do_postprocessing = 0; # Don't massage the result.
   
  } else {   } else {
Line 1501  ENDPART Line 1554  ENDPART
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG       ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) {        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) { 
   
   
         #-- produce an output string          #-- produce an output string
  if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {   if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
     $selectionmade = 2;      $selectionmade = 2;
Line 1517  ENDPART Line 1572  ENDPART
  $form{'suppress_tries'}=$parmhash{'suppress_tries'};   $form{'suppress_tries'}=$parmhash{'suppress_tries'};
  $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};   $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  $form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};   $form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
  if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}   $form{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
    if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes')   ||
       ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') ) {
       $form{'problem_split'}='yes';
    }
  my $flag_latex_header_remove = 'NO';   my $flag_latex_header_remove = 'NO';
  my $flag_page_in_sequence = 'NO';   my $flag_page_in_sequence = 'NO';
  my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};   my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
Line 1547  ENDPART Line 1606  ENDPART
     if ($urlp!~m|^/adm/|      if ($urlp!~m|^/adm/|
  && $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {   && $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
  $resources_printed .= $urlp.':';   $resources_printed .= $urlp.':';
   
  &Apache::lonxml::remember_problem_counter();   &Apache::lonxml::remember_problem_counter();
  $texversion.=&Apache::lonnet::ssi($urlp,%form);   $texversion.=&Apache::lonnet::ssi($urlp,%form);
  if ($urlp=~/\.page$/) {   if ($urlp=~/\.page$/) {
Line 1584  ENDPART Line 1642  ENDPART
     $texversion='';      $texversion='';
  }   }
     }      }
   
  }   }
    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
       my $annotation .= &annotate($urlp);
       $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
    }
   
  if ($flag_latex_header_remove ne 'NO') {   if ($flag_latex_header_remove ne 'NO') {
     $texversion = &latex_header_footer_remove($texversion);      $texversion = &latex_header_footer_remove($texversion);
  } else {   } else {
Line 1616  ENDPART Line 1680  ENDPART
  if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}   if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
  $resources_printed .= $urlp.':';   $resources_printed .= $urlp.':';
  my $texversion=&Apache::lonnet::ssi($urlp,%form);   my $texversion=&Apache::lonnet::ssi($urlp,%form);
    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
       my $annotation = &annotate($urlp);
       $texversion =~ s/(\\end{document)/$annotation$1/;
    }
   
  if ($flag_latex_header_remove ne 'NO') {   if ($flag_latex_header_remove ne 'NO') {
     $texversion = &latex_header_footer_remove($texversion);      $texversion = &latex_header_footer_remove($texversion);
  } else {   } else {
Line 1691  ENDPART Line 1760  ENDPART
          $moreenv{'instructor_comments'}='hide';           $moreenv{'instructor_comments'}='hide';
  $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);   $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};   $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
    $moreenv{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
  $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};   $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
  $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};   $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};
  if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}   if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes')  ||
        ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
        $moreenv{'problem_split'}='yes';
    }
  my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');   my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
  my $student_counter=-1;   my $student_counter=-1;
  my $i = 0;   my $i = 0;
Line 2058  sub print_resources { Line 2131  sub print_resources {
     #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.      #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
     #      #
   
   
     foreach my $curresline (@{$master_seq})  {      foreach my $curresline (@{$master_seq})  {
  if (defined $page_breaks{$curresline}) {   if (defined $page_breaks{$curresline}) {
     if($i != 0) {      if($i != 0) {
Line 2065  sub print_resources { Line 2139  sub print_resources {
     }      }
  }   }
  $i++;   $i++;
   
  if ( !($type eq 'problems' &&    if ( !($type eq 'problems' && 
        ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {         ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
     my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);      my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
Line 2103  sub print_resources { Line 2178  sub print_resources {
     $rendered = $header.$body;      $rendered = $header.$body;
  }   }
     }      }
   
       if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
    my $url = &Apache::lonnet::clutter($res_url);
    my $annotation = &annotate($url);
    $rendered =~  s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
       }
     if ($remove_latex_header eq 'YES') {      if ($remove_latex_header eq 'YES') {
  $rendered = &latex_header_footer_remove($rendered);   $rendered = &latex_header_footer_remove($rendered);
     } else {      } else {
Line 2112  sub print_resources { Line 2193  sub print_resources {
  } elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {   } elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
     $printed .= $curresline.':';      $printed .= $curresline.':';
     my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);      my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
       if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
    my $url = &Apache::lonnet::clutter($res_url);
    my $annotation = &annotate($url);
    $annotation    =~ s/(\\end{document})/$annotation$1/;
       }
     if ($remove_latex_header eq 'YES') {      if ($remove_latex_header eq 'YES') {
  $rendered = &latex_header_footer_remove($rendered);   $rendered = &latex_header_footer_remove($rendered);
     } else {      } else {
Line 2949  CHOOSE_FROM_ANY_SEQUENCE Line 3034  CHOOSE_FROM_ANY_SEQUENCE
     Apache::lonhelper::dropdown->new();      Apache::lonhelper::dropdown->new();
     addMessage("</td></tr>");      addMessage("</td></tr>");
   
       # Prompt for printing annotations too.
   
       addMessage("<tr><td align='right'>".
          '<label for="PRINT_ANNOTATIONS_forminput">'.
          &mt('Print Annotations').
          "</label>:</td><td>");
       $paramHash = Apache::lonhelper::getParamHash();
       $paramHash->{'variable'} = "PRINT_ANNOTATIONS";
       $helper->declareVar("PRINT_ANNOTATIONS");
       $paramHash->{CHOICES} = [
        ['No', 'no'],
        ['Yes', 'yes']];
       Apache::lonhelper::dropdown->new();
       addMessage("</td></tr>");
   
     addMessage("<tr><td align = 'right'>  </td><td>");      addMessage("<tr><td align = 'right'>  </td><td>");
     $paramHash = Apache::lonhelper::getParamHash();      $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{'multichoice'} = "true";      $paramHash->{'multichoice'} = "true";
Removed from v.1.510  
changed lines
  Added in v.1.511

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