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

Diff for /loncom/interface/lonprintout.pm between versions 1.575 and 1.578

version 1.575, 2010/04/19 10:29:40 version 1.578, 2010/05/24 09:32:11
Line 201  sub generate_code_selector { Line 201  sub generate_code_selector {
  if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&   if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
     !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
             !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&              !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
     !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'} ) {
   
     return "You need to specify the number of assignments to print";      return "You need to specify the number of assignments to print";
  }   }
           if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
                (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
               return 'Specifying number of codes to print and a specific code is not compatible';
           }
  return undef;   return undef;
        </validator>         </validator>
     </string>      </string>
Line 228  sub generate_code_selector { Line 233  sub generate_code_selector {
       !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {        !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
       return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},        return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
       \$helper->{'VARS'}{'CODE_OPTION'});        \$helper->{'VARS'}{'CODE_OPTION'});
     } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
         return 'Specifying a code name is incompatible with specifying number of codes.';
    } else {     } else {
        return undef; # Other forces control us.         return undef; # Other forces control us.
    }     }
Line 1583  sub print_page_in_course { Line 1590  sub print_page_in_course {
  }   }
  # these resources go through the XML transformer:   # these resources go through the XML transformer:
   
  elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm\xhtml|xhtm)$/)  {   elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/)  {
     my $urlp = &Apache::lonnet::clutter($resource_src);      my $urlp = &Apache::lonnet::clutter($resource_src);
     my %form;      my %form;
     my %moreenv;      my %moreenv;
Line 1594  sub print_page_in_course { Line 1601  sub print_page_in_course {
   
     $form{'grade_target'}  = 'tex';      $form{'grade_target'}  = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);      $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
     $form{'pdfFormFiels'} = $pdfFormFields; #       $form{'pdfFormFields'} = $pdfFormFields; # 
     $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};          $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};    
           
     $form{'problem_split'}=$parmhash{'problem_stream_switch'};      $form{'problem_split'}=$parmhash{'problem_stream_switch'};
Line 3731  CHOOSE_STUDENTS1 Line 3738  CHOOSE_STUDENTS1
     !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
     return "You need to specify the number of assignments to print";      return "You need to specify the number of assignments to print";
  }   }
           if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
                (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
               return 'Specifying number of codes to print and a specific code is not compatible';
           }
  return undef;   return undef;
        </validator>         </validator>
     </string>      </string>
Line 3754  CHOOSE_STUDENTS1 Line 3765  CHOOSE_STUDENTS1
       !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {        !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
       return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},        return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
       \$helper->{'VARS'}{'CODE_OPTION'});        \$helper->{'VARS'}{'CODE_OPTION'});
     } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
         return 'Specifying a code name is incompatible specifying number of codes.';
    } else {     } else {
        return undef; # Other forces control us.         return undef; # Other forces control us.
    }     }
Removed from v.1.575  
changed lines
  Added in v.1.578

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