--- loncom/homework/structuretags.pm	2002/11/12 05:05:27	1.136
+++ loncom/homework/structuretags.pm	2002/11/22 19:46:36	1.138
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.136 2002/11/12 05:05:27 albertel Exp $
+# $Id: structuretags.pm,v 1.138 2002/11/22 19:46:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,10 +118,12 @@ sub page_start {
   return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
 }
 
+use Time::HiRes();
 sub get_resource_name {
   my ($parstack,$safeeval)=@_;
-  my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
-  if ($name eq '') { 
+  my $name=&Apache::lonnet::gettitle();
+  &Apache::lonnet::logthis("Got $name");
+  if ($name eq '') {
     $name=&Apache::lonnet::EXT('resource.title');
     if ($name eq 'con_lost') { $name = ''; }
   }
@@ -502,6 +504,9 @@ sub start_block {
 	if ($code) {
 	    $code =~ s/\"//g;
 	    $code .=';return $condition;';
+	    if (!$Apache::lonxml::default_homework_loaded) {
+		&Apache::lonxml::default_homework_load($safeeval);
+	    }
 	    $result = &Apache::run::run($code,$safeeval);
 	    &Apache::lonxml::debug("block :$code: returned :$result:");
 	} else {
@@ -537,6 +542,9 @@ sub start_while {
   $code .=';return $condition;';
 
   push( @Apache::structuretags::whileconds, $code); 
+  if (!$Apache::lonxml::default_homework_loaded) {
+      &Apache::lonxml::default_homework_load($safeeval);
+  }
   my $result = &Apache::run::run($code,$safeeval);
   my $bodytext=$$parser[$#$parser]->get_text("/while");
   push( @Apache::structuretags::whilebody, $bodytext);