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

Diff for /loncom/interface/lonprintout.pm between versions 1.476 and 1.486

version 1.476, 2006/08/03 02:36:56 version 1.486, 2006/10/16 10:32:46
Line 23 Line 23
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #  #
 # /home/httpd/html/adm/gpl.txt  # /home/httpd/html/adm/gpl.txt
 #  
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 #  #
Line 50  my %perm; Line 49  my %perm;
 my %parmhash;  my %parmhash;
 my $resources_printed;  my $resources_printed;
   
   #
   #   printf_style_subst  item format_string repl
   #  
   # Does printf style substitution for a format string that
   # can have %[n]item in it.. wherever, %[n]item occurs,
   # rep is substituted in format_string.  Note that
   # [n] is an optional integer length.  If provided,
   # repl is truncated to at most [n] characters prior to 
   # substitution.
   #
   sub printf_style_subst {
       my ($item, $format_string, $repl) = @_;
   
       while ($format_string =~ /%\d*$item/) {
    my $start = $-[0];
    my $end   = $+[0];
    my $len   = $end - $start;
   
    # see if we need to truncate:
   
    my $subst = $repl;
    my $fmt   = substr($format_string, $start, $len);
    my $size  = $fmt;
    $size     =~ s/%(\d*)$item/$1/;
    if ($size ne "") {
       $subst = substr($subst, 0, $size);
    }
    $format_string =~ s/%(\d*)$item/$subst/;
   
       }
   
       return $format_string;
   }
   
   
 # Format a header according to a format.    # Format a header according to a format.  
 #   # 
Line 60  my $resources_printed; Line 93  my $resources_printed;
 #     %n    - Student name.  #     %n    - Student name.
 #  #
 sub format_page_header {  sub format_page_header {
     my ($format, $assignment, $course, $student) = @_;      my ($width, $format, $assignment, $course, $student) = @_;
           
       $width = &recalcto_mm($width); # Get width in mm.
     #  Default format?      #  Default format?
   
     if ($format eq '') {      if ($format eq '') {
    # For the default format, we may need to truncate
    # elements..  To do this we need to get the page width.
    # we assume that each character is about 2mm in width.
    # (correct for the header text size??).  We ignore
    # any formatting (e.g. boldfacing in this).
    # 
    # - Allow the student/course to be one line.
    #   but only truncate the course.
    # - Allow the assignment to be 2 lines (wrapped).
    #
    my $chars_per_line = $width/2; # Character/textline.
   
   
    my $firstline = "$student $course";
    if (length($firstline) > $chars_per_line) {
       my $lastchar = $chars_per_line - length($student) - 1;
       if ($lastchar > 0) {
    $course = substr($course, 0, $lastchar);
       } else { # Nothing left of course:
    $course = '';
       }
    }
    if (length($assignment) > $chars_per_line) {
       $assignment = substr($assignment, 0, $chars_per_line);
    }
   
  $format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";   $format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
   
     } else {      } else {
  $format =~ s/%a/$assignment/g;   # An open question is how to handle long user formatted page headers...
  $format =~ s/%c/$course/g;   # A possible future is to support e.g. %na so that the user can control
  $format =~ s/%n/$student/g;   # the truncation of the elements that can appear in the header.
    #
    $format =  &printf_style_subst("a", $format, $assignment);
    $format =  &printf_style_subst("c", $format, $course);
    $format =  &printf_style_subst("n", $format, $student);
     }      }
           
   
Line 628  my %page_formats= Line 692  my %page_formats=
      '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']       '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']
  },   },
  'album' => {   'album' => {
      '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.83 in','1 cm'],       '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','1 cm'],
      '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']       '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']
  },   },
      },       },
      'legal' => {       'legal' => {
Line 761  sub page_format_transformation { Line 825  sub page_format_transformation {
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     my $header_text  = $parmhash{'print_header_format'};      my $header_text  = $parmhash{'print_header_format'};
     $header_text     = &format_page_header($header_text, $assignment,      $header_text     = &format_page_header($textwidth, $header_text, $assignment,
    $courseidinfo, $name);     $courseidinfo, $name);
     my $topmargintoinsert = '';      my $topmargintoinsert = '';
     if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}      if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
Line 812  sub details_for_menu { Line 876  sub details_for_menu {
     if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }      if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
     my $name_of_resource = &Apache::lonnet::gettitle($postdata);      my $name_of_resource = &Apache::lonnet::gettitle($postdata);
     my $symbolic = &Apache::lonnet::symbread($postdata);      my $symbolic = &Apache::lonnet::symbread($postdata);
       return if ( $symbolic eq '');
   
     my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);      my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
     $map=&Apache::lonnet::clutter($map);      $map=&Apache::lonnet::clutter($map);
     my $name_of_sequence = &Apache::lonnet::gettitle($map);      my $name_of_sequence = &Apache::lonnet::gettitle($map);
Line 1119  sub print_construction_sequence { Line 1185  sub print_construction_sequence {
     # If necessary, encapsulate answer in minipage:      # If necessary, encapsulate answer in minipage:
           
     $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});      $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
     my $body ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';      my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
       $title = &Apache::lonxml::latex_special_symbols($title);
       my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
     $body.=&path_to_problem($urlp,$LaTeXwidth);      $body.=&path_to_problem($urlp,$LaTeXwidth);
     $body.='\vskip 1 mm '.$answer.'\end{document}';      $body.='\vskip 1 mm '.$answer.'\end{document}';
     $body = &encapsulate_minipage($body);      $body = &encapsulate_minipage($body);
Line 1314  ENDPART Line 1382  ENDPART
  } else {   } else {
     $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});      $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
     if ($helper->{'VARS'}->{'construction'} ne '1') {      if ($helper->{'VARS'}->{'construction'} ne '1') {
  $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';   my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
    $title = &Apache::lonxml::latex_special_symbols($title);
    $texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
  $texversion.=&path_to_problem($cleanURL,$LaTeXwidth);   $texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
     } else {      } else {
  $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';   $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
Line 1435  ENDPART Line 1505  ENDPART
     } else {      } else {
  if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {   if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
     $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});      $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
     my $body ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($master_seq[$i]).'}\vskip 0 mm ';      my $title = &Apache::lonnet::gettitle($master_seq[$i]);
       $title = &Apache::lonxml::latex_special_symbols($title);
       my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
     $body   .= &path_to_problem ($urlp,$LaTeXwidth);      $body   .= &path_to_problem ($urlp,$LaTeXwidth);
     $body   .='\vskip 1 mm '.$answer;      $body   .='\vskip 1 mm '.$answer;
     $body    = &encapsulate_minipage($body);      $body    = &encapsulate_minipage($body);
Line 1459  ENDPART Line 1531  ENDPART
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     $prevassignment=$assignment;      $prevassignment=$assignment;
     my $header_text = $parmhash{'print_header_format'};      my $header_text = $parmhash{'print_header_format'};
     $header_text    = &format_page_header($header_text,      $header_text    = &format_page_header($textwidth, $header_text,
   $assignment,     $assignment, 
   $courseidinfo,     $courseidinfo, 
   $name);    $name);
Line 1952  sub print_resources { Line 2024  sub print_resources {
   
           
     my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});      my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
     my $body   ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm ';      my $title = &Apache::lonnet::gettitle($curresline);
     $body     .=&path_to_problem($res_url,$LaTeXwidth);          $title = &Apache::lonxml::latex_special_symbols($title);
       my $body   ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
       $body     .=&path_to_problem($res_url,$LaTeXwidth);
     $body     .='\vskip 1 mm '.$ansrendered;      $body     .='\vskip 1 mm '.$ansrendered;
     $body     = &encapsulate_minipage($body);      $body     = &encapsulate_minipage($body);
     $rendered = $header.$body;      $rendered = $header.$body;
Line 1995  sub print_resources { Line 2069  sub print_resources {
     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}      if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');      my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     my $header_line =      my $header_line =
  &format_page_header($parmhash{'print_header_format'},   &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
     $currentassignment, $courseidinfo, $fullname);      $currentassignment, $courseidinfo, $fullname);
     my $header_start = ($columns_in_format == 1) ? '\lhead'      my $header_start = ($columns_in_format == 1) ? '\lhead'
                                          : '\fancyhead[LO]';                                           : '\fancyhead[LO]';
Line 2116  sub printHelper { Line 2190  sub printHelper {
     $helper->declareVar('FINISHPAGE');      $helper->declareVar('FINISHPAGE');
     $helper->declareVar('PRINT_TYPE');      $helper->declareVar('PRINT_TYPE');
     $helper->declareVar("showallfoils");      $helper->declareVar("showallfoils");
       $helper->declareVar("STUDENTS");
   
     #  The page breaks can get loaded initially from the course environment:      #  The page breaks can get loaded initially from the course environment:
     # But we only do this in the initial state so that they are allowed to change.      # But we only do this in the initial state so that they are allowed to change.
Line 2127  sub printHelper { Line 2202  sub printHelper {
  {'pagebreaks'  => 'scalar',   {'pagebreaks'  => 'scalar',
          'lastprinttype' => 'scalar'});           'lastprinttype' => 'scalar'});
           
       # This will persistently load in the data we want from the
       # very first screen.
           
     if($helper->{VARS}->{PRINT_TYPE} eq $env{'form.lastprinttype'}) {      if($helper->{VARS}->{PRINT_TYPE} eq $env{'form.lastprinttype'}) {
  if (!defined ($env{"form.CURRENT_STATE"})) {   if (!defined ($env{"form.CURRENT_STATE"})) {
Line 2141  sub printHelper { Line 2218  sub printHelper {
   
     }      }
   
       
     # This will persistently load in the data we want from the  
     # very first screen.  
     # Detect whether we're coming from construction space      # Detect whether we're coming from construction space
     if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {      if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
         $helper->{VARS}->{'filename'} = "~$1/$2";          $helper->{VARS}->{'filename'} = "~$1/$2";
Line 2151  sub printHelper { Line 2226  sub printHelper {
     } else {      } else {
         if ($env{'form.postdata'}) {          if ($env{'form.postdata'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});              $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
       if ( $helper->{VARS}->{'symb'} eq '') {
    $helper->{VARS}->{'postdata'} = $env{'form.postdata'};
       }
         }          }
         if ($env{'form.symb'}) {          if ($env{'form.symb'}) {
             $helper->{VARS}->{'symb'} = $env{'form.symb'};              $helper->{VARS}->{'symb'} = $env{'form.symb'};
Line 2178  sub printHelper { Line 2256  sub printHelper {
     my $symb = $helper->{VARS}->{'symb'};      my $symb = $helper->{VARS}->{'symb'};
     my ($map, $id, $url);      my ($map, $id, $url);
     my $subdir;      my $subdir;
       my $is_published=0; # True when printing from resource space.
   
     # Get the resource name from construction space      # Get the resource name from construction space
     if ($helper->{VARS}->{'construction'}) {      if ($helper->{VARS}->{'construction'}) {
Line 2186  sub printHelper { Line 2265  sub printHelper {
         $subdir = substr($helper->{VARS}->{'filename'},          $subdir = substr($helper->{VARS}->{'filename'},
                          0, rindex($helper->{VARS}->{'filename'}, '/') + 1);                           0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
     } else {      } else {
         ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);   if ($symb ne '') {
         $helper->{VARS}->{'postdata'} =       ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
     &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));      $helper->{VARS}->{'postdata'} = 
    &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
    } else {
       $url = $helper->{VARS}->{'postdata'};
       $is_published=1; # From resource space.
    }
    $url = &Apache::lonnet::clutter($url);
   
         if (!$resourceTitle) { # if the resource doesn't have a title, use the filename          if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
             my $postdata = $helper->{VARS}->{'postdata'};              my $postdata = $helper->{VARS}->{'postdata'};
Line 2209  sub printHelper { Line 2294  sub printHelper {
   
     # "Delete everything after the last slash."      # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;      $subdir =~ s|/[^/]+$||;
     if (not $helper->{VARS}->{'construction'}) {  
  $subdir=$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$subdir;  
     }  
     # "Remove all duplicate slashes."  
     $subdir =~ s|/+|/|g;  
   
     # 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.
Line 2254  sub printHelper { Line 2334  sub printHelper {
     "' variable='FINISHPAGE' />";      "' variable='FINISHPAGE' />";
     }      }
   
     if (($helper->{'VARS'}->{'construction'} ne '1') &&      if (($helper->{'VARS'}->{'construction'} ne '1' ) &&
   
  $helper->{VARS}->{'postdata'} &&   $helper->{VARS}->{'postdata'} &&
  $helper->{VARS}->{'assignment'}) {   $helper->{VARS}->{'assignment'}) {
Line 2292  HELPERFRAGMENT Line 2372  HELPERFRAGMENT
   
     # If the user has pfo (print for otheres) allow them to print all       # If the user has pfo (print for otheres) allow them to print all 
     # problems and resources  in the entier course, optionally for selected students      # problems and resources  in the entier course, optionally for selected students
     if ($perm{'pfo'} &&       if ($perm{'pfo'} &&  !$is_published  &&
         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {           ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
   
         push @{$printChoices}, ['Selected <b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];          push @{$printChoices}, ['Selected <b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
Line 2320  HELPERFRAGMENT Line 2400  HELPERFRAGMENT
 ALL_PROBLEMS  ALL_PROBLEMS
   
  if ($helper->{VARS}->{'assignment'}) {   if ($helper->{VARS}->{'assignment'}) {
     push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];      push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];
     push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];      push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
  }   }
   
Line 2367  RESOURCE_SELECTOR Line 2447  RESOURCE_SELECTOR
   
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);          &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">    <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
       <message><b>Select sort order</b> </message>        <message><b>Select sorting order of printout</b> </message>
     <choices variable='student_sort'>      <choices variable='student_sort'>
       <choice computer='0'>Sort by section then student</choice>        <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>        <choice computer='1'>Sort by students across sections.</choice>
Line 2495  CHOOSE_ANON1 Line 2575  CHOOSE_ANON1
   
   
  if ($helper->{VARS}->{'assignment'}) {   if ($helper->{VARS}->{'assignment'}) {
     push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];      push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];
     push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];      push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
  }   }
           
Line 2605  CHOOSE_ANON2 Line 2685  CHOOSE_ANON2
     }      }
   
     # FIXME: That RE should come from a library somewhere.      # FIXME: That RE should come from a library somewhere.
     if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $perm{'pav'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {          if (($perm{'pav'} 
         push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$subdir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];   && $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
    && (defined($helper->{'VARS'}->{'construction'})
       ||
       (&Apache::lonnet::allowed('bre',$subdir) eq 'F'
        && 
        $helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)
       )) 
    && $helper->{VARS}->{'assignment'} eq ""
    ) {
   
         my $f = '$filename';   my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
           push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$pretty_dir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;          my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
   <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">    <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$pretty_dir</small></b> to print">
   
     <files variable="FILES" multichoice='1'>      <files variable="FILES" multichoice='1'>
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
Line 2631  CHOOSE_FROM_SUBDIR Line 2720  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
     if (!$helper->{VARS}->{'construction'}) {      if (!$helper->{VARS}->{'construction'} && !$is_published) {
  push @$printChoices, ["Selected <b>Resources</b> from <b>selected folder</b> in course",   push @$printChoices, ["Selected <b>Resources</b> from <b>selected folder</b> in course",
       'select_sequences', 'CHOOSE_SEQUENCE'];        'select_sequences', 'CHOOSE_SEQUENCE'];
  my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};   my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
Removed from v.1.476  
changed lines
  Added in v.1.486

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