--- loncom/homework/structuretags.pm 2002/06/27 18:47:23 1.100
+++ loncom/homework/structuretags.pm 2002/08/20 14:42:22 1.104
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.100 2002/06/27 18:47:23 sakharuk Exp $
+# $Id: structuretags.pm,v 1.104 2002/08/20 14:42:22 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,6 +33,7 @@ package Apache::structuretags;
use strict;
use Apache::lonnet;
+use Apache::File();
BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
@@ -56,7 +57,7 @@ sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
if ($target eq 'tex') {
- return $bodytext
+ return $bodytext.' ';
}
return '';
}
@@ -284,13 +285,43 @@ sub start_problem {
"
$name\n$body_tag_start\n";
}
} elsif ($target eq 'tex') {
+ my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ if ($name eq '') {
+ $name=&Apache::lonnet::EXT('resource.title');
+ if ($name eq 'con_lost') { $name = ''; }
+ }
+ $Apache::lonhomework::name=$name;
my $id = $Apache::inputtags::part;
my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");
$duedate = POSIX::strftime("%c",localtime($duedate));
- if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\begin{document} \noindent\fbox{Due date: '.$duedate.'} \vskip 1 mm';
+ my $temp_file;
+ my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
+ if (-e $filename) {
+ $temp_file = Apache::File->new($filename);
+ } else {
+ $temp_file = Apache::File->new('>>'.$filename);
+ }
+ my @due_file_content = <$temp_file>;
+ my $due_file_content = $due_file_content[$#due_file_content];
+ chomp $due_file_content;
+ if ($due_file_content ne $duedate) {
+ $temp_file = Apache::File->new('>'.$filename);
+ print $temp_file "$duedate\n";
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ if(not $duedate=~m/1969/) {
+ $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm';
+ } else {
+ $result .= '\begin{document} \noindent \vskip 1 mm';
+ }
+ } else {
+ $result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
+ }
} else {
- $result .= '\parbox{\minipagewidth}{\vskip 1mm\fbox{Due date: '.$duedate.'} \\\\\\\\';
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ $result .= '\begin{document} \noindent \vskip 1 mm';
+ } else {
+ $result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\';
+ }
}
}
} elsif ($target eq 'edit') {
@@ -356,7 +387,7 @@ sub end_problem {
$result ='
';
$result.='';
} elsif ($target eq 'tex') {
- $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}';
+ $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
if (not $ENV{'request.symb'} =~ m/\.page_/) {
$result .= '\end{document} ';
} else {
@@ -595,6 +626,8 @@ sub start_postanswerdate {
if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
&Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
}
+ } elsif ($target eq 'tex') {
+ return '\vskip 0 mm \noindent';
}
return '';
}