--- loncom/homework/structuretags.pm	2005/09/20 06:40:30	1.300
+++ loncom/homework/structuretags.pm	2005/09/23 20:16:50	1.302
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.300 2005/09/20 06:40:30 albertel Exp $
+# $Id: structuretags.pm,v 1.302 2005/09/23 20:16:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -511,7 +511,6 @@ sub start_problem {
 	    defined($env{'form.problemtype'})) {
 	    $Apache::lonhomework::type=$env{'form.problemtype'};
 	}
-	$Apache::lonhomework::default_type = $Apache::lonhomework::type;
 	&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
     }
     if ($Apache::lonhomework::type eq '' ) {
@@ -524,6 +523,7 @@ sub start_problem {
 	    &Apache::lonxml::debug("Using default type, problem, :$uri:");
 	}
     }
+    $Apache::lonhomework::default_type = $Apache::lonhomework::type;
 
     #added vars to the scripting enviroment
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
@@ -645,6 +645,10 @@ sub start_problem {
 	    }
 	    my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
 	    if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; }
+	    if (lc($env{'course.'.$env{'request.course.id'}.
+			    '.disableexampointprint'}) eq 'yes') {
+		$allow_print_points=0;
+	    }
 	    my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
 	    $duedate = POSIX::strftime("%c",localtime($duedate));
 	    my $temp_file;
@@ -1207,6 +1211,10 @@ sub start_part {
 		    if (defined($maxtries) && $maxtries < 0) {
 			$allow_print_points=0;
 		    }
+		    if (lc($env{'course.'.$env{'request.course.id'}.
+				    '.disableexampointprint'}) eq 'yes') {
+			$allow_print_points=0;
+		    }
 		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		} elsif ($target eq 'web') {
 		    $result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />';