Diff for /loncom/interface/lonprintout.pm between versions 1.450 and 1.453

version 1.450, 2006/06/30 04:23:29 version 1.453, 2006/07/03 10:25:07
Line 702  sub get_name { Line 702  sub get_name {
     if (!defined($udom)) { $udom=$env{'user.domain'}; }      if (!defined($udom)) { $udom=$env{'user.domain'}; }
     my $plainname=&Apache::loncommon::plainname($uname,$udom);      my $plainname=&Apache::loncommon::plainname($uname,$udom);
     if ($plainname=~/^\s*$/) { $plainname=$uname.'@'.$udom; }      if ($plainname=~/^\s*$/) { $plainname=$uname.'@'.$udom; }
    #  $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');     $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
     $plainname = &escape_LaTeX($plainname);  
     return $plainname;      return $plainname;
 }  }
   
Line 1562  ENDPART Line 1561  ENDPART
  }   }
  my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};   my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
  my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});   my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
    &adjust_number_to_print($helper);
  my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};   my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
  if ($number_per_page eq '0' || $number_per_page eq 'all') {   if ($number_per_page eq '0' || $number_per_page eq 'all') {
      $number_per_page=$num_todo;       $number_per_page=$num_todo;
Line 1673  ENDPART Line 1673  ENDPART
        $selectionmade,          $selectionmade, 
        $helper->{'VARS'}->{'ANSWER_TYPE'});         $helper->{'VARS'}->{'ANSWER_TYPE'});
     }      }
       if ($numberofcolumns == 1) {
     $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;   $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
     $result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;   $result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
     $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;   $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
     $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;   $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
       }
   
 #-- writing .tex file in prtspool   #-- writing .tex file in prtspool 
     my $temp_file;      my $temp_file;
Line 2304  CHOOSE_STUDENTS Line 2304  CHOOSE_STUDENTS
     }      }
  }   }
   
  my $code_selection = "<choice></choice>\n";   my $code_selection;
  foreach my $code (sort {uc($a) cmp uc($b)} (keys(%codes_to_print))) {   foreach my $code (sort {uc($a) cmp uc($b)} (keys(%codes_to_print))) {
     my $choice  = $code;      my $choice  = $code;
     if ($code =~ /^[A-Z]+$/) { # Alpha code      if ($code =~ /^[A-Z]+$/) { # Alpha code
Line 2316  CHOOSE_STUDENTS Line 2316  CHOOSE_STUDENTS
     $code_selection .='         $code_selection .='   
     <message><b>Choose single code from list</b></message>      <message><b>Choose single code from list</b></message>
  <message></td><td></message>   <message></td><td></message>
  <choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">   <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
                     <choice></choice>
                   <exec>                    <exec>
                      push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});                       push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
                   </exec>                    </exec>
  </choices>   </dropdown>
     <message></td></tr><tr><td colspan="2"><hr width=\'33%\' /></td></tr><tr><td></message>      <message></td></tr><tr><td colspan="2"><hr width=\'33%\' /></td></tr><tr><td></message>
             '.$/;              '.$/;
   
Line 2952  sub preprocess { Line 2953  sub preprocess {
     my $helper = Apache::lonhelper::getHelper();      my $helper = Apache::lonhelper::getHelper();
   
     my $format = $helper->{VARS}->{$self->{'formatvar'}};      my $format = $helper->{VARS}->{$self->{'formatvar'}};
 #    if (substr($format, 2, 1) ne '1') {      if (substr($format, 2, 1) ne '1') {
 #        $helper->changeState($self->{NEXTSTATE});          $helper->changeState($self->{NEXTSTATE});
 #    }      }
         
     return 1;      return 1;
 }  }

Removed from v.1.450  
changed lines
  Added in v.1.453


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