version 1.616, 2012/05/28 10:31:17
|
version 1.624, 2012/11/30 20:48:27
|
Line 102 sub printable_sequence {
|
Line 102 sub printable_sequence {
|
|
|
if ($res->is_sequence()) { |
if ($res->is_sequence()) { |
my $symb = $res->symb(); |
my $symb = $res->symb(); |
&Apache::lonnet::logthis("Symb: $symb"); |
|
my $navmap = $res->{NAV_MAP}; |
my $navmap = $res->{NAV_MAP}; |
|
|
# Find the first resource in the map: |
# Find the first resource in the map: |
Line 111 sub printable_sequence {
|
Line 110 sub printable_sequence {
|
my $first = $iterator->next(); |
my $first = $iterator->next(); |
|
|
while (1) { |
while (1) { |
if ($first == $iterator->END_ITERATOR) { |
if ($first == $iterator->END_ITERATOR) { last; } |
&Apache::lonnet::logthis("End of iterator"); |
|
last; } |
|
if (ref($first)) { |
|
&Apache::lonnet::logthis("Looking at: " . $first->symb()); |
|
} else { |
|
&Apache::lonnet::logthis("Got: $first"); |
|
} |
|
if (ref($first) && ! $first->is_sequence()) {last; } |
if (ref($first) && ! $first->is_sequence()) {last; } |
$first = $iterator->next(); |
$first = $iterator->next(); |
} |
} |
Line 127 sub printable_sequence {
|
Line 119 sub printable_sequence {
|
# Might be an empty map: |
# Might be an empty map: |
|
|
if (!ref($first)) { |
if (!ref($first)) { |
&Apache::lonnet::logthis("printable_sequence: empty"); |
|
return 0; |
return 0; |
} |
} |
my $partsref = $first->parts(); |
my $partsref = $first->parts(); |
my @parts = @$partsref; |
my @parts = @$partsref; |
&Apache::lonnet::logthis("Dates for " . $first->symb()); |
|
my ($open, $close) = $navmap->map_printdates($first, $parts[0]); |
my ($open, $close) = $navmap->map_printdates($first, $parts[0]); |
&Apache::lonnet::logthis("Opens $open, closes $close"); |
|
&Apache::lonnet::logthis(ctime($open)); |
|
&Apache::lonnet::logthis(ctime($close)); |
|
return &printable($open, $close); |
return &printable($open, $close); |
} |
} |
return 0; |
return 0; |
Line 595 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 645 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 671 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 1246 sub is_code_valid {
|
Line 1236 sub is_code_valid {
|
} |
} |
|
|
} |
} |
|
# |
|
# Compare two students by section (Used to sort by section). |
|
# |
|
# Implicit inputs, |
|
# $a - The first one |
|
# $b - The second one. |
|
# |
|
# Returns: |
|
# a-section cmp b-section |
|
# |
|
sub compare_sections { |
|
my ($u1, $d1, $s1, $n1, $stat1) = split(/:/, $a); |
|
my ($u2, $d2, $s2, $n2, $stat2) = split(/:/, $b); |
|
|
|
return $s1 cmp $s2; |
|
} |
|
|
# Compare two students by name. The students are in the form |
# Compare two students by name. The students are in the form |
# returned by the helper: |
# returned by the helper: |
Line 2054 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 2133 sub print_page_in_course {
|
Line 2140 sub print_page_in_course {
|
my @page_resources = $navmap->retrieveResources($resource_src); |
my @page_resources = $navmap->retrieveResources($resource_src); |
$result .= &print_page_in_course($helper, $rparmhash, |
$result .= &print_page_in_course($helper, $rparmhash, |
$resource_src, \@page_resources); |
$resource_src, \@page_resources); |
|
} elsif ($resource->ext()) { |
|
$result .= &unsupported($currentURL,$mode,$symb); |
} |
} |
# these resources go through the XML transformer: |
# these resources go through the XML transformer: |
|
|
Line 2599 sub print_construction_sequence {
|
Line 2608 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 2872 ENDPART
|
Line 2882 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 3015 ENDPART
|
Line 3024 ENDPART
|
$assignment, |
$assignment, |
$courseidinfo, |
$courseidinfo, |
$name); |
$name); |
|
|
if ($numberofcolumns eq '1') { |
if ($numberofcolumns eq '1') { |
$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm '; |
$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm '; |
} else { |
} else { |
Line 3116 ENDPART
|
Line 3124 ENDPART
|
if (($helper->{'VARS'}->{'student_sort'} eq 1) && |
if (($helper->{'VARS'}->{'student_sort'} eq 1) && |
($helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections")) { |
($helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections")) { |
@students = sort compare_names @students; |
@students = sort compare_names @students; |
|
} else { |
|
@students = sort compare_sections @students; |
} |
} |
&adjust_number_to_print($helper); |
&adjust_number_to_print($helper); |
|
|
Line 3525 sub print_resources {
|
Line 3535 sub print_resources {
|
my $fullname = &get_name($username,$userdomain); |
my $fullname = &get_name($username,$userdomain); |
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 3563 sub print_resources {
|
Line 3574 sub print_resources {
|
# |
# |
|
|
my $syllabus_first = 0; |
my $syllabus_first = 0; |
|
my $current_assignment = ""; |
|
my $assignment; |
|
my $courseidinfo = &get_course(); |
|
|
foreach my $curresline (@{$master_seq}) { |
foreach my $curresline (@{$master_seq}) { |
if (defined $page_breaks{$curresline}) { |
if (defined $page_breaks{$curresline}) { |
if($i != 0) { |
if($i != 0) { |
Line 3571 sub print_resources {
|
Line 3586 sub print_resources {
|
} |
} |
$current_output .= &get_extra_vspaces($helper, $curresline); |
$current_output .= &get_extra_vspaces($helper, $curresline); |
$i++; |
$i++; |
|
my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline); |
|
|
|
# See if we need to emit a new header: |
|
|
if ( !($type eq 'problems' && |
if ( !($type eq 'problems' && |
($curresline!~ m/$LONCAPA::assess_page_re/)) ) { |
($curresline!~ m/$LONCAPA::assess_page_re/)) ) { |
my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline); |
|
if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) { |
if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) { |
next; |
next; |
} |
} |
Line 3677 sub print_resources {
|
Line 3695 sub print_resources {
|
} |
} |
$remove_latex_header = 'YES'; |
$remove_latex_header = 'YES'; |
} |
} |
|
$assignment = &Apache::lonxml::latex_special_symbols( |
|
&Apache::lonnet::gettitle($map), 'header'); |
|
if (($assignment ne $current_assignment) && ($assignment ne "")) { |
|
my $header_line = &format_page_header($LaTeXwidth, $parmhash{'print_header_format'}, |
|
$assignment, $courseidinfo, |
|
$fullname, $usersection); |
|
my $header_start = ($columns_in_format == 1) ? '\lhead' |
|
: '\fancyhead[LO]'; |
|
$header_line = $header_start.'{'.$header_line.'}'; |
|
$current_output = $current_output . $header_line; |
|
$current_assignment = $assignment; |
|
} |
|
|
if (&Apache::loncommon::connection_aborted($r)) { last; } |
if (&Apache::loncommon::connection_aborted($r)) { last; } |
} |
} |
# If we are printing incomplete it's possible we don't have |
# If we are printing incomplete it's possible we don't have |
Line 3697 sub print_resources {
|
Line 3728 sub print_resources {
|
if ($syllabus_first) { |
if ($syllabus_first) { |
$current_output =~ s/\\\\ Last updated:/Last updated:/ |
$current_output =~ s/\\\\ Last updated:/Last updated:/ |
} |
} |
my $courseidinfo = &get_course(); |
if (0) { |
my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header'); |
my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header'); |
my $header_line = |
my $header_line = |
&format_page_header($LaTeXwidth, $parmhash{'print_header_format'}, |
&format_page_header($LaTeXwidth, $parmhash{'print_header_format'}, |
$currentassignment, $courseidinfo, $fullname, $usersection); |
$currentassignment, $courseidinfo, $fullname, $usersection); |
my $header_start = ($columns_in_format == 1) ? '\lhead' |
my $header_start = ($columns_in_format == 1) ? '\lhead' |
: '\fancyhead[LO]'; |
: '\fancyhead[LO]'; |
$header_line = $header_start.'{'.$header_line.'}'; |
$header_line = $header_start.'{'.$header_line.'}'; |
|
} |
if ($current_output=~/\\documentclass/) { |
if ($current_output=~/\\documentclass/) { |
$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /; |
# $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /; |
|
$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$namepostfix}\\vskip 5 mm /; |
|
|
} else { |
} else { |
my $blankpages = |
my $blankpages = |
'\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'}; |
'\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'}; |
|
|
|
# $current_output = '\strut\vspace*{-6 mm}\\newline'. |
|
# ©right_line().' \newpage '.$blankpages.$end_of_student. |
|
# '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'. |
|
# $header_line.$namepostfix. '} \vskip 5 mm '.$current_output; |
$current_output = '\strut\vspace*{-6 mm}\\newline'. |
$current_output = '\strut\vspace*{-6 mm}\\newline'. |
©right_line().' \newpage '.$blankpages.$end_of_student. |
©right_line().' \newpage '.$blankpages.$end_of_student. |
'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'. |
'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent' |
$header_line.$namepostfix.'} \vskip 5 mm '.$current_output; |
.$namepostfix. '} \vskip 5 mm '.$current_output; |
|
|
} |
} |
# |
# |
# Close the student bracketing. |
# Close the student bracketing. |
Line 3763 sub handler {
|
Line 3802 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 4182 sub printHelper {
|
Line 4220 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', |