--- loncom/interface/lonsyllabus.pm 2005/11/18 13:35:30 1.44 +++ loncom/interface/lonsyllabus.pm 2006/03/06 22:17:48 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.44 2005/11/18 13:35:30 www Exp $ +# $Id: lonsyllabus.pm,v 1.45 2006/03/06 22:17:48 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,13 +41,25 @@ use Apache::lonspeller(); sub handler { my $r = shift; + +# --------------------------------------------------- Get course info from URL + my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); +# ----------------------------------------------------- Is this even a course? + my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); + if ($homeserver eq 'no_host') { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $r->print(''.&mt('No syllabus available').''); + return OK; + } +# ------------------------------------- There is such a course, get environment + my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; - # ------------------------------------------------------------ Print the screen my $target=$env{'form.grade_target'}; - my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); my $feedurl='feed://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss'; if ($target ne 'tex') { my $html=&Apache::lonxml::xmlbegin(); @@ -61,12 +73,6 @@ ENDDOCUMENT $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } -# Is this even a course? - my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); - if ($homeserver eq 'no_host') { - $r->print(''.&mt('No syllabus available').''); - return OK; - } # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_instructorinfo' => 'Instructor Information', @@ -101,8 +107,7 @@ ENDDOCUMENT my $forceedit=''; if ($env{'form.forceedit'}) { $forceedit='edit'; } -# ------------------------------------- There is such a course, get environment - my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); +# ----------------------------------------------------------------- Make header if ($target ne 'tex') { $r->print(&Apache::lonhtmlcommon::htmlareaheaders(). ''.&Apache::loncommon::bodytag