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

Diff for /loncom/interface/lonprintout.pm between versions 1.627.2.32 and 1.627.2.32.2.5

version 1.627.2.32, 2022/02/10 07:42:45 version 1.627.2.32.2.5, 2023/02/03 01:20:30
Line 143  sub printable_sequence { Line 143  sub printable_sequence {
 # Parameters:  # Parameters:
 #    helper - the helper which already contains info about the current folder we can  #    helper - the helper which already contains info about the current folder we can
 #             purloin.  #             purloin.
 #    url    - Top url of the sequence  #    map    - the map for which incomplete problems are to be printed
   #    nocurrloc - True if printout called from icon/link in Tools in /adm/navmaps
 # Return:  # Return:
 #     XML that can be parsed by the helper to drive the state machine.  #     XML that can be parsed by the helper to drive the state machine.
 #  #
 sub create_incomplete_folder_selstud_helper {  sub create_incomplete_folder_selstud_helper {
     my ($helper, $map)  = @_;      my ($helper, $map, $nocurrloc)  = @_;
   
   
     my $symbFilter = '$res->shown_symb()';      my $symbFilter = '$res->shown_symb()';
Line 157  sub create_incomplete_folder_selstud_hel Line 158  sub create_incomplete_folder_selstud_hel
   
     my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_PEOPLE_SEQ',      my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_PEOPLE_SEQ',
       'Select problem(s) to print',        'Select problem(s) to print',
       'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',        'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" nocurrloc="'.$nocurrloc.'"',
       'RESOURCES',        'RESOURCES',
       'CHOOSE_STUDENTS_INCOMPLETE',        'CHOOSE_STUDENTS_INCOMPLETE',
       $map,        $map,
Line 235  sub create_incomplete_course_helper { Line 236  sub create_incomplete_course_helper {
 # Parameters:  # Parameters:
 #   $helper - helper we are generating states for.  #   $helper - helper we are generating states for.
 #   $map    - The map for which the student wants incomplete problems.  #   $map    - The map for which the student wants incomplete problems.
   #   $nocurrloc - True if printout called from icon/link in Tools in /adm/navmaps
 # Returns:  # Returns:
 #   XML that defines the helper states being created.  #   XML that defines the helper states being created.
 #  #
Line 242  sub create_incomplete_course_helper { Line 244  sub create_incomplete_course_helper {
 #   CHOOSE_INCOMPLETE_SEQ  - Resource selector.  #   CHOOSE_INCOMPLETE_SEQ  - Resource selector.
 #  #
 sub create_incomplete_folder_helper {  sub create_incomplete_folder_helper {
     my ($helper, $map) = @_;      my ($helper, $map, $nocurrloc) = @_;
   
     my $filter    = '$res->is_problem()';      my $filter    = '$res->is_problem()';
     $filter      .= ' && $res->resprintable() ';      $filter      .= ' && $res->resprintable() ';
Line 252  sub create_incomplete_folder_helper { Line 254  sub create_incomplete_folder_helper {
   
     my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_SEQ',      my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_SEQ',
       'Select problem(s) to print',        'Select problem(s) to print',
       'multichoice="1", toponly ="1", addstatus="1", closeallpages="1" modallink="1"',        'multichoice="1", toponly ="1", addstatus="1", closeallpages="1" modallink="1" nocurrloc="'.$nocurrloc.'"',
       'RESOURCES',        'RESOURCES',
       'PAGESIZE',        'PAGESIZE',
       $map,        $map,
Line 444  CHOOSE_ANON1 Line 446  CHOOSE_ANON1
    return $result;     return $result;
 }  }
   
   sub generate_common_choosers {
       my ($r,$helper,$map,$url,$isProblem,$symbFilter,$start_new_option) = @_;
   
       my $randomly_ordered_warning =
           &get_randomly_ordered_warning($helper, $map);
   
       # code for a few states used for printout launched from both
       # /adm/navmpas and from a resource by a privileged user:
       #   - To allow resources to be selected for printing.
       #   - To determine pagination between assignments.
       #   - To determine how many assignments should be bundled into a single PDF.
   
       my $resource_selector= &generate_resource_chooser('SELECT_PROBLEMS',
                                                         'Select resources to print',
                                                         'multichoice="1" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
                                                         'RESOURCES',
                                                         'PRINT_FORMATTING',
                                                         $map,
                                                         $isProblem, '', $symbFilter,
                                                         $start_new_option);
       $resource_selector .=  &generate_format_selector($helper,
                                                        'How should results be printed?',
                                                        'PRINT_FORMATTING').
                              &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
                                                         'Select Problem(s) to print',
                                                         "multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",
                                                         'RESOURCES',
                                                         'PRINT_FORMATTING',
                                                         $url,
                                                         $isProblem, '',  $symbFilter,
                                                         $start_new_option);
   
   # Generate student choosers.
   
       &Apache::lonxml::xmlparse($r, 'helper',
                                 &generate_student_chooser('CHOOSE_TGT_STUDENTS_PAGE',
                                                           'student_sort',
                                                           'STUDENTS',
                                                           'CHOOSE_STUDENTS_PAGE'));
       &Apache::lonxml::xmlparse($r, 'helper',
                                 &generate_student_chooser('CHOOSE_STUDENTS',
                                                           'student_sort',
                                                           'STUDENTS',
                                                           'SELECT_PROBLEMS'));
       &Apache::lonxml::xmlparse($r, 'helper', $resource_selector);
   
       my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
       my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
       my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
       my $namechoice='<choice></choice>';
       foreach my $name (sort {uc($a) cmp uc($b)} @names) {
           if ($name =~ /^error: 2 /) { next; }
           if ($name =~ /^type\0/) { next; }
           $namechoice.='<choice computer="'.$name.'">'.$name.'</choice>';
       }
   
       my %code_values;
       my %codes_to_print;
       foreach my $key (@names) {
           %code_values = &Apache::grades::get_codes($key, $cdom, $cnum);
           foreach my $key (keys(%code_values)) {
               $codes_to_print{$key} = 1;
           }
       }
   
       my $code_selection;
       foreach my $code (sort {uc($a) cmp uc($b)} (keys(%codes_to_print))) {
           my $choice  = $code;
           if ($code =~ /^[A-Z]+$/) { # Alpha code
               $choice = &letters_to_num($code);
           }
           push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
       }
       if (%codes_to_print) {
           $code_selection .='
           <message><b>Choose single CODE from list:</b></message>
           <message></td><td></message>
               <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
                 <choice></choice>
                 <exec>
                    push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
                 </exec>
               </dropdown>
           <message></td></tr><tr><td></message>
           '.$/;
       }
   
       my @lines = &Apache::lonnet::get_scantronformat_file();
       my $codechoice='';
       foreach my $line (@lines) {
           next if (($line =~ /^\#/) || ($line eq ''));
           my ($name,$description,$code_type,$code_length)=
               (split(/:/,$line))[0,1,2,4];
           if ($code_length > 0 &&
               $code_type =~/^(letter|number|-1)/) {
               $codechoice.='<choice computer="'.$name.'">'.$description.'</choice>';
           }
       }
       if ($codechoice eq '') {
           $codechoice='<choice computer="default">Default</choice>';
       }
       my $anon1 = &generate_code_selector($helper,
                                           'CHOOSE_ANON1',
                                           'SELECT_PROBLEMS',
                                           $codechoice,
                                           $code_selection,
                                           $namechoice) . $resource_selector;
   
       &Apache::lonxml::xmlparse($r, 'helper',$anon1);
   
       my $anon_page = &generate_code_selector($helper,
                                               'CHOOSE_ANON1_PAGE',
                                               'SELECT_PROBLEMS_PAGE',
                                               $codechoice,
                                               $code_selection,
                                               $namechoice) .
                       &generate_resource_chooser('SELECT_PROBLEMS_PAGE',
                                                  'Select Problem(s) to print',
                                                  "multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",
                                                  'RESOURCES',
                                                  'PRINT_FORMATTING',
                                                  $url,
                                                  $isProblem, '',  $symbFilter,
                                                  $start_new_option);
       &Apache::lonxml::xmlparse($r, 'helper', $anon_page);
       return ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice);
   }
   
 #  Returns the XML for choosing how assignments are to be formatted   #  Returns the XML for choosing how assignments are to be formatted 
 #  that text must still be parsed by the helper xml parser.  #  that text must still be parsed by the helper xml parser.
 # Parameters: 3 (required)  # Parameters: 3 (required)
Line 458  sub generate_format_selector { Line 588  sub generate_format_selector {
     my $secpdfoption;      my $secpdfoption;
     unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||      unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) {              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon') ||
               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences_problems_for_anon') ||
               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences_resources_for_anon')) {
         $secpdfoption =  '<choice computer="sections">Each PDF contains exactly one section</choice>';          $secpdfoption =  '<choice computer="sections">Each PDF contains exactly one section</choice>';
     }      }
     return <<RESOURCE_SELECTOR;      return <<RESOURCE_SELECTOR;
Line 1344  sub latex_header_footer_remove { Line 1476  sub latex_header_footer_remove {
 #  necessity is determined by the problem_split param.  #  necessity is determined by the problem_split param.
 #  #
 sub encapsulate_minipage {  sub encapsulate_minipage {
     my ($text) = @_;      my ($text,$problem_split) = @_;
     if (!($env{'form.problem.split'} =~ /yes/i)) {      if (!($problem_split =~ /yes/i)) {
  $text = '\begin{minipage}{\textwidth}'.$text.'\end{minipage}';   $text = '\begin{minipage}{\textwidth}'.$text.'\end{minipage}';
     }      }
     return $text;      return $text;
Line 2553  sub print_construction_sequence { Line 2685  sub print_construction_sequence {
     my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';      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,$answerform{'problem_split'});
     $texversion.=$body;      $texversion.=$body;
  }   }
     }      }
Line 3017  ENDPART Line 3149  ENDPART
     my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';      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,$answerform{'problem_split'});
     $texversion .= $body;      $texversion .= $body;
  } else {   } else {
     $texversion='';      $texversion='';
Line 3119  ENDPART Line 3251  ENDPART
       ($print_type eq 'all_problems_students')           ||        ($print_type eq 'all_problems_students')           ||
       ($print_type eq 'resources_for_students')          ||        ($print_type eq 'resources_for_students')          ||
       ($print_type eq 'incomplete_problems_selpeople_course') ||        ($print_type eq 'incomplete_problems_selpeople_course') ||
       ($print_type eq 'map_incomplete_problems_people_seq')){        ($print_type eq 'map_incomplete_problems_people_seq') ||
                 ($print_type eq 'select_sequences_problems_for_students') ||
                 ($print_type eq 'select_sequences_resources_for_students')) {
   
   
      #-- prints assignments for whole class or for selected students         #-- prints assignments for whole class or for selected students  
Line 3128  ENDPART Line 3262  ENDPART
      ($print_type eq 'problems_for_students_from_page') ||       ($print_type eq 'problems_for_students_from_page') ||
      ($print_type eq 'all_problems_students')           ||       ($print_type eq 'all_problems_students')           ||
      ($print_type eq 'incomplete_problems_selpeople_course') ||       ($print_type eq 'incomplete_problems_selpeople_course') ||
      ($print_type eq 'map_incomplete_problems_people_seq')) {       ($print_type eq 'map_incomplete_problems_people_seq') ||
                ($print_type eq 'select_sequences_problems_for_students')) {
      $selectionmade=5;       $selectionmade=5;
      $type='problems';       $type='problems';
  } elsif ($print_type eq 'resources_for_students') {   } elsif (($print_type eq 'resources_for_students') ||
                     ($print_type eq 'select_sequences_resources_for_students')) {
      $selectionmade=8;       $selectionmade=8;
      $type='resources';       $type='resources';
  }   }
Line 3231  ENDPART Line 3367  ENDPART
  $result .= $print_array[0].'  \end{document}';   $result .= $print_array[0].'  \end{document}';
      } elsif (($print_type eq 'problems_for_anon')      ||       } elsif (($print_type eq 'problems_for_anon')      ||
       ($print_type eq 'problems_for_anon_page') ||        ($print_type eq 'problems_for_anon_page') ||
       ($print_type eq 'resources_for_anon')  ) {        ($print_type eq 'resources_for_anon')     ||
                 ($print_type eq 'select_sequences_problems_for_anon') ||
                 ($print_type eq 'select_sequences_resources_for_anon')) {
  my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};   my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
  my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};   my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
  my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};   my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
Line 3243  ENDPART Line 3381  ENDPART
          my @lines = &Apache::lonnet::get_scantronformat_file();           my @lines = &Apache::lonnet::get_scantronformat_file();
  my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);   my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
  foreach my $line (@lines) {   foreach my $line (@lines) {
              chomp($line);               next if (($line =~ /^\#/) || ($line eq ''));
      my ($name,$type,$length,$bubbles_per_item) =        my ($name,$type,$length,$bubbles_per_item) = 
                  (split(/:/,$line))[0,2,4,17];                   (split(/:/,$line))[0,2,4,17];
      if ($name eq $code_option) {       if ($name eq $code_option) {
Line 3480  ENDPART Line 3618  ENDPART
                 $URLback .= (($URLback =~ /\?/) ? '&amp;':'?').'symb='.&escape($symb.$anchor);                  $URLback .= (($URLback =~ /\?/) ? '&amp;':'?').'symb='.&escape($symb.$anchor);
             }              }
         }          }
       } elsif (($helper->{VARS}->{'postdata'} eq '/adm/navmaps') &&
                ($env{'request.course.id'})) {
           $URLback=$helper->{VARS}->{'postdata'};
     }      }
     #      #
     # Final adjustment of the font size:      # Final adjustment of the font size:
Line 3732  sub print_resources { Line 3873  sub print_resources {
     my $body   ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';      my $body   ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
     $body     .=&path_to_problem($res_url,$LaTeXwidth);      $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,$answerenv{'problem_split'});
     $rendered = $header.$body;      $rendered = $header.$body;
  }   }
     }      }
Line 3822  sub print_resources { Line 3963  sub print_resources {
             $message = &mt('No incomplete resources');              $message = &mt('No incomplete resources');
         }          }
         if ($message) {          if ($message) {
             $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n");              $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n",$moreenv->{'problem_split'});
         }          }
  if ($remove_latex_header eq "NO") {   if ($remove_latex_header eq "NO") {
     $current_output = &print_latex_header() . $current_output;      $current_output = &print_latex_header() . $current_output;
Line 4063  sub printHelper { Line 4204  sub printHelper {
         $helper->{VARS}->{'construction'} = 1;          $helper->{VARS}->{'construction'} = 1;
     } else {      } else {
         if ($env{'form.postdata'}) {          if ($env{'form.postdata'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});              unless ($env{'form.postdata'} eq '/adm/navmaps') {
                   $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
               }
     if ( $helper->{VARS}->{'symb'} eq '') {      if ( $helper->{VARS}->{'symb'} eq '') {
  $helper->{VARS}->{'postdata'} = $env{'form.postdata'};   $helper->{VARS}->{'postdata'} = $env{'form.postdata'};
     }      }
Line 4072  sub printHelper { Line 4215  sub printHelper {
             $helper->{VARS}->{'symb'} = $env{'form.symb'};              $helper->{VARS}->{'symb'} = $env{'form.symb'};
         }          }
         if ($env{'form.url'}) {          if ($env{'form.url'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});              unless ($env{'form.url'} eq '/adm/navmaps') {
                   $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
               }
         }          }
   
     }  
   
     if ($env{'form.symb'}) {  
         $helper->{VARS}->{'symb'} = $env{'form.symb'};  
     }      }
     if ($env{'form.url'}) {  
         $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});  
   
     }  
     if ($helper->{VARS}->{'symb'} ne '') {      if ($helper->{VARS}->{'symb'} ne '') {
         $helper->{VARS}->{'symb'}=          $helper->{VARS}->{'symb'}=
     &Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});      &Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
     }      }
     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);      my ($resourceTitle,$sequenceTitle,$mapTitle,$cdom,$cnum);
       if ($helper->{VARS}->{'postdata'} eq '/adm/navmaps') {
           $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
           $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
           if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
               "uploaded/$cdom/$cnum/default.sequence") {
               my $navmap = Apache::lonnavmaps::navmap->new();
               if (ref($navmap)) {
                   my @toplevelres = $navmap->retrieveResources('',sub { !(($_[0]->is_map()) || ($_[0]->src =~ /^\/adm\/navmaps/)) },0,0);
                   if (@toplevelres) {
                       my @printable;
                       if ($perm{'pav'} || $perm{'pfo'}) {
                           @printable = @toplevelres;
                       } else {
                           @printable = $navmap->retrieveResources(undef,sub { $_[0]->resprintable() },0,1);
                       }
                       if (@printable) {
                           $sequenceTitle = 'Main Content';
                           $mapTitle = $sequenceTitle;
                       }
                   }
               }
           }
       } else {
           ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
       }
     if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}      if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
   
           
Line 4120  sub printHelper { Line 4282  sub printHelper {
     ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);      ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
     $helper->{VARS}->{'postdata'} =       $helper->{VARS}->{'postdata'} = 
  &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));   &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
           } elsif (($helper->{VARS}->{'postdata'} eq '/adm/navmaps') &&
                   ($env{'request.course.id'} ne '')) {
               if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
                   "uploaded/$cdom/$cnum/default.sequence") {
                   $map = $env{'course.'.$env{'request.course.id'}.'.url'};
                   $url = $helper->{VARS}->{'postdata'};
               }
           }
           if (($symb ne '') || ($map ne '')) {
             if (!$userCanPrint) {              if (!$userCanPrint) {
         my $navmap = Apache::lonnavmaps::navmap->new();          my $navmap = Apache::lonnavmaps::navmap->new();
                 if (ref($navmap)) {                  if (ref($navmap)) {
             my $res = $navmap->getBySymb($symb);                      my $res;
                       if ($symb ne '') {
                           $res = $navmap->getBySymb($symb);
                       } elsif ($map ne '') {
                           $res = $navmap->getResourceByUrl($map);
                       }
                     if (ref($res)) {                      if (ref($res)) {
                 $res_printable = $res->resprintable(); #printability in course context                  $res_printable = $res->resprintable(); #printability in course context
                 ($res_printstartdate, $res_printenddate) = &get_print_dates($res);                  ($res_printstartdate, $res_printenddate) = &get_print_dates($res);
Line 4147  sub printHelper { Line 4323  sub printHelper {
             my $postdata = $helper->{VARS}->{'postdata'};              my $postdata = $helper->{VARS}->{'postdata'};
             $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);              $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
         }          }
         $subdir = &Apache::lonnet::filelocation("", $url);          if (($url eq '/adm/navmaps') && ($map eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
               $res_printable=0;
           } else {
               $subdir = &Apache::lonnet::filelocation("", $url);
           }
   
   
     }      }
Line 4261  sub printHelper { Line 4441  sub printHelper {
   
       $helperFragment .= &generate_resource_chooser('CHOOSE_RESOURCES_PAGE',        $helperFragment .= &generate_resource_chooser('CHOOSE_RESOURCES_PAGE',
     'Select Resource(s) to print',      'Select Resource(s) to print',
     'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',      'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
     'RESOURCES',      'RESOURCES',
     'PAGESIZE',      'PAGESIZE',
     $url,      $url,
     $isNotMap, '', $symbFilter,      $isNotMap, '', $symbFilter,
     $start_new_option);      $start_new_option);
   
       
   
   
   
Line 4286  sub printHelper { Line 4466  sub printHelper {
  # the exact form of this depends on whether or not we are privileged or a mere   # the exact form of this depends on whether or not we are privileged or a mere
  # plebe of s student:   # plebe of s student:
   
           my $optionText    = '';
  my $printSelector = 'map_incomplete_problems_seq';   my $printSelector = 'map_incomplete_problems_seq';
  my $nextState     = 'CHOOSE_INCOMPLETE_SEQ';   my $nextState     = 'CHOOSE_INCOMPLETE_SEQ';
  my $textSuffix    = '';   my $textSuffix    = '';
           my $nocurrloc = '';
           if ($helper->{VARS}->{'postdata'} eq '/adm/navmaps') {
               $nocurrloc = 1;
           }
   
  if ($userCanPrint)  {   if ($userCanPrint)  {
     $printSelector = 'map_incomplete_problems_people_seq';      $printSelector = 'map_incomplete_problems_people_seq';
     $nextState     = 'CHOOSE_INCOMPLETE_PEOPLE_SEQ';      $nextState     = 'CHOOSE_INCOMPLETE_PEOPLE_SEQ';
     $textSuffix    = ' for selected students';      $textSuffix    = ' for selected students';
     my $helperStates =      my $helperStates =
  &create_incomplete_folder_selstud_helper($helper, $map);    &create_incomplete_folder_selstud_helper($helper, $map, $nocurrloc); 
     &Apache::lonxml::xmlparse($r, 'helper', $helperStates);      &Apache::lonxml::xmlparse($r, 'helper', $helperStates);
  } else {   } else {
     if (&printable($map_open, $map_close)) {      if (&printable($map_open, $map_close)) {
  my $helperStates = &create_incomplete_folder_helper($helper, $map); # Create needed states for student.   my $helperStates = &create_incomplete_folder_helper($helper, $map, $nocurrloc); # Create needed states for student.
  &Apache::lonxml::xmlparse($r, 'helper', $helperStates);   &Apache::lonxml::xmlparse($r, 'helper', $helperStates);
     } else {      } else {
  # TODO: Figure out how to break the news...this folder is not printable.   # TODO: Figure out how to break the news...this folder is not printable.
Line 4307  sub printHelper { Line 4492  sub printHelper {
  }   }
   
  if ($userCanPrint || &printable($map_open, $map_close)) {   if ($userCanPrint || &printable($map_open, $map_close)) {
               if ($helper->{VARS}->{'postdata'} eq '/adm/navmaps') {
                   $optionText = &mt('Selected [_1]Incomplete Problems[_2] [_3]not in a folder[_4]' . $textSuffix,
                                     '<b>','</b>','<i>','</i>');
               } else {
                   $optionText = &mt('Selected [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
                                     '<b>','</b>','<b><i>'.$sequenceTitle.'</b></i>');
               }
     push(@{$printChoices},      push(@{$printChoices},
  [&mt('Selected  [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,   [$optionText,
       '<b>', '</b>',  
       '<b><i>'. $sequenceTitle . '</b></i>'),  
   $printSelector,    $printSelector,
   $nextState]);    $nextState]);
  }   }
         # Allow problems from sequence          # Allow problems from sequence
  if ($userCanPrint || &printable($map_open, $map_close)) {   if ($userCanPrint || &printable($map_open, $map_close)) {
               if ($helper->{VARS}->{'postdata'} eq '/adm/navmaps') {
                   $optionText = &mt('Selected [_1]Problems[_2] [_3]not in a folder[_4]','<b>','</b>','<i>','</i>');
               } else {
                   $optionText = &mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>');
               }
     push @{$printChoices},       push @{$printChoices}, 
     [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),       [$optionText, 
      'map_problems',        'map_problems', 
      'CHOOSE_PROBLEMS'];       'CHOOSE_PROBLEMS'];
     # Allow all resources from sequence      # Allow all resources from sequence
     push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),               if ($helper->{VARS}->{'postdata'} eq '/adm/navmaps') {
                   $optionText = &mt('Selected [_1]Resources[_2] [_3]not in a folder[_4]','<b>','</b>','<i>','</i>');
               } else {
                   $optionText = &mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>');
               }
       push @{$printChoices}, [$optionText, 
     'map_problems_pages',       'map_problems_pages', 
     'CHOOSE_PROBLEMS_HTML'];      'CHOOSE_PROBLEMS_HTML'];
     my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',      my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
     'Select Problem(s) to print',      'Select Problem(s) to print',
     'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',      'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" nocurrloc="'.$nocurrloc.'"',
     'RESOURCES',      'RESOURCES',
     'PAGESIZE',      'PAGESIZE',
     $map,      $map,
Line 4335  sub printHelper { Line 4535  sub printHelper {
     $start_new_option);      $start_new_option);
     $helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',      $helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
   'Select Resource(s) to print',    'Select Resource(s) to print',
   'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',    'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" nocurrloc="'.$nocurrloc.'" suppressNavmap="1"',
   'RESOURCES',    'RESOURCES',
   'PAGESIZE',    'PAGESIZE',
   $map,    $map,
Line 4353  sub printHelper { Line 4553  sub printHelper {
  my $post_data = $helper->{VARS}->{'postdata'};   my $post_data = $helper->{VARS}->{'postdata'};
           
     if ($perm{'pfo'} &&  !$is_published  &&      if ($perm{'pfo'} &&  !$is_published  &&
         ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {           ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
   
  # BZ 5209 - incomplete problems from entire course:   # BZ 5209 - incomplete problems from entire course:
   
  push(@{$printChoices},   push(@{$printChoices},
      [&mtn('Selected <b>Incomplete Problems</b> from <b>entire course</b> for selected people'),       [&mt('Selected [_1]Incomplete Problems[_2] from [_3]entire course[_4] for [_5]selected people[_6]',
                 '<b>','</b>','<b>','</b>','<b>','</b>'),
       'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);        'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);
  my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.   my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.
   
Line 4366  sub printHelper { Line 4567  sub printHelper {
   
  #  Selected problems/resources from entire course:   #  Selected problems/resources from entire course:
   
         push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];          push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from [_3]entire course[_4]','<b>','</b>','<b>','</b>'), 'all_problems', 'ALL_PROBLEMS'];
  push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];   push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from [_3]entire course[_4]','<b>','</b>','<b>','</b>'), 'all_resources', 'ALL_RESOURCES'];
  push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b> for <b>selected people</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];   push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from [_3]entire course[_4] for [_5]selected people[_6]','<b>','</b>','<b>','</b>','<b>','</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
 my $suffixXml = <<ALL_PROBLEMS;  my $suffixXml = <<ALL_PROBLEMS;
   <state name="STUDENTS1" title="Select People">    <state name="STUDENTS1" title="Select People">
       <message><b>Select sorting order of printout</b> </message>        <message><b>Select sorting order of printout</b> </message>
Line 4392  ALL_PROBLEMS Line 4593  ALL_PROBLEMS
       $start_new_option) .        $start_new_option) .
    &generate_resource_chooser('ALL_RESOURCES',     &generate_resource_chooser('ALL_RESOURCES',
       'Select Resource(s) to print',        'Select Resource(s) to print',
       " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1' modallink='1'",        'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
       'RESOURCES',        'RESOURCES',
       'PAGESIZE',        'PAGESIZE',
       '',        '',
Line 4430  ALL_PROBLEMS Line 4631  ALL_PROBLEMS
     'problems_for_anon', 'CHOOSE_ANON1'];      'problems_for_anon', 'CHOOSE_ANON1'];
  }   }
   
  my $randomly_ordered_warning =           my ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice) =
             &get_randomly_ordered_warning($helper, $map);              &generate_common_choosers($r,$helper,$map,$url,$isProblem,$symbFilter,$start_new_option);
   
  # resource_selector will hold a few states that:  
  #   - Allow resources to be selected for printing.  
  #   - Determine pagination between assignments.  
  #   - Determine how many assignments should be bundled into a single PDF.  
         # TODO:  
  #    Probably good to do things like separate this up into several vars, each  
  #    with one state, and use REGEXPs at inclusion time to set state names  
  #    and next states for better mix and match capability  
  #  
  my $resource_selector= &generate_resource_chooser('SELECT_PROBLEMS',  
   'Select resources to print',  
   'multichoice="1" addstatus="1" closeallpages="1" modallink="1"',  
   'RESOURCES',   
   'PRINT_FORMATTING',  
   $map,  
   $isProblem, '', $symbFilter,  
   $start_new_option);  
  $resource_selector .=  &generate_format_selector($helper,  
                                                          'How should results be printed?',  
                                                          'PRINT_FORMATTING').  
                                &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',  
  'Select Problem(s) to print',  
  "multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",  
  'RESOURCES',  
  'PRINT_FORMATTING',  
  $url,  
  $isProblem, '',  $symbFilter,  
  $start_new_option);  
   
   
 # Generate student choosers.  
   
   
   
         &Apache::lonxml::xmlparse($r, 'helper',  
   &generate_student_chooser('CHOOSE_TGT_STUDENTS_PAGE',  
     'student_sort',  
     'STUDENTS',  
     'CHOOSE_STUDENTS_PAGE'));  
  &Apache::lonxml::xmlparse($r, 'helper',   
   &generate_student_chooser('CHOOSE_STUDENTS',  
     'student_sort',  
     'STUDENTS',  
     'SELECT_PROBLEMS'));  
  &Apache::lonxml::xmlparse($r, 'helper', $resource_selector);  
   
  my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};  
  my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};  
         my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);  
  my $namechoice='<choice></choice>';  
  foreach my $name (sort {uc($a) cmp uc($b)} @names) {  
     if ($name =~ /^error: 2 /) { next; }  
     if ($name =~ /^type\0/) { next; }  
     $namechoice.='<choice computer="'.$name.'">'.$name.'</choice>';  
  }  
   
   
  my %code_values;  
  my %codes_to_print;  
  foreach my $key (@names) {  
     %code_values = &Apache::grades::get_codes($key, $cdom, $cnum);  
     foreach my $key (keys(%code_values)) {  
  $codes_to_print{$key} = 1;  
     }  
  }  
   
  my $code_selection;  
  foreach my $code (sort {uc($a) cmp uc($b)} (keys(%codes_to_print))) {  
     my $choice  = $code;  
     if ($code =~ /^[A-Z]+$/) { # Alpha code  
  $choice = &letters_to_num($code);  
     }  
     push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);  
  }  
  if (%codes_to_print) {  
     $code_selection .='     
     <message><b>Choose single CODE from list:</b></message>  
  <message></td><td></message>  
  <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">  
                   <choice></choice>  
                   <exec>  
                      push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});  
                   </exec>  
  </dropdown>  
     <message></td></tr><tr><td></message>  
             '.$/;  
   
  }  
   
         my @lines = &Apache::lonnet::get_scantronformat_file();  
  my $codechoice='';  
  foreach my $line (@lines) {  
     my ($name,$description,$code_type,$code_length)=  
  (split(/:/,$line))[0,1,2,4];  
     if ($code_length > 0 &&   
  $code_type =~/^(letter|number|-1)/) {  
  $codechoice.='<choice computer="'.$name.'">'.$description.'</choice>';  
     }  
  }  
  if ($codechoice eq '') {  
     $codechoice='<choice computer="default">Default</choice>';  
  }  
  my $anon1 = &generate_code_selector($helper,   
     'CHOOSE_ANON1',  
     'SELECT_PROBLEMS',  
     $codechoice,  
     $code_selection,  
     $namechoice) . $resource_selector;  
       
       
         &Apache::lonxml::xmlparse($r, 'helper',$anon1);  
   
  my $anon_page = &generate_code_selector($helper,  
  'CHOOSE_ANON1_PAGE',  
  'SELECT_PROBLEMS_PAGE',  
  $codechoice,  
  $code_selection,  
  $namechoice) .  
  &generate_resource_chooser('SELECT_PROBLEMS_PAGE',  
    'Select Problem(s) to print',  
    "multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",  
    'RESOURCES',  
    'PRINT_FORMATTING',  
    $url,  
    $isProblem, '',  $symbFilter,  
    $start_new_option);  
  &Apache::lonxml::xmlparse($r, 'helper', $anon_page);  
   
   
  if ($helper->{VARS}->{'assignment'}) {   if ($helper->{VARS}->{'assignment'}) {
   
Line 4569  ALL_PROBLEMS Line 4641  ALL_PROBLEMS
     push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_students', 'CHOOSE_STUDENTS1'];      push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_students', 'CHOOSE_STUDENTS1'];
     push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_anon', 'CHOOSE_ANON2'];      push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_anon', 'CHOOSE_ANON2'];
  }   }
       
   
  $resource_selector=<<RESOURCE_SELECTOR;          # resource_selector will hold a few states that:
           #   - Allow resources to be selected for printing.
           #   - Determine pagination between assignments.
           #   - Determine how many assignments should be bundled into a single PDF.
           # TODO:
           #    Probably good to do things like separate this up into several vars, each
           #    with one state, and use REGEXPs at inclusion time to set state names
           #    and next states for better mix and match capability
           #
       
    my $resource_selector=<<RESOURCE_SELECTOR;
     <state name="SELECT_RESOURCES" title="Select Resources">      <state name="SELECT_RESOURCES" title="Select Resources">
     $randomly_ordered_warning      $randomly_ordered_warning
     <nextstate>PRINT_FORMATTING</nextstate>      <nextstate>PRINT_FORMATTING</nextstate>
Line 4668  CHOOSE_ANON2 Line 4749  CHOOSE_ANON2
   
     # FIXME: That RE should come from a library somewhere.      # FIXME: That RE should come from a library somewhere.
     if (($perm{'pav'}       if (($perm{'pav'} 
           && ($subdir ne '')
  && $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'   && $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
  && (defined($helper->{'VARS'}->{'construction'})   && (defined($helper->{'VARS'}->{'construction'})
     ||      ||
Line 4701  CHOOSE_FROM_SUBDIR Line 4783  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'} && !$is_published) {      if ((!$helper->{VARS}->{'construction'}) &&
  push @$printChoices, [&mtn("Selected <b>Resources</b> from <b>selected folder</b> in course"),          (!$is_published || (($subdir eq '') && ($url eq '/adm/navmaps')))) {
       'select_sequences', 'CHOOSE_SEQUENCE'];          push(@$printChoices,[&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course',
  my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};                                   '<b>','</b>','<b>','</b>'),
  #Escape apostrophes and backslashes for Perl                               'select_sequences','CHOOSE_SEQUENCE']);
  $escapedSequenceName =~ s/\\/\\\\/g;          my $escapedSequenceName;
  $escapedSequenceName =~ s/'/\\'/g;          if ($helper->{VARS}->{'SEQUENCE'} ne '') {
  &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);              $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
           } elsif (($subdir eq '') && ($url eq '/adm/navmaps')) {
               my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
               my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
               if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
                   "uploaded/$cdom/$cnum/default.sequence") {
                   $escapedSequenceName = $env{'course.'.$env{'request.course.id'}.'.url'};
               }
           }
           #Escape apostrophes and backslashes for Perl
           $escapedSequenceName =~ s/\\/\\\\/g;
           $escapedSequenceName =~ s/'/\\'/g;
           my $nocurrloc;
           if (($subdir eq '') && ($url eq '/adm/navmaps')) {
               $nocurrloc = 'nocurrloc="1"';
               if ($perm{'pfo'}) {
                   push(@{$printChoices},
                       [&mt('Selected [_1]Problems[_2] from [_3]selected folder[_4] in course for [_5]selected people[_6]',
                            '<b>','</b>','<b>','</b>','<b>','</b>'),
                            'select_sequences_problems_for_students','CHOOSE_SEQUENCE_STUDENTS'],
                       [&mt('Selected [_1]Problems[_2] from [_3]selected folder[_4] in course  for [_5]CODEd assignments[_6]',
                            '<b>','</b>','<b>','</b>','<b>','</b>'),
                            'select_sequences_problems_for_anon','CHOOSE_SEQUENCE_ANON1'],
                       [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course for [_5]selected people[_6]',
                            '<b>','</b>','<b>','</b>','<b>','</b>'),
                            'select_sequences_resources_for_students','CHOOSE_SEQUENCE_STUDENTS1'],
                       [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course for [_5]CODEd assignments[_6]',
                            '<b>','</b>','<b>','</b>','<b>','</b>'),
                            'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2']);
                   if ($escapedSequenceName) {
                       &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,$isProblem,$symbFilter,$start_new_option);
                   }
               }
           }
           if (($subdir eq '') && ($url eq '/adm/navmaps') && ($perm{'pfo'})) {
              &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
     <state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">
       <message>Select the sequence to print resources from:</message>
       <resource variable="SEQUENCE">
         <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
         <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
         <valuefunc>return $urlValue;</valuefunc>
         <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
           </choicefunc>
         </resource>
       </state>
     <state name="CHOOSE_SEQUENCE_STUDENTS" title="Select Sequence To Print From">
       <message>Select the sequence to print resources from:</message>
       <resource variable="SEQUENCE">
         <nextstate>CHOOSE_STUDENTS</nextstate>
         <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
         <valuefunc>return $urlValue;</valuefunc>
         <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
           </choicefunc>
         </resource>
       </state>
     <state name="CHOOSE_SEQUENCE_ANON1" title="Select Sequence To Print From">
       <message>Select the sequence to print resources from:</message>
       <resource variable="SEQUENCE">
         <nextstate>CHOOSE_ANON1</nextstate>
         <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
         <valuefunc>return $urlValue;</valuefunc>
         <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
           </choicefunc>
         </resource>
       </state>
     <state name="CHOOSE_SEQUENCE_STUDENTS1" title="Select Sequence To Print From">
       <message>Select the sequence to print resources from:</message>
       <resource variable="SEQUENCE">
         <nextstate>CHOOSE_STUDENTS</nextstate>
         <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
         <valuefunc>return $urlValue;</valuefunc>
         <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
           </choicefunc>
         </resource>
       </state>
     <state name="CHOOSE_SEQUENCE_ANON2" title="Select Sequence To Print From">
       <message>Select the sequence to print resources from:</message>
       <resource variable="SEQUENCE">
         <nextstate>CHOOSE_ANON1</nextstate>
         <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
         <valuefunc>return $urlValue;</valuefunc>
         <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
           </choicefunc>
         </resource>
       </state>
     <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
       <message>(mark desired resources then click "next" button) <br /></message>
       <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
                 closeallpages="1" modallink="1" suppressNavmap="1" $nocurrloc>
         <nextstate>PAGESIZE</nextstate>
         <filterfunc>return $isNotMap</filterfunc>
         <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
         <valuefunc>return $symbFilter;</valuefunc>
         $start_new_option
         </resource>
       </state>
   CHOOSE_FROM_ANY_SEQUENCE
           } else {
       &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 4722  CHOOSE_FROM_SUBDIR Line 4903  CHOOSE_FROM_SUBDIR
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">    <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
     <message>(mark desired resources then click "next" button) <br /></message>      <message>(mark desired resources then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"      <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1" modallink="1">                closeallpages="1" modallink="1" suppressNavmap="1" $nocurrloc>
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap</filterfunc>        <filterfunc>return $isNotMap</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>        <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
Line 4731  CHOOSE_FROM_SUBDIR Line 4912  CHOOSE_FROM_SUBDIR
       </resource>        </resource>
     </state>      </state>
 CHOOSE_FROM_ANY_SEQUENCE  CHOOSE_FROM_ANY_SEQUENCE
 }          }
       }
     my $numchoices = 0;      my $numchoices = 0;
     if (ref($printChoices) eq 'ARRAY') {      if (ref($printChoices) eq 'ARRAY') {
         $numchoices = @{$printChoices};          $numchoices = @{$printChoices};
Removed from v.1.627.2.32  
changed lines
  Added in v.1.627.2.32.2.5

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