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

Diff for /loncom/interface/lonprintout.pm between versions 1.519.2.4 and 1.536.2.3

version 1.519.2.4, 2008/04/04 16:46:23 version 1.536.2.3, 2008/10/02 17:40:34
Line 39  use Apache::File(); Line 39  use Apache::File();
 use Apache::lonnavmaps;  use Apache::lonnavmaps;
 use Apache::admannotations;  use Apache::admannotations;
 use Apache::lonenc;  use Apache::lonenc;
   use Apache::entities;
   
 use HTTP::Response;  use HTTP::Response;
   
 use LONCAPA::map();  use LONCAPA::map();
Line 150  sub ssi_with_retries { Line 152  sub ssi_with_retries {
  $ssi_error               = 1;   $ssi_error               = 1;
  $ssi_last_error_resource = $resource;   $ssi_last_error_resource = $resource;
  $ssi_last_error          = $response->code . " " . $response->message;   $ssi_last_error          = $response->code . " " . $response->message;
  $content='\section*{!!! An error occurred !!!}';          $content='\section*{!!! An error occurred !!!}';
  &Apache::lonnet::logthis("Error in SSI resource: $resource Error: $ssi_last_error");   &Apache::lonnet::logthis("Error in SSI resource: $resource Error: $ssi_last_error");
     }      }
   
Line 160  sub ssi_with_retries { Line 162  sub ssi_with_retries {
   
 sub get_student_view_with_retries {  sub get_student_view_with_retries {
     my ($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv)=@_;      my ($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv)=@_;
   
     my ($content, $response) = &Apache::loncommon::get_student_view_with_retries($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv);      my ($content, $response) = &Apache::loncommon::get_student_view_with_retries($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv);
     if (!$response->is_success) {      if (!$response->is_success) {
         $ssi_error               = 1;          $ssi_error               = 1;
Line 169  sub get_student_view_with_retries { Line 172  sub get_student_view_with_retries {
         &Apache::lonnet::logthis("Error in SSI (student view) resource: $curresline Error: $ssi_last_error User: $username:$userdomain");          &Apache::lonnet::logthis("Error in SSI (student view) resource: $curresline Error: $ssi_last_error User: $username:$userdomain");
     }      }
     return $content;      return $content;
   
 }  }
   
 #  #
Line 381  sub is_valid_alpha_code { Line 385  sub is_valid_alpha_code {
 sub is_code_valid {  sub is_code_valid {
     my ($code_value, $code_option) = @_;      my ($code_value, $code_option) = @_;
     my ($code_type, $code_length) = ('letter', 6); # defaults.      my ($code_type, $code_length) = ('letter', 6); # defaults.
     open(FG, $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');      my @lines = &Apache::grades::get_scantronformat_file();
     foreach my $line (<FG>) {      foreach my $line (@lines) {
  my ($name, $type, $length) = (split(/:/, $line))[0,2,4];   my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
  if($name eq $code_option) {   if($name eq $code_option) {
     $code_length = $length;      $code_length = $length;
Line 500  sub adjust_number_to_print { Line 504  sub adjust_number_to_print {
  #  Unmodified.   #  Unmodified.
     } else {      } else {
  # Error!!!!   # Error!!!!
   
  croak "bad SPLIT_PDFS: $split_pdf in lonprintout::adjust_number_to_print";   croak "bad SPLIT_PDFS: $split_pdf in lonprintout::adjust_number_to_print";
   
     }      }
 }  }
   
   
 sub character_chart {  sub character_chart {
       my $result = shift;
       return  &Apache::entities::replace_entities($result);
   }
   
   sub old_character_chart {
     my $result = shift;      my $result = shift;
     $result =~ s/&\#0?0?(7|9);//g;      $result =~ s/&\#0?0?(7|9);//g;
     $result =~ s/&\#0?(10|13);//g;      $result =~ s/&\#0?(10|13);//g;
Line 627  sub character_chart { Line 638  sub character_chart {
     $result =~ s/&(\#165|yen);/\\textyen /g;      $result =~ s/&(\#165|yen);/\\textyen /g;
     $result =~ s/&(\#166|brvbar);/\\textbrokenbar /g;      $result =~ s/&(\#166|brvbar);/\\textbrokenbar /g;
     $result =~ s/&(\#167|sect);/\\textsection /g;      $result =~ s/&(\#167|sect);/\\textsection /g;
     $result =~ s/&(\#168|uml);/\\texthighdieresis /g;      $result =~ s/&(\#168|uml);/\\"\{\} /g;
     $result =~ s/&(\#169|copy);/\\copyright /g;      $result =~ s/&(\#169|copy);/\\copyright /g;
     $result =~ s/&(\#170|ordf);/\\textordfeminine /g;      $result =~ s/&(\#170|ordf);/\\textordfeminine /g;
     $result =~ s/&(\#172|not);/\\ensuremath\{\\neg\}/g;      $result =~ s/&(\#172|not);/\\ensuremath\{\\neg\}/g;
Line 638  sub character_chart { Line 649  sub character_chart {
     $result =~ s/&(\#177|plusmn);/\\ensuremath\{\\pm\}/g;      $result =~ s/&(\#177|plusmn);/\\ensuremath\{\\pm\}/g;
     $result =~ s/&(\#178|sup2);/\\ensuremath\{^2\}/g;      $result =~ s/&(\#178|sup2);/\\ensuremath\{^2\}/g;
     $result =~ s/&(\#179|sup3);/\\ensuremath\{^3\}/g;      $result =~ s/&(\#179|sup3);/\\ensuremath\{^3\}/g;
     $result =~ s/&(\#180|acute);/\\textacute /g;      $result =~ s/&(\#180|acute);/\\'\{\} /g;
     $result =~ s/&(\#181|micro);/\\ensuremath\{\\mu\}/g;      $result =~ s/&(\#181|micro);/\\ensuremath\{\\mu\}/g;
     $result =~ s/&(\#182|para);/\\P/g;      $result =~ s/&(\#182|para);/\\P/g;
     $result =~ s/&(\#183|middot);/\\ensuremath\{\\cdot\}/g;      $result =~ s/&(\#183|middot);/\\ensuremath\{\\cdot\}/g;
Line 1140  sub print_latex_header { Line 1151  sub print_latex_header {
      '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".       '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
      '\usepackage{wrapfig}'.       '\usepackage{wrapfig}'.
      '\usepackage{picins}\usepackage{calc}'."\n".       '\usepackage{picins}\usepackage{calc}'."\n".
      '\usepackage[utf8]{inputenc}'."\n".       '\usepackage[T1]{fontenc}'."\n".
                '\usepackage{lmodern}'."\n".
        '\usepackage[postscript]{ucs}'."\n".
        '\usepackage[utf8x]{inputenc}'."\n".
        '\usepackage{pifont}'  . "\n".
        '\usepackage{latexsym}'."\n".
        '\usepackage{amsmath}'.
        '\usepackage{amssymb}'.
        '\usepackage{amsfonts}'.
        '\usepackage{amsthm}'.
        '\usepackage{amscd}'.
      '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".       '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
      '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".       '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
      '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".       '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".
Line 1487  ENDPART Line 1508  ENDPART
     }      }
           
     if ($helper->{'VARS'}->{'style_file'}=~/\w/) {      if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
  &Apache::lonnet::appenv('construct.style' =>   &Apache::lonnet::appenv({'construct.style' =>
  $helper->{'VARS'}->{'style_file'});   $helper->{'VARS'}->{'style_file'}});
     } elsif ($env{'construct.style'}) {      } elsif ($env{'construct.style'}) {
  &Apache::lonnet::delenv('construct\\.style');   &Apache::lonnet::delenv('construct\\.style');
     }      }
Line 1531  ENDPART Line 1552  ENDPART
     $rndseed=$helper->{'VARS'}->{'curseed'};      $rndseed=$helper->{'VARS'}->{'curseed'};
  }   }
  $form{'rndseed'}=$rndseed;   $form{'rndseed'}=$rndseed;
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(\%moreenv);
   
  &Apache::lonxml::clear_problem_counter();   &Apache::lonxml::clear_problem_counter();
   
Line 1645  ENDPART Line 1666  ENDPART
              ($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')       or               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG       ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) {        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') 
        ) { 
   
   
         #-- produce an output string          #-- produce an output string
Line 1653  ENDPART Line 1675  ENDPART
     $selectionmade = 2;      $selectionmade = 2;
  } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {   } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {
     $selectionmade = 3;      $selectionmade = 3;
  } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {   } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') 
    ) {
     $selectionmade = 4;      $selectionmade = 4;
  } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') {  #BUGBUG   } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') {  #BUGBUG
     $selectionmade = 4;      $selectionmade = 4;
Line 1679  ENDPART Line 1702  ENDPART
  my $pbreakresources = keys %page_breaks;   my $pbreakresources = keys %page_breaks;
  for (my $i=0;$i<=$#master_seq;$i++) {   for (my $i=0;$i<=$#master_seq;$i++) {
   
             &Apache::lonenc::reset_enc();      &Apache::lonenc::reset_enc();
   
   
     # Note due to document structure, not allowed to put \newpage      # Note due to document structure, not allowed to put \newpage
     # prior to the first resource      # prior to the first resource
Line 1689  ENDPART Line 1713  ENDPART
     $result.="\\newpage\n";      $result.="\\newpage\n";
  }   }
     }      }
             my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);      my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
     $urlp=&Apache::lonnet::clutter($urlp);      $urlp=&Apache::lonnet::clutter($urlp);
     $form{'symb'}=$master_seq[$i];      $form{'symb'}=$master_seq[$i];
   
   
     my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #title of the assignment which contains this problem      my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #title of the assignment which contains this problem
   
     if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}      if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
Line 1806  ENDPART Line 1831  ENDPART
  }   }
  $result .= '\end{document}';   $result .= '\end{document}';
      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||       } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
         ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ||
       ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
   
   
      #-- prints assignments for whole class or for selected students         #-- prints assignments for whole class or for selected students  
  my $type;   my $type;
  if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {   if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ) {
      $selectionmade=5;       $selectionmade=5;
      $type='problems';       $type='problems';
  } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') {   } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') {
Line 1908  ENDPART Line 1935  ENDPART
  my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};   my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
   
  my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};   my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
  open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');           my @lines = &Apache::grades::get_scantronformat_file();
  my ($code_type,$code_length)=('letter',6);   my ($code_type,$code_length)=('letter',6);
  foreach my $line (<FH>) {   foreach my $line (@lines) {
      my ($name,$type,$length) = (split(/:/,$line))[0,2,4];       my ($name,$type,$length) = (split(/:/,$line))[0,2,4];
      if ($name eq $code_option) {       if ($name eq $code_option) {
  $code_length=$length;   $code_length=$length;
Line 2002  ENDPART Line 2029  ENDPART
  }   }
  for (my $i=0;$i<=$#list_of_files;$i++) {   for (my $i=0;$i<=$#list_of_files;$i++) {
   
             &Apache::lonenc::reset_enc();      &Apache::lonenc::reset_enc();
   
     my $urlp = $list_of_files[$i];      my $urlp = $list_of_files[$i];
     $urlp=~s|//|/|;      $urlp=~s|//|/|;
Line 2097  ENDPART Line 2124  ENDPART
  }   }
     }      }
   
   
     # If there's been an unrecoverable SSI error, report it to the user  
     # otherwise, we can write the tex file.  
     #  
   
 #-- writing .tex file in prtspool   #-- writing .tex file in prtspool 
     my $temp_file;      my $temp_file;
     my $identifier = &Apache::loncommon::get_cgi_id();      my $identifier = &Apache::loncommon::get_cgi_id();
     my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_$identifier.tex";      my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_$identifier.tex";
     if (!($#print_array>0)) {       if (!($#print_array>0)) { 
         unless ($temp_file = Apache::File->new('>'.$filename)) {         unless ($temp_file = Apache::File->new('>'.$filename)) {
     $r->log_error("Couldn't open $filename for output $!");    $r->log_error("Couldn't open $filename for output $!");
     return SERVER_ERROR;     return SERVER_ERROR; 
  }         }
  print $temp_file $result;         print $temp_file $result;
  my $begin=index($result,'\begin{document}',0);         my $begin=index($result,'\begin{document}',0);
  my $inc=substr($result,0,$begin+16);         my $inc=substr($result,0,$begin+16); 
     } else {      } else {
         my $begin=index($result,'\begin{document}',0);         my $begin=index($result,'\begin{document}',0);
  my $inc=substr($result,0,$begin+16);         my $inc=substr($result,0,$begin+16);
  for (my $i=0;$i<=$#print_array;$i++) {         for (my $i=0;$i<=$#print_array;$i++) {
     if ($i==0) {    if ($i==0) {
         $print_array[$i]=$result;        $print_array[$i]=$result;
     } else {    } else {
         $print_array[$i].='\end{document}';        $print_array[$i].='\end{document}';
         $print_array[$i] =         $print_array[$i] = 
     &latex_corrections($number_of_columns,$print_array[$i],   &latex_corrections($number_of_columns,$print_array[$i],
        $selectionmade,      $selectionmade, 
        $helper->{'VARS'}->{'ANSWER_TYPE'});     $helper->{'VARS'}->{'ANSWER_TYPE'});
           
  my $anobegin=index($print_array[$i],'\setcounter{page}',0);        my $anobegin=index($print_array[$i],'\setcounter{page}',0);
  substr($print_array[$i],0,$anobegin)='';        substr($print_array[$i],0,$anobegin)='';
  $print_array[$i]=$inc.$print_array[$i];        $print_array[$i]=$inc.$print_array[$i];
     }    }
     my $temp_file;    my $temp_file;
     my $newfilename=$filename;    my $newfilename=$filename;
     my $num=$i+1;    my $num=$i+1;
     $newfilename =~s/\.tex$//;     $newfilename =~s/\.tex$//; 
     $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);    $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);
     unless ($temp_file = Apache::File->new('>'.$newfilename)) {    unless ($temp_file = Apache::File->new('>'.$newfilename)) {
  $r->log_error("Couldn't open $newfilename for output $!");        $r->log_error("Couldn't open $newfilename for output $!");
  return SERVER_ERROR;         return SERVER_ERROR; 
     }    }
     print $temp_file $print_array[$i];    print $temp_file $print_array[$i];
  }         }
     }      }
     my $student_names='';      my $student_names='';
     if ($#print_array>0) {      if ($#print_array>0) {
  for (my $i=0;$i<=$#print_array;$i++) {          for (my $i=0;$i<=$#print_array;$i++) {
     $student_names.=$student_names[$i].'_ENDPERSON_';     $student_names.=$student_names[$i].'_ENDPERSON_';
  }   }
     } else {      } else {
  if ($#student_names>-1) {   if ($#student_names>-1) {
     $student_names=$student_names[0].'_ENDPERSON_';     $student_names=$student_names[0].'_ENDPERSON_';
  } else {   } else {
     my $fullname = &get_name($env{'user.name'},$env{'user.domain'});             my $fullname = &get_name($env{'user.name'},$env{'user.domain'});
     $student_names=join(':',$env{'user.name'},$env{'user.domain'},     $student_names=join(':',$env{'user.name'},$env{'user.domain'},
         $env{'request.course.sec'},$fullname).      $env{'request.course.sec'},$fullname).
  '_ENDPERSON_'.'_END_';   '_ENDPERSON_'.'_END_';
  }   }
     }       }
   
        # logic for now is too complex to trace if this has been defined
        #  yet.
        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
        &Apache::lonnet::appenv({'cgi.'.$identifier.'.file'   => $filename,
    'cgi.'.$identifier.'.layout'  => $laystyle,
    'cgi.'.$identifier.'.numcol'  => $numberofcolumns,
    'cgi.'.$identifier.'.paper'  => $papersize,
    'cgi.'.$identifier.'.selection' => $selectionmade,
    'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
    'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
    'cgi.'.$identifier.'.role' => $perm{'pav'},
    'cgi.'.$identifier.'.numberoffiles' => $#print_array,
    'cgi.'.$identifier.'.studentnames' => $student_names,
    'cgi.'.$identifier.'.backref' => $URLback,});
       &Apache::lonnet::appenv({"cgi.$identifier.user"    => $env{'user.name'},
    "cgi.$identifier.domain"  => $env{'user.domain'},
    "cgi.$identifier.courseid" => $cnum, 
    "cgi.$identifier.coursedom" => $cdom, 
    "cgi.$identifier.resources" => $resources_printed});
   
     # logic for now is too complex to trace if this has been defined  
     #  yet.  
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};  
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};  
     &Apache::lonnet::appenv('cgi.'.$identifier.'.file'   => $filename,  
     'cgi.'.$identifier.'.layout'  => $laystyle,  
     'cgi.'.$identifier.'.numcol'  => $numberofcolumns,  
     'cgi.'.$identifier.'.paper'  => $papersize,  
     'cgi.'.$identifier.'.selection' => $selectionmade,  
     'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},  
     'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},  
     'cgi.'.$identifier.'.role' => $perm{'pav'},  
     'cgi.'.$identifier.'.numberoffiles' => $#print_array,  
     'cgi.'.$identifier.'.studentnames' => $student_names,  
     'cgi.'.$identifier.'.backref' => $URLback,);  
     &Apache::lonnet::appenv("cgi.$identifier.user"    => $env{'user.name'},  
     "cgi.$identifier.domain"  => $env{'user.domain'},  
     "cgi.$identifier.courseid" => $cnum,   
     "cgi.$identifier.coursedom" => $cdom,   
     "cgi.$identifier.resources" => $resources_printed);  
     my $end_page = &Apache::loncommon::end_page();      my $end_page = &Apache::loncommon::end_page();
     my $continue_text = &mt('Continue');      my $continue_text = &mt('Continue');
     # If there's been an unrecoverable SSI error, report it to the user      # If there's been an unrecoverable SSI error, report it to the user
Line 2191  ENDPART Line 2214  ENDPART
                   &mt('You may be able to reprint the individual resources for which this error occurred, as the issue may be temporary.').                    &mt('You may be able to reprint the individual resources for which this error occurred, as the issue may be temporary.').
                   '<br />'.&mt('If the error persists, please contact the [_1] for assistance.',$helpurl).'</p><p>'.                    '<br />'.&mt('If the error persists, please contact the [_1] for assistance.',$helpurl).'</p><p>'.
                   &mt('We apologize for the inconvenience.').'</p>'.                    &mt('We apologize for the inconvenience.').'</p>'.
                   '<a href="/cgi-bin/printout.pl?'.$identifier.'">'.&mt('Continue').'</a>'.$end_page);                    '<a href="/cgi-bin/printout.pl?'.$identifier.'">'.$continue_text.'</a>'.$end_page);
     } else {      } else {
  $r->print(<<FINALEND);   $r->print(<<FINALEND);
 <br />  <br />
 <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />  <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />
 <a href="/cgi-bin/printout.pl?$identifier">Continue</a>  <a href="/cgi-bin/printout.pl?$identifier">$continue_text</a>
 $end_page  $end_page
 FINALEND  FINALEND
     }                                       # endif ssi errors.      }                                     # endif ssi errors.
 }  }
   
   
Line 2619  sub printHelper { Line 2642  sub printHelper {
     }      }
   
     # Useful filter strings      # Useful filter strings
     my $isProblem = '($res->is_problem()||$res->contains_problem) ';      my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;      $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence()';      my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()';
     my $isNotMap = '!$res->is_sequence()';      my $isNotMap = '!$res->is_sequence()';
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;      $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isMap = '$res->is_map()';      my $isMap = '$res->is_map()';
Line 2682  HELPERFRAGMENT Line 2705  HELPERFRAGMENT
   
         push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];          push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
  push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];   push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</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'];
          &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);           &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">    <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
     <resource variable="RESOURCES" toponly='0' multichoice="1"      <resource variable="RESOURCES" toponly='0' multichoice="1"
Line 2702  HELPERFRAGMENT Line 2726  HELPERFRAGMENT
       $start_new_option        $start_new_option
     </resource>      </resource>
   </state>    </state>
     <state name="ALL_PROBLEMS_STUDENTS" title="Select Problem(s) to print">
       <resource variable="RESOURCES" toponly='0' multichoice="1"
    suppressEmptySequences='0' addstatus="1" closeallpages="1">
         <nextstate>STUDENTS1</nextstate>
         <filterfunc>return $isProblemOrMap;</filterfunc>
         <choicefunc>return $isNotMap;</choicefunc>
         <valuefunc>return $symbFilter;</valuefunc>
         $start_new_option
       </resource>
     </state>
     <state name="STUDENTS1" title="Select People">
         <message><b>Select sorting order of printout</b> </message>
       <choices variable='student_sort'>
         <choice computer='0'>Sort by section then student</choice>
         <choice computer='1'>Sort by students across sections.</choice>
       </choices>
         <message><br /><hr /><br /> </message>
         <student multichoice='1' variable="STUDENTS" nextstate="PRINT_FORMATTING" coursepersonnel="1"/>
     </state>
   
 ALL_PROBLEMS  ALL_PROBLEMS
   
  if ($helper->{VARS}->{'assignment'}) {   if ($helper->{VARS}->{'assignment'}) {
Line 2811  CHOOSE_STUDENTS Line 2855  CHOOSE_STUDENTS
   
  }   }
   
           my @lines = &Apache::grades::get_scantronformat_file();
  open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');  
  my $codechoice='';   my $codechoice='';
  foreach my $line (<FH>) {   foreach my $line (@lines) {
     my ($name,$description,$code_type,$code_length)=      my ($name,$description,$code_type,$code_length)=
  (split(/:/,$line))[0,1,2,4];   (split(/:/,$line))[0,1,2,4];
     if ($code_length > 0 &&       if ($code_length > 0 && 
Removed from v.1.519.2.4  
changed lines
  Added in v.1.536.2.3

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