--- loncom/homework/structuretags.pm	2004/09/09 08:59:56	1.267
+++ loncom/homework/structuretags.pm	2004/09/20 15:57:11	1.269
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.267 2004/09/09 08:59:56 albertel Exp $
+# $Id: structuretags.pm,v 1.269 2004/09/20 15:57:11 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -184,8 +184,16 @@ sub setup_rndseed {
     return $rndseed;
 }
 
+sub remember_problem_state {
+    return '
+       <input type="hidden" name="problemstate" value="'.$ENV{'form.problemstate'}.'" />
+       <input type="hidden" name="problemtype" value="'.$ENV{'form.problemtype'}.'" />
+       <input type="hidden" name="problemstatus" value="'.$ENV{'form.problemstatus'}.'" />';
+}
+
 sub problem_edit_header {
-    return '<input type="hidden" name="submitted" value="edit" />
+    return '<input type="hidden" name="submitted" value="edit" />'.
+	&Apache::structuretags::remember_problem_state().'
        <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
        <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
        <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
@@ -874,7 +882,7 @@ sub start_instructorcomment {
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
         $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
-	if ( ! $result ) {
+	if ( (! $result) or ($ENV{'form.instructor_comments'} eq 'hide')) {
 	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
 						   $parser,$style);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");