--- loncom/homework/structuretags.pm	2002/06/20 17:48:35	1.96
+++ 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.96 2002/06/20 17:48:35 sakharuk 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 '';
 }
@@ -203,7 +204,7 @@ sub start_problem {
     &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"};
@@ -283,6 +284,36 @@ sub start_problem {
 	$result.=$head_tag_start.
 	  "<title>$name</title></head>\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."</head>".$body_tag_start.
@@ -290,22 +321,17 @@ sub start_problem {
 	$ENV{'request.uri'}.'">
        <input type="hidden" name="submitted" value="edit" />
        <input type="hidden" name="problemmode" value="Edit" />
-       <input type="submit" name="problemmode" value="View" />
+       <input type="submit" name="problemmode" value="Discard Edits and View" />
        <input type="submit" name="problemmode" value="EditXML" />
        <input type="submit" name="Undo" value="undo" /> <hr />
-       <input type="submit" name="submit" value="Submit Changes" /><br />
+       <input type="submit" name="submit" value="Submit Changes" />
+       <input type="submit" name="submit" value="Submit Changes and View" /><br />
       ';
     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') {
-      if (not $ENV{'request.symb'} =~ m/\.page_/) {
-	  $result .= '\begin{document} ';
-      } else {
-	  $result .= '\begin{minipage}{\minipagewidth} ';
-      }
   } else {
     # page_start returned a starting result, delete it if we don't need it
     $result = '';
@@ -349,13 +375,14 @@ sub end_problem {
     }
   } elsif ($target eq 'edit') {
     &Apache::lonxml::debug("in end_problem with $target, edit");
-    $result='<br /><input type="submit" name="submit" value="Submit Changes" />';
+    $result ='<br /><input type="submit" name="submit" value="Submit Changes and Edit" />';
+    $result.='<input type="submit" name="submit" value="Submit Changes and View" />';
   } 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 {
-	  $result .= '\end{minipage} ';
+	  $result .= '} ';
       }
   }
   return $result;