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

Diff for /loncom/interface/lonprintout.pm between versions 1.619 and 1.623

version 1.619, 2012/06/11 11:07:33 version 1.623, 2012/11/30 20:38:01
Line 582  sub printable { Line 582  sub printable {
 sub get_print_dates {  sub get_print_dates {
     my $res = shift;      my $res = shift;
     my $partsref = $res->parts();      my $partsref = $res->parts();
     my @parts   = @$partsref;      my @parts;
       if (ref($partsref) eq 'ARRAY') {
           @parts   = @{$partsref};
       }
     my $open_date;      my $open_date;
     my $close_date;      my $close_date;
     my @open_dates;      my @open_dates;
     my @close_dates;      my @close_dates;
   
   
     if (defined(@parts) && (scalar(@parts) > 0)) {      if (@parts) {
  foreach my $part (@parts) {   foreach my $part (@parts) {
     my $partopen  = $res->parmval('printstartdate', $part);      my $partopen  = $res->parmval('printstartdate', $part);
     my $partclose = $res->parmval('printenddate',  $part);      my $partclose = $res->parmval('printenddate',  $part);
Line 632  sub course_print_dates { Line 635  sub course_print_dates {
   
     # Don't bother looping over undefined or empty parts arraY;      # Don't bother looping over undefined or empty parts arraY;
   
     if (defined(@parts) && (scalar(@parts) > 0)) {      if (@parts) {
  foreach my $part (@parts) {   foreach my $part (@parts) {
     my ($partopen, $partclose) = $navmap->course_printdates($res, $part);      my ($partopen, $partclose) = $navmap->course_printdates($res, $part);
     push(@open_dates, $partopen);      push(@open_dates, $partopen);
Line 658  sub map_print_dates { Line 661  sub map_print_dates {
   
     # Don't bother looping over undefined or empty parts arraY;      # Don't bother looping over undefined or empty parts arraY;
   
     if (defined(@parts) && (scalar(@parts) > 0)) {      if (@parts) {
  foreach my $part (@parts) {   foreach my $part (@parts) {
     my ($partopen, $partclose) = $navmap->map_printdates($res, $part);      my ($partopen, $partclose) = $navmap->map_printdates($res, $part);
     push(@open_dates, $partopen);      push(@open_dates, $partopen);
Line 2057  sub unsupported { Line 2060  sub unsupported {
     my $result.= &print_latex_header($mode);      my $result.= &print_latex_header($mode);
     if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {      if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
  $currentURL=~s|^(/adm/wrapper/)?ext/|http://|;   $currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
           $currentURL=~s|^http://https://|https://|;
  my $title=&Apache::lonnet::gettitle($symb);   my $title=&Apache::lonnet::gettitle($symb);
  $title = &Apache::lonxml::latex_special_symbols($title);   $title = &Apache::lonxml::latex_special_symbols($title);
  $result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' ';   $result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' ';
Line 2602  sub print_construction_sequence { Line 2606  sub print_construction_sequence {
 #  For item 100, filtering was done at the helper level.  #  For item 100, filtering was done at the helper level.
   
 sub output_data {  sub output_data {
   
     my ($r,$helper,$rparmhash) = @_;      my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;      my %parmhash = %$rparmhash;
     $ssi_error = 0; # This will be set nonzero by failing ssi's.      $ssi_error = 0; # This will be set nonzero by failing ssi's.
Line 2875  ENDPART Line 2880  ENDPART
      ($print_type eq 'select_sequences')      or       ($print_type eq 'select_sequences')      or
      ($print_type eq 'map_incomplete_problems_seq')       ($print_type eq 'map_incomplete_problems_seq')
      ) {       ) {
   
     
         #-- produce an output string          #-- produce an output string
  if (($print_type eq 'map_problems')                or   if (($print_type eq 'map_problems')                or
Line 3530  sub print_resources { Line 3534  sub print_resources {
     my $namepostfix = "\\\\"; # Both anon and not anon should get the same vspace.      my $namepostfix = "\\\\"; # Both anon and not anon should get the same vspace.
   
   
   
     #      #
     # Figure out if we need to filter the output by      # Figure out if we need to filter the output by
     # the incomplete problems for that person      # the incomplete problems for that person
Line 3797  sub handler { Line 3800  sub handler {
     }      }
           
     &init_perm();      &init_perm();
   
     my $helper = printHelper($r);      my $helper = printHelper($r);
     if (!ref($helper)) {      if (!ref($helper)) {
  return $helper;   return $helper;
Line 4216  sub printHelper { Line 4218  sub printHelper {
     'RESOURCES',      'RESOURCES',
     'PAGESIZE',      'PAGESIZE',
     $map,      $map,
     ! $isProblem, '',      $isProblem, '',
     $symbFilter,      $symbFilter,
     $start_new_option);      $start_new_option);
     $helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',      $helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
Removed from v.1.619  
changed lines
  Added in v.1.623

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