--- loncom/interface/printout.pl 2005/07/05 10:23:35 1.83
+++ loncom/interface/printout.pl 2006/11/06 11:40:02 1.112
@@ -28,42 +28,39 @@
use lib '/home/httpd/lib/perl';
use LONCAPA::loncgi;
use File::Path;
+use File::Basename;
+use File::Copy;
use IO::File;
use Image::Magick;
-use Apache::lonhtmlcommon;
+use Apache::lonhtmlcommon();
use Apache::lonnet;
-use Apache::loncommon;
+use Apache::loncommon();
use Apache::lonlocal;
-use Apache::lonmsg;
+use Apache::lonmsg();
use LONCAPA::Enrollment;
use strict;
-#
# Determine if a user is operating as a student for this course/domain.
-#
-#
#Parameters:
-# course - The course id.
-# cdom - The course domain.
-#
+# none
#Implicit:
# $env{request.role} contains the role under which this user operated this
# this request.
sub is_student {
- return (! $env{'request.role.adv'});
+ return ($env{'request.role'}=~/^st\./);
}
#
# Debugging: Dump the environment for debugging.
#
sub dumpenv {
- print "
-------------------
";
+ print "
-------------------
";
foreach my $key (sort (keys %env)) {
- print "
$key -> $env{$key}";
+ print "
$key -> $env{$key}";
}
- print "
-------------------
";
+ print "
-------------------
";
}
#
@@ -111,16 +108,18 @@ sub send_error_mail {
# The user is a student in the course:
#
- if (&is_student( $courseid, $coursedom)) {
+ if (&is_student()) {
# build the subject and message body:
- # print "sending message to course coordinators.
";
+ # print "sending message to course coordinators.
";
# Todo: Convert badurl into a url from file path:
my $subject = "Error [$badurl] Print failed for $user".'@'.$domain;
my $message .= "Print failed to render LaTeX for $user".'@'."$domain\n";
$message .= " User was attempting to print: \n";
- $message .= " $resources\n";
+ foreach my $resource (split(/:/,$resources)) {
+ $message .= " $resource\n";
+ }
$message .= "--------------------LaTeX logfile:------------ \n";
$message .= $logfile;
$message .= "-----------------LaTeX source file: ------------\n";
@@ -130,9 +129,9 @@ sub send_error_mail {
}
my (undef, %receivers) = &Apache::lonfeedback::decide_receiver(undef, 0,
1,1,1);
- # print "
sending...section: $env{'request.course.sec'}";
+ # print "
sending...section: $env{'request.course.sec'}";
foreach my $dest (keys %receivers) {
- # print "
dest is $dest";
+ # print "
dest is $dest";
my @destinfo = split(/:/,$dest);
my $user = $destinfo[0];
my $dom = $destinfo[1];
@@ -163,8 +162,8 @@ END
}
&Apache::lonlocal::get_language_handle();
&Apache::loncommon::content_type(undef,'text/html');
- my $bodytag=&Apache::loncommon::bodytag('Creating PDF','','');
- print $bodytag;
+
+ print(&Apache::loncommon::start_page('Creating PDF'));
my $identifier = $ENV{'QUERY_STRING'};
my $texfile = $env{'cgi.'.$identifier.'.file'};
@@ -179,14 +178,14 @@ END
my $student_names = $env{'cgi.'.$identifier.'.studentnames'};
my $backref = &Apache::lonnet::unescape($env{'cgi.'.$identifier.'.backref'});
-
- my $adv = $env{'request.role.adv'};
my @names_pack=();
if ($student_names=~/_END_/) {
@names_pack=split(/_ENDPERSON_/,$student_names);
}
+print "Return to last resource.
";
+
my $figfile = $texfile;
$figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/;
my $duefile = $texfile;
@@ -201,16 +200,17 @@ END
close $temporary_file;
my $noteps;
my %prog_state;
- if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80'); }
+ if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80'); }
+ print('
');
foreach my $not_eps (@content_of_file) {
chomp($not_eps);
if ($not_eps ne '') {
- # print "Converting $not_eps"; # Debugging.
+ # print "Converting $not_eps"; # Debugging.
my $status_statement='EPS picture for '.$not_eps;
# print "$status_statement\n";
$not_eps=~s|\/\.\/|\/|g;
my $eps_f = $not_eps;
- $eps_f =~ s/\.[^.]*$/\.eps/i;
+ # $eps_f =~ s/\.[^.]*$/\.eps/i;
if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {
$eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;
$eps_f = '/home/httpd/prtspool/'.$eps_f;
@@ -222,35 +222,77 @@ END
$eps_f = '/home/httpd/prtspool/'.$1.'/'.$2;
}
$eps_f =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX.
- my $path=$eps_f;
- $path =~ s/\/([^\/]+)\.eps$//;
- # print "Final file path: $path "; # Debugging
- File::Path::mkpath($path,0,0777);
- $not_eps =~ s/^\s+//;
- $not_eps =~ s/\s+$//;
- $not_eps =~ s/ /\\ /g;
- if ( exists($done_conversion{$not_eps})) { next; }
- if ($adv) {
- my $prettyname=$not_eps;
- $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
- $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;
- &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname);
- }
- $done_conversion{$not_eps}=1;
- # print "Converting $not_eps -> $eps_f"; # Debugging
- system("convert $not_eps $eps_f");
- #check is eps exist in prtspool
- if(not -e $eps_f) {
- for (my $i=0;$i<10000;$i++) {
- if (-e $eps_f.'.'.$i) {
- rename $eps_f.'.'.$i, $eps_f;
- last;
+ #
+ # If the file is already an .eps or .ps file,
+ # We really just need to copy it from where it was to prtspool
+ # but with the spaces substituted to _'s.
+ #
+ my ($nsname,$path, $sext) = fileparse($not_eps, qr/\.(ps|eps)/i);
+ if ($sext =~/ps$/i) {
+ # print "$not_eps is a postscript file. copy to $path\n";
+ File::Path::mkpath($path,0,0777);
+# $not_eps =~ s/^\s+//;
+# $not_eps =~ s/\s+$//;
+# $not_eps =~ s/ /\__/g;
+ # print "Copying $not_eps to $eps_f\n";
+ copy("$not_eps", "$eps_f");
+ # print "Copy complete\n";
+ } else {
+
+ $eps_f .= '.eps'; # Just append the eps ext.
+ my $path=$eps_f;
+ $path =~ s/\/([^\/]+)\.eps$//;
+ # print "Final file path: $path "; # Debugging
+ File::Path::mkpath($path,0,0777);
+ $not_eps =~ s/^\s+//;
+ $not_eps =~ s/\s+$//;
+ $not_eps =~ s/ /\\ /g;
+ if ( exists($done_conversion{$not_eps})) { next; }
+ if ($advanced_role) {
+ my $prettyname=$not_eps;
+ $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
+ $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
+ 'Converting to EPS '.$prettyname);
+ }
+ $done_conversion{$not_eps}=1;
+ # print "Converting $not_eps -> $eps_f"; # Debugging
+ system("convert $not_eps $eps_f");
+ # check is eps exist in prtspool
+ if (not -e $eps_f) {
+ # converting an animated gif creates either:
+ # anim.gif.eps.0
+ # or
+ # anim.gif-0.eps
+ for (my $i=0;$i<10000;$i++) {
+ if (-e $eps_f.'.'.$i) {
+ rename($eps_f.'.'.$i, $eps_f);
+ last;
+ }
+ my $anim_eps = $eps_f;
+ $anim_eps =~ s/(\.[^.]*)\.eps$/$1-$i\.eps/i;
+ if (-e $anim_eps) {
+ rename($anim_eps, $eps_f);
+ last;
+ }
}
}
- }
+
+ # imagemagick 6.2.0-6.2.7 fails to properly handle
+ # convert anim.gif anim.gif.eps
+ # it creates anim.eps instead.
+ if (not -e $eps_f) {
+ my $eps_f2 = $eps_f;
+ $eps_f2 =~ s/\.[^.]*\.eps$/\.eps/i;
+ if(-e $eps_f2) {
+ rename($eps_f2,$eps_f);
+ }
+ }
+ }
+
}
}
- if ($adv) {
+ if ($advanced_role) {
&Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state);
}
unlink($figfile);
@@ -261,16 +303,17 @@ END
@texfile=();
for (my $i=1;$i<=$number_of_files;$i++) {
my $new_texfile=$texfile;
- $new_texfile=~s/\.tex/_$i\.tex/;
+ $new_texfile=~s/\.tex//;
+ $new_texfile = sprintf("%s_%03d.tex", $new_texfile,$i);
push @texfile,$new_texfile;
}
}
my $ind=-1;
my %prog_state;
-print "Return to last resource.
";
-if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
+if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
print "
";
+my $num_files = @texfile;
foreach $texfile (@texfile) {
my $status_statement='';
my $link_text='download PDF';
@@ -278,36 +321,65 @@ foreach $texfile (@texfile) {
my @stud_info=split(/_END_/,$names_pack[$ind]);
my @tempo_array=split(/:/,$stud_info[0]);
my $name;
+ my $name_range='';
if ($tempo_array[3]) {
$name=$tempo_array[3];
+ ($name_range) = split(/,/,$name, 2);
} else {
$name=$tempo_array[0].'@'.$tempo_array[1];
+ $name_range = $tempo_array[0];
+ }
+ if (($name ne "") && ($name ne '@') ) { # Could be printing codes...
+ $link_text=''.$name.'';
+ $status_statement.=$name;
}
- $link_text=''.$name.'';
- $status_statement.=$name;
if ($#stud_info>0) {
@tempo_array=split(/:/,$stud_info[-1]);
if ($tempo_array[3]) {
$name=$tempo_array[3];
+ my ($lastname) = split(/,/, $name,2);
+ $name_range .= "-".$lastname;
} else {
$name=$tempo_array[0].'@'.$tempo_array[1];
+ $name_range .= '-'.$tempo_array[0];
+ }
+ if (($name ne "") && ($name ne '@')) {
+ $link_text.=' - '.$name.'';
+ $status_statement.=' - '.$name;
+
}
- $link_text.=' - '.$name.'';
- $status_statement.=' - '.$name;
- }
- if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }
+ }
+ if(($num_files > 1) && ($link_text eq 'download PDF')) { # Printing codes
+ $link_text = ''.basename($texfile,'.tex').'.pdf';
+ $status_statement .= basename($texfile);
+ }
+ $name_range =~ s/'//g; # O'Neil -> ONeil e.g.
+ print "
";
+ if ($advanced_role) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }
+ # This little piece of dirt puts username ranges into the original tex
+ # Tex filename from which they'll propagate into the other filenames as well.
+ #
if (-e $texfile) {
+ if (($name_range ne '') && ($num_files > 1)) {
+ my $newtexfile = $texfile;
+ $newtexfile =~ s/\.tex/$name_range\.tex/;
+ rename($texfile, $newtexfile);
+ $texfile = $newtexfile;
+ }
$texfile =~ m/^(.*)\/([^\/]+)$/;
my $name_file = $2;
my $path_file = $1.'/';
chdir $path_file;
- my $dvi_file= $name_file; $dvi_file =~ s/\.tex/\.dvi/;
+ my $dvi_file= $name_file; $dvi_file =~ s/\.tex/$name_range\.dvi/;
&busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
"for $status_statement now LaTeXing file",
\%prog_state,$dvi_file);
if ($tableofcontents eq 'yes') {
&busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
- "for $status_statement now LaTeXing file for table of contents",
+ "for $status_statement First LaTeX of file for table of contents",
+ \%prog_state,$dvi_file);
+ &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
+ "for $status_statement Second LaTeX of file for table of contents",
\%prog_state,$dvi_file);
} #to create table of contents
my $idxname=$name_file;
@@ -341,7 +413,7 @@ foreach $texfile (@texfile) {
$badresource = substr($badtext, $whereitbegins+27,
length($badtext) - $whereitbegins - 48);
- # print "
failing resourcename: $badresource
";
+ # print "
failing resourcename: $badresource
";
}
}
@@ -350,7 +422,8 @@ foreach $texfile (@texfile) {
print "LaTeX could not successfully parse your tex file.
";
print "It probably has errors in it.
";
print "With very high probability this error occured in ".$badtext."
";
- print "Here are the error messages in the LaTeX log file
";
+ print "Here are the error messages in the LaTeX log file
";
+
my $sygnal = 0;
for (my $i=0;$i<=$#content_of_file;$i++) {
if ($content_of_file[$i]=~m/^Runaway argument?/ or $content_of_file[$i]=~m/^!/) {
@@ -364,7 +437,7 @@ foreach $texfile (@texfile) {
}
}
print "\n";
- # print "
Advanced role
";
+ # print "
Advanced role
";
print "The link to ";
$logfilename=~s/\/home\/httpd//;
print "Your log file ";
@@ -382,18 +455,24 @@ foreach $texfile (@texfile) {
$texfile=~s/\/home\/httpd//;
print "Your original LaTeX file ";
print "\n";
+ my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing");
+ print ("$help_text");
+
} else { # Student role...
# at this point:
# $body_log_file - contains the log file.
# $name_file - is the name of the LaTeX file.
# $identifier - is the unique LaTeX identifier.l
- print "
There are errors in $badtext";
- print "
These errors prevent this resource from printing correctly";
+ print "
There are errors in $badtext";
+ print "
These errors prevent this resource from printing correctly";
my $tex_handle = IO::File->new($name_file);
my @tex_contents = <$tex_handle>;
&send_error_mail($identifier, $badresource, $body_log_file, \@tex_contents);
- print "
A message has been sent to the instructor describing this failure
"
+ print "
A message has been sent to the instructor describing this failure
";
+ my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing");
+ print ("$help_text");
+
}
} elsif ($body_log_file=~m//) {
@@ -418,7 +497,39 @@ foreach $texfile (@texfile) {
"for $status_statement now Converting to PS",
\%prog_state,$new_name_file);
if (-e $new_name_file) {
- print "PDF output file (see link below)
\n";
+ my $latex_file = $name_file;
+ $latex_file =~ s/\.dvi/\.tex/;
+ &repaginate($new_name_file, $latex_file, $numberofcolumns);
+ #
+ # Now have to re-latex, re dvips again to
+ # get the repaginated postscript.
+ #
+ &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
+ "for $status_statement first latex to repaginate",
+ \%prog_state, $name_file);
+ if ($tableofcontents eq 'yes') {
+ &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
+ "for $status_statement second latex to repaginate",
+ \%prog_state, $name_file);
+ &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
+ "for $status_statement third latex to repaginate",
+ \%prog_state, $name_file);
+ }
+ if ($tableofindex eq 'yes') {
+ my $idxname = $latex_file;
+ $idxname =~ s/\.tex$/\.idx/;
+ &busy_wait_command("makindex $idxname",
+ "Re-creating index file",
+ \%prog_state, $idxname);
+ &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
+ "for $status_statement now Recreting index (latex)",
+ \%prog_state, $dvi_file);
+
+ }
+ &busy_wait_command("$comma $name_file 1>dev/null 2>/dev/null",
+ "for $status_statement dvips to repaginate",
+ \%prog_state, $new_name_file);
+ print "\nPDF output file (see link below)
\n";
$new_name_file =~ m/^(.*)\./;
my $ps_file = my $tempo_file = $1.'temporar.ps';
my $pdf_file = $1.'.pdf';
@@ -492,6 +603,33 @@ foreach $texfile (@texfile) {
"for $status_statement now Converting to PS",
\%prog_state,$new_name_file);
if (-e $new_name_file) {
+ my $latex_file = $name_file;
+ $latex_file =~ s/\.dvi/\.tex/;
+ &repaginate($new_name_file, $latex_file, $numberofcolumns);
+ &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
+ "for $status_statement first latex to repaginate",
+ \%prog_state, $name_file);
+ if ($tableofcontents eq 'yes') {
+ &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
+ "for $status_statement second latex to repaginate",
+ \%prog_state, $name_file);
+ &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
+ "for $status_statement third latex to repaginate",
+ \%prog_state, $name_file);
+ }
+ if ($tableofindex eq 'yes') {
+ my $idxname = $latex_file;
+ $idxname =~ s/\.tex$/\.idx/;
+ &busy_wait_command("makeindex $idxname",
+ "Re-creating index file",
+ \%prog_state, $idxname);
+ &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
+ "for $status_statement now Recreting index (latex)",
+ \%prog_state, $dvi_file);
+ }
+ &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
+ "for $status_statement dvips to repaginate",
+ \%prog_state, $new_name_file);
print "
";
$new_name_file =~ m/^(.*)\./;
my $ps_file = my $tempo_file = $1.'temporar.ps';
@@ -569,9 +707,10 @@ if ($number_of_files>1) {
$zipfile=~s/\/home\/httpd//;
print "
A ZIP file of all the PDFs.";
}
-if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
-
+if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
+print(&Apache::loncommon::end_page());
my $done;
+
sub REAPER {
$done=1;
}
@@ -582,7 +721,7 @@ sub busy_wait_command {
$SIG{CHLD} = \&REAPER;
$done=0;
my $pid=open(CMD,"$command |");
- if ($adv) {
+ if ($advanced_role) {
&Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message);
}
while(!$done) {
@@ -592,7 +731,7 @@ sub busy_wait_command {
my $size=(stat($output_file))[7];
$extra_msg=", $size bytes generated";
}
- if ($adv) {
+ if ($advanced_role) {
&Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,
$message.$extra_msg);
}
@@ -601,6 +740,135 @@ sub busy_wait_command {
close(CMD);
}
+# Repagninate
+# What we need to do:
+# - Count the number of pages in each student.
+# - Rewrite the latex file replacing the \specials that
+# mark the end of student with an appropriate number of newlines.
+# parameters:
+# psfile - Postscript filename
+# latexfile - LaTeX filename
+# columns - number of columns.
+sub repaginate {
+
+ # We will try to do this in 2 passes through the postscript since
+ # the postscript is potentially large, to do 2 passes, the first pass
+ # must be able to calculate the total number of document pages so that
+ # at the beginning of the second pass we already know how to replace
+ # %%Pages:
+
+ # Figure out
+ # 1. Number of pages in the document
+ # 2. Maximum number of pages in a student
+ # 3. Number of pages in each student.
+
+ my ($postscript_filename, $latex_filename, $num_columns) = @_;
+ open(PSFILE, "<$postscript_filename");
+ my $line;
+ my $total_pages; # Total pages in document.
+ my $seen_pages = 0; # There are several %%Pages only the first is useful
+ my @pages_in_student; # For each student his/her initial page count.
+ my $max_pages = 0; # Pages in 'longest' student.
+ my $page_number = 0;
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
+ &mt("Counting pages for student: [_1]",1));
+
+ while ($line = ) {
+
+ # Check for total pages (%%Pages:)
+
+ if (($line =~ /^%%Pages:/) && (!$seen_pages)) {
+ my @pageinfo = split(/ /,$line);
+ $total_pages = $pageinfo[1];
+ $seen_pages = 1;
+ }
+ # Check for %%Page: n m $page_number will be the
+ # biggest of these until we see an endofstudent.
+ # Note that minipages generate spurious %Page: 1 1's so
+ # we only are looking for the largest n (n is page number at the
+ # bottom of the page, m the page number within the document.
+ #
+
+ if ($line =~ /^%%Page:/) {
+ my @pageinfo = split(/ /, $line);
+ if ($page_number < $pageinfo[1]) {
+ $page_number = $pageinfo[1];
+ } elsif ($pageinfo[2] ne 1) {
+ # current page count reset, and it's not because of a
+ # minipage
+ # - save the page_number, reset and, if necessary
+ # update max_pages.
+ push(@pages_in_student, $page_number);
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
+ &mt("Counting pages for student: [_1]", scalar(@pages_in_student)));
+ if ($page_number > $max_pages) {
+ $max_pages = $page_number;
+ }
+ $page_number = $pageinfo[1];
+ }
+ }
+
+
+ }
+ # file ended so one more student
+ push(@pages_in_student, $page_number);
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
+ &mt("Counting pages for student: [_1]",scalar(@pages_in_student)));
+ if ($page_number > $max_pages) {
+ $max_pages = $page_number;
+ }
+ $page_number = 0;
+
+ close(PSFILE);
+
+ # If 2 columns, max_pages must go to an even number of columns:
+
+
+ if ($num_columns == 2) {
+ if ($max_pages % 2) {
+ $max_pages++;
+ }
+ }
+
+ # Now rewrite the LaTex file, substituting our \special
+ # with an appropriate number of \newpage directives.
+
+ my $outfilename = $latex_filename."temp";
+
+ open(LATEXIN, "<$latex_filename");
+ open(LATEXOUT, ">$outfilename");
+
+ my $student_number = 0; # Index of student we're working on.
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
+ "Repaginating student ".$student_number+1);
+
+ while (my $line = ) {
+ if ($line eq "\\special{ps:ENDOFSTUDENTSTAMP}\n") {
+ # only end of student stamp if next line is ENDOFSTUDENTSTAMP:
+
+
+ # End of student replace with 0 or more newpages.
+
+ my $addlines = $max_pages - $pages_in_student[$student_number];
+ while($addlines) {
+ print LATEXOUT '\clearpage \strut \clearpage';
+ $addlines--;
+ }
+
+ $student_number++;
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
+ "Repaginating student ".$student_number+1);
+
+ } else {
+ print LATEXOUT $line;
+ }
+ }
+
+ close(LATEXIN);
+ close(LATEXOUT);
+ rename($outfilename, $latex_filename);
+
+}