--- loncom/homework/structuretags.pm 2002/04/11 17:37:13 1.90 +++ loncom/homework/structuretags.pm 2002/07/24 20:34:52 1.102 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.90 2002/04/11 17:37:13 albertel Exp $ +# $Id: structuretags.pm,v 1.102 2002/07/24 20:34:52 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 ''; } @@ -150,11 +151,10 @@ permanent record is left in the system.< Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.

- -

- + + + +
ENDCHECKOUT } @@ -202,9 +202,9 @@ sub start_problem { #should get back a or the neccesary stuff to start XML/MathML my ($result,$head_tag_start,$body_tag_start)= &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';} - - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { #handle exam checkout if ($Apache::lonhomework::type eq 'exam') { my $token=$Apache::lonhomework::history{"resource.0.outtoken"}; @@ -267,6 +267,9 @@ sub start_problem { $rndseed.'" /> + $name\n$body_tag_start\n"; } + } elsif ($target eq 'tex') { + my $id = $Apache::inputtags::part; + my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); + $duedate = POSIX::strftime("%c",localtime($duedate)); + 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($duedate eq 'Wed 31 Dec 1969 07:00:00 PM EDT') {$duedate = '';} + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm'; + } else { + $result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; + } + } else { + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\begin{document} \noindent \vskip 1 mm'; + } else { + $result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\'; + } + } } } elsif ($target eq 'edit') { $result.=$head_tag_start."".$body_tag_start. @@ -288,18 +321,17 @@ sub start_problem { $ENV{'request.uri'}.'"> - +
-
+ +
'; my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; } elsif ($target eq 'modified') { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); - } elsif ($target eq 'tex') { - $result .= '\begin{document} '; } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -315,7 +347,8 @@ sub end_problem { if ( $target eq 'grade' && $Apache::inputtags::part eq '0') { # if part is zero, no s existed, so we need to the grading &Apache::inputtags::grade; - } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') { + } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0' && + $status ne 'UNCHECKEDOUT') { # if part is zero, no s existed, so we need show the current # grading status $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); @@ -326,7 +359,8 @@ sub end_problem { ) { if ($status eq 'CAN_ANSWER') { $result.="\n"; - } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || + $status eq 'UNCHECKEDOUT' ) { $result.="\n"; } $result.=&Apache::lonxml::xmlend(); @@ -341,9 +375,15 @@ sub end_problem { } } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); - $result='
'; + $result ='
'; + $result.=''; } elsif ($target eq 'tex') { - $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}\end{document}'; + $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\end{document} '; + } else { + $result .= '} '; + } } return $result; } @@ -511,6 +551,7 @@ sub end_randomlist { sub start_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); if ($id eq '') { $id = $Apache::lonxml::curdepth; } $Apache::inputtags::part=$id; @@ -518,7 +559,7 @@ sub start_part { @Apache::inputtags::previous=(); if ($target eq 'meta') { return &Apache::response::mandatory_part_meta; - } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; @@ -527,11 +568,17 @@ sub start_part { if ( $status eq 'CLOSED' ) { my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]); if ( $target eq "web" ) { - return "
Part is not open to be viewed. It $accessmsg
"; + $result="
Part is not open to be viewed. It $accessmsg
"; + } elsif ( $target eq 'tex' ) { + $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\"; + } + } else { + if ($target eq 'tex') { + $result='\vskip 0 mm'; } } } - return ''; + return $result; } sub end_part {