--- loncom/homework/structuretags.pm	2003/11/03 21:47:21	1.221
+++ loncom/homework/structuretags.pm	2003/11/04 14:46:28	1.222
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.221 2003/11/03 21:47:21 albertel Exp $
+# $Id: structuretags.pm,v 1.222 2003/11/04 14:46:28 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -459,10 +459,10 @@ sub start_problem {
 	    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
 	    my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'keys');
 	    my @allkeys = split /,/,$allkeys;
-	    my $allow_print_points = 0;
+	    my $allow_print_points = 1;
 	    foreach my $partial_key (@allkeys) {
-		if ($partial_key=~m/weight/) {
-		    $allow_print_points++;
+		if ($partial_key=~m/\_(\d*)\_weight/) {
+		    if ($1 ne '0') {$allow_print_points=0;}
 		}
 	    }
 	    my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
@@ -980,7 +980,15 @@ sub start_part {
 			$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
 		    }
 		    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
-		    if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+		    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/\_(\d*)\_weight/) {
+			    if ($1 ne '0') {$allow_print_points=1;}
+			}
+		    }
+		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		}
 	    }
 	}