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

Diff for /loncom/interface/lonprintout.pm between versions 1.238 and 1.252

version 1.238, 2003/09/25 18:16:04 version 1.252, 2003/10/06 13:19:57
Line 611  sub IndexCreation { Line 611  sub IndexCreation {
     return $texversion;      return $texversion;
 }  }
   
   sub print_latex_header {
       my $mode=shift;
       my $output='\documentclass[letterpaper]{article}';
       if ($mode eq 'batchmode') {
    $output.='\batchmode';
       }
       $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'.
        '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'.
        '\usepackage[dvips]{graphicx}\usepackage{epsfig}\usepackage{calc}'.
        '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'.
        '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'.
        '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'.
        '\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}'.
        '\setlength{\abovedisplayshortskip}{-0.04in}'.
        '\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
        '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large'.
        '\textbf{Index}} \newline \setlength{\rightmargin}{0in}'.
        '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}'.
        '\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}'.
        '\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}'.
        '\setlength{\abovedisplayshortskip}{-0.04in}'.
        '\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}\begin{document}';
       return $output;     
   }
   
   sub path_to_problem {
       my ($urlp,$LaTeXwidth)=@_;
       my $newurlp = '';
       $LaTeXwidth=~s/\s*mm\s*$//;
       my $HowMany = length($urlp)*2;
       if ($HowMany > $LaTeXwidth) {
    my @temporrary = split '/',$urlp;
    my $HowManyNew = 0;
    for (my $ii=0;$ii<=$#temporrary;$ii++) {
       if ($temporrary[$ii] ne '') {
    $HowManyNew += length($temporrary[$ii])*2;
    if ($HowManyNew < $LaTeXwidth ) {
       $newurlp .=  '/'.$temporrary[$ii];
    } else {
       $HowManyNew = 0;
       $newurlp .=  '|\vskip -1 mm \noindent \verb|';
       $ii--;
    }
       }
    }
       }
       return '{\small\noindent\verb|'.$newurlp.'|\vskip 0 mm}';
   }
   
 sub output_data {  sub output_data {
     my ($r,$helper,$rparmhash) = @_;      my ($r,$helper,$rparmhash) = @_;
Line 655  ENDPART Line 703  ENDPART
     $currentURL=$helper->{'VARS'}->{'postdata'};      $currentURL=$helper->{'VARS'}->{'postdata'};
  } else {   } else {
             #prints resource from the construction space              #prints resource from the construction space
     $currentURL=$helper->{'VARS'}->{'filename'};      $currentURL='/'.$helper->{'VARS'}->{'filename'};
     $currentURL=~s/\/home\//\/~/;  
     $currentURL=~s/public_html\///;  
     if ($currentURL=~/([^?]+)/) {$currentURL=$1;}      if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
  }   }
  $selectionmade = 1;   $selectionmade = 1;
  if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {   if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
     my %moreenv;  
     $moreenv{'request.filename'}=$currentURL;  
     my %form;  
     $form{'grade_target'}='tex';  
     $form{'textwidth'}=$LaTeXwidth;  
     $form{'problem_split'}=$parmhash{'problem_stream_switch'};  
     $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};  
     my $rndseed=time;      my $rndseed=time;
     if ($helper->{'VARS'}->{'curseed'}) {      my $texversion='';
  $rndseed=$helper->{'VARS'}->{'curseed'};      if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
    my %moreenv;
    $moreenv{'request.filename'}=$currentURL;
    my %form;
    $form{'grade_target'}='tex';
    $form{'textwidth'}=$LaTeXwidth;
    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
    if ($helper->{'VARS'}->{'curseed'}) {
       $rndseed=$helper->{'VARS'}->{'curseed'};
    }
    $form{'rndseed'}=$rndseed;
    &Apache::lonnet::appenv(%moreenv);
    &Apache::lonnet::delenv('form.counter');
    &Apache::lonxml::init_counter();
    $texversion=&Apache::lonnet::ssi($currentURL,%form);
    &Apache::lonnet::delenv('form.counter');
    &Apache::lonnet::delenv('request.filename');
     }      }
     $form{'rndseed'}=$rndseed;      if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
     &Apache::lonnet::appenv(%moreenv);         ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
     &Apache::lonnet::delenv('form.counter');  
     &Apache::lonxml::init_counter();  
     my $texversion=&Apache::lonnet::ssi($currentURL,%form);  
     &Apache::lonnet::delenv('form.counter');  
     &Apache::lonnet::delenv('request.filename');  
     if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {  
  my %form;   my %form;
  $form{'grade_target'}='answer';   $form{'grade_target'}='answer';
  $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);
  $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;   if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
       $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
    } else {
       $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
       if ($helper->{'VARS'}->{'construction'} ne '1') {
    $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
    $texversion.=&path_to_problem ($currentURL,$LaTeXwidth);
       } else {
    $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
    my $URLpath=$currentURL;
    $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
    $texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
       }
       $texversion.='\vskip 1 mm '.$answer.'\end{document}';
    }
     }      }
     if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {      if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
  $texversion=&IndexCreation($texversion,$currentURL);   $texversion=&IndexCreation($texversion,$currentURL);
Line 712  ENDPART Line 776  ENDPART
  $Apache::lonratedt::resources[$Apache::lonratedt::order[$member]]=~/^([^:]*):([^:]*):/;   $Apache::lonratedt::resources[$Apache::lonratedt::order[$member]]=~/^([^:]*):([^:]*):/;
  my $urlp=$2;   my $urlp=$2;
  if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {   if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
     my %form;      my $texversion='';
     $form{'grade_target'}='tex';      if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
     $form{'textwidth'}=$LaTeXwidth;   my %form;
     $form{'problem_split'}=$parmhash{'problem_stream_switch'};   $form{'grade_target'}='tex';
     $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};   $form{'textwidth'}=$LaTeXwidth;
     $form{'rndseed'}=$rndseed;   $form{'problem_split'}=$parmhash{'problem_stream_switch'};
     my $texversion=&Apache::lonnet::ssi($urlp,%form);   $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
     if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {   $form{'rndseed'}=$rndseed;
    $texversion=&Apache::lonnet::ssi($urlp,%form);
       }
       if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
          ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && 
          ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
  my %form;   my %form;
  $form{'grade_target'}='answer';   $form{'grade_target'}='answer';
  $form{'answer_output_mode'}='tex';   $form{'answer_output_mode'}='tex';
  $form{'rndseed'}=$rndseed;   $form{'rndseed'}=$rndseed;
                         if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';}                          if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';}
  ####my $answer=' SSSSSS '.$ENV{'request.state'}.' FFFFFFF ';  
  my $answer=&Apache::lonnet::ssi($urlp,%form);   my $answer=&Apache::lonnet::ssi($urlp,%form);
  $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;   if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
       $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
    } else {
       $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
       $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
       $texversion.=&path_to_problem ($currentURL,$LaTeXwidth);
       $texversion.='\vskip 1 mm '.$answer.'\end{document}';
    }
     }      }
     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);
Line 761  ENDPART Line 836  ENDPART
  }   }
     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) {                ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') or
        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) { 
         #-- produce an output string          #-- produce an output string
  my %form=();      my %form=();   
  $form{'grade_target'}='tex';   $form{'grade_target'}='tex';
Line 787  ENDPART Line 863  ENDPART
     $form{'symb'}=$master_seq[$i];      $form{'symb'}=$master_seq[$i];
     my ($sequence)=&Apache::lonnet::decode_symb($master_seq[$i]);      my ($sequence)=&Apache::lonnet::decode_symb($master_seq[$i]);
     my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem      my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
       if ($i==0) {$prevassignment=$assignment;}
     #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");      #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
     my $texversion=&Apache::lonnet::ssi($urlp,%form);      my $texversion=&Apache::lonnet::ssi($urlp,%form);
     if ($urlp=~/\.page$/) {      if ($urlp=~/\.page$/) {
Line 795  ENDPART Line 872  ENDPART
  $texversion =~ s/\\end{document}\d*/\\end{document}/;   $texversion =~ s/\\end{document}\d*/\\end{document}/;
  $flag_page_in_sequence = 'YES';   $flag_page_in_sequence = 'YES';
     }       } 
     if ($flag_latex_header_remove ne 'NO') {      if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
  $texversion = &latex_header_footer_remove($texversion);         ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
     } else {  
  $texversion =~ s/\\end{document}//;  
     }  
     if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {  
  my %form;   my %form;
  $form{'grade_target'}='answer';   $form{'grade_target'}='answer';
  $form{'answer_output_mode'}='tex';   $form{'answer_output_mode'}='tex';
  my $answer=&Apache::lonnet::ssi($urlp,%form);   my $answer=&Apache::lonnet::ssi($urlp,%form);
  $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;   if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
       $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
    } else {
       if ($urlp=~/\.(problem|exam|quiz|library)$/) {
    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
    $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($urlp).'}\vskip 0 mm ';
    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
    $texversion.='\vskip 1 mm '.$answer;
       } else {
    $texversion='';
       }
    }
       }
       if ($flag_latex_header_remove ne 'NO') {
    $texversion = &latex_header_footer_remove($texversion);
       } else {
    $texversion =~ s/\\end{document}//;
     }      }
     if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {      if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
  $texversion=&IndexCreation($texversion,$urlp);   $texversion=&IndexCreation($texversion,$urlp);
     }      }
     if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) {      if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
  my ($name,$courseidinfo) = &get_name;   my $name = &get_name();
  $courseidinfo = &get_course();   my $courseidinfo = &get_course();
  if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }   if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
  $prevassignment=$assignment;   $prevassignment=$assignment;
  $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';   $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
Line 850  ENDPART Line 939  ENDPART
     if (&Apache::lonnet::allowed('bre',$res_url)) {      if (&Apache::lonnet::allowed('bre',$res_url)) {
  my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,   my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
                                                                         $ENV{'request.course.id'},'tex');                                                                          $ENV{'request.course.id'},'tex');
  if ($flag_latex_header_remove eq 'YES') {   if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
     $rendered = &latex_header_footer_remove($rendered);     ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
  } else {  
     $rendered =~ s/\\end{document}//;  
  }  
  if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {  
     my %form;      my %form;
     $form{'answer_output_mode'}='tex';      $form{'answer_output_mode'}='tex';
     $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};      $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
     my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);      my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
     $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;      if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
       } else {
    $rendered=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
    $rendered.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm ';
    $rendered.=&path_to_problem ($curresline,$LaTeXwidth);
    $rendered.='\vskip 1 mm '.$ansrendered;
       }
    }
    if ($flag_latex_header_remove eq 'YES') {
       $rendered = &latex_header_footer_remove($rendered);
    } else {
       $rendered =~ s/\\end{document}//;
  }   }
  $current_output .= $rendered;   $current_output .= $rendered;
     }      }
Line 909  ENDPART Line 1006  ENDPART
     $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') {   if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
      ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
     my %form;      my %form;
     $form{'grade_target'}='answer';      $form{'grade_target'}='answer';
     $form{'answer_output_mode'}='tex';      $form{'answer_output_mode'}='tex';
     $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};      $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
     $form{'rndseed'}=$rndseed;      $form{'rndseed'}=$rndseed;
     my $answer=&Apache::lonnet::ssi($urlp,%form);      my $answer=&Apache::lonnet::ssi($urlp,%form);
     $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;      if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
  }   $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
                 #this chunck is responsible for printing the path to problem      } else {
  my $newurlp = '';      $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
  my $HowMany = length($urlp)*2;      if ($helper->{'VARS'}->{'construction'} ne '1') {
  if ($HowMany > $LaTeXwidth) {   $texversion.='\vskip 0 mm \noindent ';
     my @temporrary = split '/',$urlp;   $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
     my $HowManyNew = 0;      } else {
     for (my $ii=0;$ii<=$#temporrary;$ii++) {   $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
  if ($temporrary[$ii] ne '') {   my $URLpath=$urlp;
     $HowManyNew += length($temporrary[$ii])*2;   $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
     if ($HowManyNew < $LaTeXwidth ) {   $texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
  $newurlp .=  '/'.$temporrary[$ii];  
     } else {  
  $HowManyNew = 0;  
  $newurlp .=  '|\vskip -1 mm \noindent \verb|';  
  $ii--;  
     }  
  }  
     }      }
       $texversion.='\vskip 1 mm '.$answer.'\end{document}';
  }   }
  $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;   }
                   #this chunck is responsible for printing the path to problem
    my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
    $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
  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 1047  sub printHelper { Line 1142  sub printHelper {
   
     if ($r->header_only) {      if ($r->header_only) {
         if ($ENV{'browser.mathml'}) {          if ($ENV{'browser.mathml'}) {
             $r->content_type('text/xml');              &Apache::loncommon::content_type($r,'text/xml');
         } else {          } else {
             $r->content_type('text/html');              &Apache::loncommon::content_type($r,'text/html');
         }          }
         $r->send_http_header;          $r->send_http_header;
         return OK;          return OK;
Line 1057  sub printHelper { Line 1152  sub printHelper {
   
     # Send header, nocache      # Send header, nocache
     if ($ENV{'browser.mathml'}) {      if ($ENV{'browser.mathml'}) {
         $r->content_type('text/xml');          &Apache::loncommon::content_type($r,'text/xml');
     } else {      } else {
         $r->content_type('text/html');          &Apache::loncommon::content_type($r,'text/html');
     }      }
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
     $r->send_http_header;      $r->send_http_header;
Line 1148  sub printHelper { Line 1243  sub printHelper {
     # "Remove all duplicate slashes."      # "Remove all duplicate slashes."
     $subdir =~ s|/+|/|g;      $subdir =~ s|/+|/|g;
   
     # If it's a ~ directory, convert back to /home/user/public_html  
     $subdir =~ s/^~(\w+)\//\/home\/$1\/public_html\//;  
   
     # What can be printed is a very dynamic decision based on      # What can be printed is a very dynamic decision based on
     # lots of factors. So we need to dynamically build this list.      # lots of factors. So we need to dynamically build this list.
     # To prevent security leaks, states are only added to the wizard      # To prevent security leaks, states are only added to the wizard
Line 1165  sub printHelper { Line 1257  sub printHelper {
     my $printChoices = [];      my $printChoices = [];
     my $paramHash;      my $paramHash;
   
     if ($resourceTitle && $helper->{VARS}->{'postdata'}) {      if ($resourceTitle) {
         push @{$printChoices}, ["<b>$resourceTitle</b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];          push @{$printChoices}, ["<b>$resourceTitle</b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
     }      }
   
Line 1189  sub printHelper { Line 1281  sub printHelper {
   
     # If we're in a sequence...      # If we're in a sequence...
     if (($helper->{'VARS'}->{'construction'} ne '1') &&      if (($helper->{'VARS'}->{'construction'} ne '1') &&
  $helper->{VARS}->{'postdata'} && $sequenceTitle) {   $helper->{VARS}->{'postdata'} &&
    $helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence          # Allow problems from sequence
         push @{$printChoices}, ["<b>Problems</b> in $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS'];          push @{$printChoices}, ["<b>Problems</b> in $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence          # Allow all resources from sequence
Line 1224  HELPERFRAGMENT Line 1317  HELPERFRAGMENT
     # problems in the course, optionally for selected students      # problems in the course, optionally for selected students
     if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) {       if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) { 
         push @{$printChoices}, ['Problems from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];          push @{$printChoices}, ['Problems from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
  if ($sequenceTitle) {   if ($helper->{VARS}->{'assignment'}) {
     push @{$printChoices}, ["Problems from $sequenceTitle for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];      push @{$printChoices}, ["Problems from $sequenceTitle for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
  }   }
   
Line 1286  CHOOSE_FROM_SUBDIR Line 1379  CHOOSE_FROM_SUBDIR
   
     # Allow the user to select any sequence in the course, feed it to      # Allow the user to select any sequence in the course, feed it to
     # another resource selector for that sequence      # another resource selector for that sequence
     push @$printChoices, ["Resources from <b>selected sequence</b> in course",      if (!$helper->{VARS}->{'construction'}) {
                           'map_problems_pages', 'CHOOSE_SEQUENCE'];   push @$printChoices, ["Resources from <b>selected sequence</b> in course",
     &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);        'select_sequences', 'CHOOSE_SEQUENCE'];
    my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
    #Escape apostrophes and backslashes for Perl
    $escapedSequenceName =~ s/\\/\\\\/g;
    $escapedSequenceName =~ s/'/\\'/g;
    &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
   <state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">    <state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">
     <message>Select the sequence to print resources from:</message>      <message>Select the sequence to print resources from:</message>
     <resource variable="SEQUENCE">      <resource variable="SEQUENCE">
Line 1302  CHOOSE_FROM_SUBDIR Line 1400  CHOOSE_FROM_SUBDIR
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1">      <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1">
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblem</filterfunc>        <filterfunc>return $isProblem</filterfunc>
       <mapurl evaluate='1'>return $helper->{VARS}->{'SEQUENCE'};</mapurl>        <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>        <valuefunc>return $symbFilter;</valuefunc>
       </resource>        </resource>
     </state>      </state>
 CHOOSE_FROM_ANY_SEQUENCE  CHOOSE_FROM_ANY_SEQUENCE
   }
   
     # Generate the first state, to select which resources get printed.      # Generate the first state, to select which resources get printed.
     Apache::lonhelper::state->new("START", "Select Printing Options:");      Apache::lonhelper::state->new("START", "Select Printing Options:");
Line 1324  CHOOSE_FROM_ANY_SEQUENCE Line 1423  CHOOSE_FROM_ANY_SEQUENCE
   
     if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or       if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
  ($helper->{VARS}->{'construction'} eq '1')) {   ($helper->{VARS}->{'construction'} eq '1')) {
  addMessage("<hr width='33%' /><table><tr><td align='right'>Print With Answers:</td><td>");   addMessage("<hr width='33%' /><table><tr><td align='right'>Print: </td><td>");
         $paramHash = Apache::lonhelper::getParamHash();          $paramHash = Apache::lonhelper::getParamHash();
  $paramHash->{'variable'} = 'ANSWER_TYPE';      $paramHash->{'variable'} = 'ANSWER_TYPE';   
  $helper->declareVar('ANSWER_TYPE');            $helper->declareVar('ANSWER_TYPE');         
         $paramHash->{CHOICES} = [          $paramHash->{CHOICES} = [
                                    ['No', 'yes'],                                     ['Without Answers', 'yes'],
                                    ['Yes', 'no'] ];                                     ['With Answers', 'no'],
                                      ['Only Answers', 'only'] ];
         Apache::lonhelper::dropdown->new();          Apache::lonhelper::dropdown->new();
  addMessage("</td></tr>");   addMessage("</td></tr>");
  $startedTable = 1;   $startedTable = 1;
Removed from v.1.238  
changed lines
  Added in v.1.252

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