--- loncom/homework/structuretags.pm	2005/06/13 20:20:33	1.294
+++ loncom/homework/structuretags.pm	2005/06/28 19:56:10	1.296
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.294 2005/06/13 20:20:33 albertel Exp $
+# $Id: structuretags.pm,v 1.296 2005/06/28 19:56:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -510,6 +510,7 @@ 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 '' ) {
@@ -1134,7 +1135,7 @@ sub start_part {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
-    if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+    if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
     $Apache::inputtags::part=$id;
     push(@Apache::inputtags::partlist,$id);
     @Apache::inputtags::response=();
@@ -1261,6 +1262,7 @@ sub end_part {
     }
     pop @Apache::inputtags::status;
     $Apache::inputtags::part='';
+    $Apache::lonhomework::type = $Apache::lonhomework::default_type;
     return $result;
 }