--- loncom/homework/structuretags.pm	2004/02/06 22:38:24	1.227.2.2
+++ loncom/homework/structuretags.pm	2004/01/14 22:47:46	1.228
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.227.2.2 2004/02/06 22:38:24 albertel Exp $
+# $Id: structuretags.pm,v 1.228 2004/01/14 22:47:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -186,8 +186,9 @@ sub problem_edit_header {
        <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">
-      ';
+       <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" /><br />'.
+       &Apache::loncommon::help_open_topic('Problem_Editor_XML_Index','Problem Editing Help').
+       '<table border="0"><tr><td bgcolor="#DDDDDD">';
 }
 
 sub problem_edit_footer {
@@ -208,8 +209,9 @@ sub problem_web_to_edit_header {
            onChange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
              <input type="checkbox" name="showallfoils" ';
     if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
-    $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').'
-             <hr />';
+    $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
+	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
+	'<hr />';
     my $numtoanalyze=$ENV{'form.numtoanalyze'};
     if (!$numtoanalyze) { $numtoanalyze=20; }
     $result.= '<input type="submit" name="problemmode" value='.
@@ -454,7 +456,7 @@ sub start_problem {
 	    my @packages = split /,/,$packages;
 	    my $allow_print_points = 0;
 	    foreach my $partial_key (@packages) {
-		if ($partial_key=~m/^part_0$/) {
+		if ($partial_key=~m/part_0/) {
 		    $allow_print_points=1;
 		}
 	    }
@@ -517,7 +519,7 @@ sub end_problem {
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
 	if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
-	     ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode)) {
+	     $status eq 'CAN_ANSWER' ) {
 	    # if part is zero, no <part>s existed, so we need to the grading
 	    &Apache::inputtags::grade;
 	} elsif ( ($target eq 'web' || $target eq 'tex') &&
@@ -969,11 +971,11 @@ sub start_part {
 			$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
 		    }
 		    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
-		    my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
+		    my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'keys');
 		    my @allkeys = split /,/,$allkeys;
 		    my $allow_print_points = 0;
 		    foreach my $partial_key (@allkeys) {
-			if ($partial_key=~m/^part_(.*)$/) {
+			if ($partial_key=~m/\_(\d*)\_weight/) {
 			    if ($1 ne '0') {$allow_print_points=1;}
 			}
 		    }
@@ -1009,9 +1011,7 @@ sub end_part {
     my $result='';
     if ( $target eq 'meta' ) {
 	$result='';
-    } elsif ($target eq 'grade' && 
-	     ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
-	     !$hidden) {
+    } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER' && !$hidden) {
 	$result=&Apache::inputtags::grade;
     } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
 	my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,