--- loncom/homework/structuretags.pm	2003/08/14 14:25:54	1.206
+++ loncom/homework/structuretags.pm	2003/09/19 20:29:29	1.210
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.206 2003/08/14 14:25:54 sakharuk Exp $
+# $Id: structuretags.pm,v 1.210 2003/09/19 20:29:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ use strict;
 use Apache::lonnet;
 use Apache::File();
 use Apache::lonmenu;
+use Apache::lonlocal;
 
 BEGIN {
     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
@@ -72,7 +73,7 @@ sub end_tex {
 sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my %found;
-    foreach my $taginside ($tagstack) {
+    foreach my $taginside (@$tagstack) {
 	foreach my $taglookedfor ('html','body','form') {
 	    if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;}
 	}
@@ -159,8 +160,8 @@ sub setup_rndseed {
 		$ENV{'form.rndseed'}=$rndseed;
 	    }
 	}
-	if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
-	    $ENV{'form.newrandomization'} eq 'New Randomization') {
+	if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
+	    $ENV{'form.newrandomization'} eq &mt('New Randomization')) {
 	    srand(time);
 	    $rndseed=int(rand(2100000000));
 	    $ENV{'form.rndseed'}=$rndseed;
@@ -178,43 +179,44 @@ sub setup_rndseed {
 
 sub problem_edit_header {
     return '<input type="hidden" name="submitted" value="edit" />
-       <input type="hidden" name="problemmode" value="Edit" />
-       <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 and Edit" />
-       <input type="submit" name="submit" value="Submit Changes and View" /><br /><p>&nbsp;</p><table border="0"><tr><td bgcolor="#DDDDDD">
+       <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
+       <input type="submit" name="problemmode" value="'.&mt('Discard Edits and View').'" />
+       <input type="submit" name="problemmode" value="'.&mt('EditXML').'" />
+       <input type="submit" name="Undo" value="'.&mt('undo').'" /> <hr />
+       <input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
+       <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" /><br /><p>&nbsp;</p><table border="0"><tr><td bgcolor="#DDDDDD">
       ';
 }
 
 sub problem_edit_footer {
-    return '</td></tr></table><br /><input type="submit" name="submit" value="Submit Changes and Edit" />
-    <input type="submit" name="submit" value="Submit Changes and View" />';
+    return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
+    <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />';
 }
 
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
-    my $result.='<input type="hidden" name="problemmode" value="View" />
-             <input type="submit" name="problemmode" value="Edit" />
-             <input type="submit" name="problemmode" value="EditXML" />
-             <input type="submit" name="newrandomization" value="New Randomization" />
-             <input type="submit" name="resetdata" value="Reset Submissions" />
-             <nobr><input type="submit" name="changerandseed" value="Change Random Seed To:" />
+    my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />
+             <input type="submit" name="problemmode" value="'.&mt('Edit').'" />
+             <input type="submit" name="problemmode" value="'.&mt('EditXML').'" />
+             <input type="submit" name="newrandomization" value="'.&mt('New Randomization').'" />
+             <input type="submit" name="resetdata" value="'.&mt('Reset Submissions').'" />
+             <nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
               <input type="text" name="rndseed" width="10" value="'.
 	       $rndseed.'"
            onChange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
              <input type="checkbox" name="showallfoils" ';
     if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
-    $result.= ' />&nbsp;Show&nbsp;All&nbsp;Foils
+    $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').'
              <hr />';
     my $numtoanalyze=$ENV{'form.numtoanalyze'};
     if (!$numtoanalyze) { $numtoanalyze=20; }
-    $result.= '<input type="submit" name="problemmode" value="Calculate answers" /> for
+    $result.= '<input type="submit" name="problemmode" value='.
+	&mt('"Calculate answers').'" /> for
              <input type="text" name="numtoanalyze" value="'.
-		 $numtoanalyze.'" size="5" /> versions of this problem.'.
-		     &Apache::loncommon::help_open_topic("Analyze_Problem",
+	     $numtoanalyze.'" size="5" /> '.&mt('versions of this problem').
+	     '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
 						     '',undef,undef,300).
-		     '<hr />';
+						     '<hr />';
     return $result;
 }
 
@@ -306,7 +308,9 @@ sub reset_problem_globals {
     undef(%Apache::lonhomework::history);
     undef(%Apache::lonhomework::results);
     undef($Apache::inputtags::part);
-    undef($Apache::lonhomework::parsing_a_problem);
+#don't undef this, lonhomework.pm takes care of this, we use this to 
+#detect if we try to do 2 problems in one file
+#   undef($Apache::lonhomework::parsing_a_problem);
     undef($Apache::lonhomework::name);
 }
 
@@ -931,6 +935,8 @@ sub start_part {
     $Apache::lonhomework::problemstatus=
 	&Apache::lonnet::EXT("resource.$id.problemstatus");
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
+    my $expression='$external::part='.$Apache::inputtags::part.';';
+    &Apache::run::run($expression,$safeeval);
 
     if ($target eq 'meta') {
 	return &Apache::response::mandatory_part_meta;