--- loncom/homework/structuretags.pm	2004/02/16 19:50:10	1.239
+++ loncom/homework/structuretags.pm	2004/02/16 20:30:34	1.242
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.239 2004/02/16 19:50:10 albertel Exp $
+# $Id: structuretags.pm,v 1.242 2004/02/16 20:30:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -242,20 +242,20 @@ Problem Status:
 Problem Type:
 <select name='problemtype'>
   <option name=''></option>
-  ".&option('exam'   ,'problemtype')."Exam Problem</option>
-  ".&option('problem','problemtype')."Homework problem</option>
-  ".&option('survey' ,'problemtype')."Survey Question</option>
+  ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
+  ".&option('problem','problemtype').&mt("Homework problem")."</option>
+  ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
 </select>
 </nobr>
 <nobr>
 Feedback Mode:
 <select name='problemstatus'>
   <option value=''></option>
-  ".&option('yes','problemstatus')."Show Feedback</option>
-  ".&option('no', 'problemstatus')."Don\'t Show Feedback</option>
+  ".&option('yes','problemstatus').&mt("Show Feedback")."</option>
+  ".&option('no', 'problemstatus').&mt("Don't Show Feedback")."</option>
 </select>
-<input type='submit' name='changeproblemmode' value='Change' />
 </nobr>
+<input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
 <hr />";
     my $numtoanalyze=$ENV{'form.numtoanalyze'};
     if (!$numtoanalyze) { $numtoanalyze=20; }
@@ -336,14 +336,8 @@ sub init_problem_globals {
     if ($type eq 'problem') {
 	$Apache::inputtags::part='0';
 	@Apache::inputtags::partlist=('0');
-	$Apache::lonhomework::problemstatus=
-	    &Apache::lonnet::EXT('resource.0.problemstatus');
-	&Apache::lonxml::debug("problem status is  $Apache::lonhomework::problemstatus");
-	&Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
-	if ($ENV{'request.state'} eq 'construct' &&
-	    defined($ENV{'form.problemstatus'})) {
-	    $Apache::lonhomework::problemstatus=$ENV{'form.problemstatus'};
-	}
+
+	$Apache::lonhomework::problemstatus=&get_problem_status('0')
     } else {
 	$Apache::inputtags::part='';
 	@Apache::inputtags::partlist=();
@@ -373,6 +367,26 @@ sub reset_problem_globals {
     undef($Apache::lonhomework::name);
 }
 
+sub set_problem_state {
+    my ($part)=@_;
+    if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
+	$Apache::lonhomework::history{"resource.$part.solved"}=
+	    'correct_by_student';
+    }
+}
+
+sub get_problem_status {
+    my ($part)=@_;
+    my $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
+    &Apache::lonxml::debug("problem status for $part is $problem_status");
+    &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
+    if ($ENV{'request.state'} eq 'construct' &&
+	defined($ENV{'form.problemstatus'})) {
+	$problem_status=$ENV{'form.problemstatus'};
+    }
+    return $problem_status;
+}
+
 sub start_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
@@ -395,17 +409,13 @@ sub start_problem {
 	if ($target eq 'web') {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
 	}
-	if ($ENV{'request.state'} eq 'construct' &&
-	    $ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct' ) {
-	    $Apache::lonhomework::history{'resource.0.solved'}=
-		'correct_by_student';
-	}
+       	if ($ENV{'request.state'} eq 'construct') { &set_problem_state('0'); }
 	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
 	if (($ENV{'request.state'} eq 'construct') &&
 	    defined($ENV{'form.problemtype'})) {
 	    $Apache::lonhomework::type=$ENV{'form.problemtype'};
 	}
-	&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
+	&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
     }
     if ($Apache::lonhomework::type eq '' ) {
 	my $uri=$ENV{'request.uri'};
@@ -990,8 +1000,7 @@ sub start_part {
     @Apache::inputtags::response=();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
-    $Apache::lonhomework::problemstatus=
-	&Apache::lonnet::EXT("resource.$id.problemstatus");
+    $Apache::lonhomework::problemstatus=&get_problem_status($id);
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     &Apache::run::run($expression,$safeeval);
@@ -1010,6 +1019,9 @@ sub start_part {
 	    my $expression='$external::datestatus="'.$status.'";';
 	    $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
 	    &Apache::run::run($expression,$safeeval);
+	    if ($ENV{'request.state'} eq 'construct') {
+		&set_problem_state($Apache::inputtags::part); 
+	    }
 	    if (( $status eq 'CLOSED' ) ||
 		( $status eq 'UNCHECKEDOUT') ||
 		( $status eq 'BANNED') ||