--- loncom/homework/structuretags.pm 2011/07/28 03:13:58 1.495 +++ loncom/homework/structuretags.pm 2011/12/10 17:53:45 1.498 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.495 2011/07/28 03:13:58 raeburn Exp $ +# $Id: structuretags.pm,v 1.498 2011/12/10 17:53:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -208,7 +208,11 @@ sub page_start { my $navmap = Apache::lonnavmaps::navmap->new(); if (ref($navmap)) { my $mapres = $navmap->getResourceByUrl($map); - unless ($mapres->is_page()) { + my $is_page; + if (ref($mapres)) { + $is_page = $mapres->is_page(); + } + unless ($is_page) { $needs_upload = 1; } } @@ -218,7 +222,11 @@ sub page_start { my $navmap = Apache::lonnavmaps::navmap->new(); if (ref($navmap)) { my $mapres = $navmap->getResourceByUrl($map); - unless ($mapres->is_page()) { + my $is_page; + if (ref($mapres)) { + $is_page = $mapres->is_page(); + } + unless ($is_page) { my $res = $navmap->getBySymb($symb); if (ref($res)) { my $partlist = $res->parts(); @@ -275,7 +283,7 @@ sub page_start { &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb({ 'text' => 'Construction Space', - 'href' => &Apache::loncommon::authorspace(), + 'href' => &Apache::loncommon::authorspace($env{'request.uri'}), }); # breadcrumbs (and tools) will be created # in start_page->bodytag->innerregister @@ -952,6 +960,9 @@ sub reset_problem_globals { undef(%Apache::lonhomework::history); undef(%Apache::lonhomework::results); undef($Apache::inputtags::part); + if ($type eq 'Task') { + undef($Apache::inputtags::slot_name); + } #don't undef this, lonhomework.pm takes care of this, we use this to #detect if we try to do 2 problems in one file # undef($Apache::lonhomework::parsing_a_problem);