loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.498 and 1.501

version 1.498, 2007/04/20 20:13:58	version 1.501, 2007/05/02 01:33:49
Line 60 sub fetch_raw_resource {	Line 60 sub fetch_raw_resource {
my ($url) = @_;	my ($url) = @_;

my $filename = &Apache::lonnet::filelocation("", $url);	my $filename = &Apache::lonnet::filelocation("", $url);
#	my $contents = &Apache::lonnet::getfile($filename);
# fetch if needed:
#
if (! -e $filename) {
my $repcopy_result = &Apache::lonnet::repcopy($filename);

if ($repcopy_result ne 'ok') {	if ($contents == -1) {
return "File open failed for $filename"; # This will bomb the print.	return "File open failed for $filename"; # This will bomb the print.
}
}	}
my $contents = &Apache::lonnet::readfile($filename);

return $contents;	return $contents;


}	}

Line 1293 sub output_data {	Line 1287 sub output_data {
my ($r,$helper,$rparmhash) = @_;	my ($r,$helper,$rparmhash) = @_;
my %parmhash = %$rparmhash;	my %parmhash = %$rparmhash;
$resources_printed = '';	$resources_printed = '';
	my $do_postprocessing = 1;
my $js = <<ENDPART;	my $js = <<ENDPART;
<script type="text/javascript">	<script type="text/javascript">
var editbrowser;	var editbrowser;
Line 1489 ENDPART	Line 1484 ENDPART
#	#

$result = &fetch_raw_resource($currentURL);	$result = &fetch_raw_resource($currentURL);
	$do_postprocessing = 0; # Don't massage the result.

} else {	} else {
$result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},	$result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
Line 1894 ENDPART	Line 1890 ENDPART
$result .= '\end{document}';	$result .= '\end{document}';
}	}
#-------------------------------------------------------- corrections for the different page formats	#-------------------------------------------------------- corrections for the different page formats
$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
$result = &latex_corrections($number_of_columns,$result,$selectionmade,	# Only post process if that has not been turned off e.g. by a raw latex resource.
$helper->{'VARS'}->{'ANSWER_TYPE'});
#if ($numberofcolumns == 1) {	if ($do_postprocessing) {
	$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
	$result = &latex_corrections($number_of_columns,$result,$selectionmade,
	$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 2600 CHOOSE_STUDENTS	Line 2601 CHOOSE_STUDENTS
</validator>	</validator>
</string>	</string>
<message></td></tr><tr><td></message>	<message></td></tr><tr><td></message>
<message><b>Names to store the CODEs under for later:</b></message>	<message><b>Names to save the CODEs under for later:</b></message>
<message></td><td></message>	<message></td><td></message>
<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />	<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
<message></td></tr><tr><td></message>	<message></td></tr><tr><td></message>
Line 2711 CHOOSE_STUDENTS1	Line 2712 CHOOSE_STUDENTS1
</validator>	</validator>
</string>	</string>
<message></td></tr><tr><td></message>	<message></td></tr><tr><td></message>
<message><b>Names to store the CODEs under for later:</b></message>	<message><b>Names to save the CODEs under for later:</b></message>
<message></td><td></message>	<message></td><td></message>
<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />	<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
<message></td></tr><tr><td></message>	<message></td></tr><tr><td></message>

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

Removed from v.1.498
changed lines
	Added in v.1.501