--- loncom/homework/structuretags.pm	2001/08/03 22:12:07	1.51
+++ loncom/homework/structuretags.pm	2001/08/17 14:10:40	1.54
@@ -2,6 +2,8 @@
 # definition of tags that give a structure to a document
 # 2/19 Guy
 # 6/26/2001 fixed extra web display at end of <web></web> tags
+# 8/17 Gerd Kortemeyer
+
 package Apache::structuretags; 
 
 use strict;
@@ -71,7 +73,14 @@ sub start_problem {
   $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
   &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
   if ($Apache::lonhomework::type eq '') {
-    $Apache::lonhomework::type='homework';
+    my $uri=$ENV{'request.uri'};
+    if ($uri=~/\.(\w+)$/) {
+      $Apache::lonhomework::type=$1;
+      &Apache::lonxml::debug("Using type of $1");
+    } else {
+      $Apache::lonhomework::type='problem';
+      &Apache::lonxml::debug("Using default type, problem, :$uri:");
+    }
   }
 #adeed vars to the scripting enviroment
   my $expression='$external::part='.$Apache::inputtags::part.';';
@@ -89,12 +98,20 @@ sub start_problem {
     my $expression='$external::datestatus="'.$status.'";';
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
     &Apache::run::run($expression,$safeeval);
-    if ( $status eq 'CLOSED' ) {
+    if (( $status eq 'CLOSED' ) ||
+        ( $status eq 'UNCHECKEDOUT') ||
+        ( $status eq 'BANNED')) {
       my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
       if ( $target eq "web" ) {
 	$result.= $head_tag_start.'</head>';
-	return $result . $body_tag_start .
-	  " <br />Problem is not open to be viewed. The problem $datemsg<br />";
+        my $msg=$body_tag_start.
+	    '<h1>Not open to be viewed</h1>';
+        if ($status eq 'CLOSED') {
+	    $msg.='The problem '.$datemsg;
+	} elsif ($status eq 'UNCHECKEDOUT') {
+            $msg.='The resource needs to be checked out';
+        }
+	return $result.$msg.'<br />';
       }
     }
   }
@@ -305,6 +322,7 @@ sub start_randomlist {
 sub shuffle {
     my $a=shift;
     my $i;
+    &Apache::response::setrandomnumber();
     for($i=@$a;--$i;) {
       my $j=int rand($i+1);
       next if $i == $j;