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

Diff for /loncom/interface/lonprintout.pm between versions 1.624 and 1.625

version 1.624, 2012/11/30 20:48:27 version 1.625, 2012/12/08 20:10:26
Line 718  sub incomplete { Line 718  sub incomplete {
 #   print_resources.  #   print_resources.
 #   # 
 sub master_seq_to_person_seq {  sub master_seq_to_person_seq {
     my ($helper, $seq, $who) = @_;      my ($helper, $seq, $who, $code) = @_;
   
   
     my ($username, $userdomain, $usersection) = split(/:/, $who);      my ($username, $userdomain, $usersection) = split(/:/, $who);
Line 732  sub master_seq_to_person_seq { Line 732  sub master_seq_to_person_seq {
     my @output_seq;      my @output_seq;
           
     my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});      my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
     my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain);      my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain,
                                                              $code);
     my $iterator         = $navmap->getIterator($navmap->firstResource(),      my $iterator         = $navmap->getIterator($navmap->firstResource(),
  $navmap->finishResource(),   $navmap->finishResource(),
  {}, 1);   {}, 1);
Line 3204  ENDPART Line 3205  ENDPART
  my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};   my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
  my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};   my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};
  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'};
          my @lines = &Apache::grades::get_scantronformat_file();           my @lines = &Apache::grades::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);
Line 3221  ENDPART Line 3221  ENDPART
                  }                   }
      }       }
  }   }
            my ($randomorder,$randompick);
            if ($helper->{VARS}{'symb'}) {
                my $navmap = Apache::lonnavmaps::navmap->new();
                if (defined($navmap)) {
                    my ($map,$id,$resource) = 
                        &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
                    if ($map) {
                        my $res = $navmap->getResourceByUrl($map);
                        $randomorder = $res->randomorder();
                        $randompick = $res->randompick();
                    }
                }
            }
  my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));   my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
  $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};   $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
          $moreenv{'instructor_comments'}='hide';           $moreenv{'instructor_comments'}='hide';
Line 3282  ENDPART Line 3295  ENDPART
      } else {       } else {
  $moreenv{'CODE'}=&num_to_letters($code);   $moreenv{'CODE'}=&num_to_letters($code);
      }       }
                my $actual_seq = \@master_seq;
                if ($randomorder) {
                    $env{'form.CODE'} = $moreenv{'CODE'};
                    $actual_seq = master_seq_to_person_seq($helper,\@master_seq,undef,
                                                           $moreenv{'CODE'});
                    delete($env{'form.CODE'});
                }
      my ($output,$fullname, $printed)=       my ($output,$fullname, $printed)=
  &print_resources($r,$helper,'anonymous',$type,\%moreenv,   &print_resources($r,$helper,'anonymous',$type,\%moreenv,
   \@master_seq,$flag_latex_header_remove,    $actual_seq,$flag_latex_header_remove,
   $LaTeXwidth);    $LaTeXwidth);
      $resources_printed .= ":";       $resources_printed .= ":";
      $print_array[$file_num].=$output;       $print_array[$file_num].=$output;
Removed from v.1.624  
changed lines
  Added in v.1.625

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