[LON-CAPA-cvs] cvs: loncom /interface lonsyllabus.pm

[www]

www		Mon Mar  6 18:02:23 2006 EDT

  Modified files:              
    /loncom/interface	lonsyllabus.pm 
  Log:
  Moving stuff in a more logical order, also prepare for external syllabus
  
  
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.45 loncom/interface/lonsyllabus.pm:1.46
--- loncom/interface/lonsyllabus.pm:1.45	Mon Mar  6 17:17:48 2006
+++ loncom/interface/lonsyllabus.pm	Mon Mar  6 18:02:22 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.45 2006/03/06 22:17:48 www Exp $
+# $Id: lonsyllabus.pm,v 1.46 2006/03/06 23:02:22 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,9 +41,16 @@
 
 sub handler {
     my $r = shift;
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+    return OK if $r->header_only;
 
+    my $target=$env{'form.grade_target'};
 # --------------------------------------------------- Get course info from URL
     my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
+# ------------------------------------------------------------ Get query string
+    &Apache::loncommon::get_unprocessed_cgi
+                        ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit','headermode']);
 # ----------------------------------------------------- Is this even a course?
     my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
     if ($homeserver eq 'no_host') {
@@ -54,13 +61,9 @@
     }
 # ------------------------------------- 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 $feedurl='feed://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss';
+    my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss';
     if ($target ne 'tex') {
 	my $html=&Apache::lonxml::xmlbegin();
 	$r->print(<<ENDDOCUMENT);
@@ -72,7 +75,19 @@
     } else {
 	$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
     } 
+# ----------------------------------------------------- Force menu registration
+    my $addentries='';
+    if ($env{'form.register'}) {
+       $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
+           '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
+       $r->print(&Apache::lonmenu::registerurl(1));
+    }
+# -------------------------------------------------- Let's see who handles this
+    my $externalsyllabus=$courseenv{'course.'.$cdom.'_'.$cnum.'_externalsyllabus'};
+    if ($externalsyllabus=~/\w/) {
+    }
 
+# ------------------------------ The buck stops here: internal syllabus display
 # --------------------------------------------------------- The syllabus fields
     my %syllabusfields=&Apache::lonlocal::texthash(
        'aaa_instructorinfo' => 'Instructor Information',
@@ -90,17 +105,6 @@
        'jjj_weblinks'       => 'Web Links',
        'kkk_textbook'       => 'Textbook',
        'lll_includeurl'     => 'URLs To Include in Syllabus');
-
-# ------------------------------------------------------------ Get query string
-    &Apache::loncommon::get_unprocessed_cgi
-                        ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']);
-# ----------------------------------------------------- Force menu registration
-    my $addentries='';
-    if ($env{'form.register'}) {
-       $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
-	   '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
-       $r->print(&Apache::lonmenu::registerurl(1));
-    }
 # --------------------------------------------------------------- Force Student
     my $forcestudent='';
     if ($env{'form.forcestudent'}) { $forcestudent='student'; };