--- rat/lonpage.pm	2002/05/20 19:05:11	1.37
+++ rat/lonpage.pm	2002/05/27 12:04:36	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.37 2002/05/20 19:05:11 sakharuk Exp $
+# $Id: lonpage.pm,v 1.39 2002/05/27 12:04:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,7 @@ use Apache::loncommon();
 use Apache::lonxml();
 use HTML::TokeParser;
 use GDBM_File;
+use Apache::lonsequence;
 
 # -------------------------------------------------------------- Module Globals
 my %hash;
@@ -151,11 +152,14 @@ sub handler {
        $r->send_http_header;
        return OK;
    }
+ 
+   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                          ['forceselect','launch']);
 
   my $requrl=$r->uri;  
   my $target = $ENV{'form.grade_target'};
 # ----------------------------------------------------------------- Tie db file
-  if ($ENV{'request.course.fn'}) {
+  if (($ENV{'request.course.fn'}) && (!$ENV{'form.forceselect'})) {
       my $fn=$ENV{'request.course.fn'};
       if (-e "$fn.db") {
           if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) {
@@ -397,7 +401,7 @@ sub handler {
                           '<img src="/adm/lonMisc/subm_button.gif" border=0>'.
 			  '</img></a>'.
                   '<a href="/adm/grades?symb='.&Apache::lonnet::escape($symb).
-                  '&command=viewgrades" target="LONcatInfo">'.
+                  '&command=gradingmenu" target="LONcatInfo">'.
                           '<img src="/adm/lonMisc/pgrd_button.gif" border=0>'.
 			  '</img></a>'.
                   '<a href="/adm/parmset?symb='.&Apache::lonnet::escape($symb).
@@ -467,7 +471,7 @@ sub handler {
               } else {
                   $r->content_type('text/html');
                   $r->send_http_header;
-		  $r->print('<html><body>Page undefined.</body></html>');
+                  &Apache::lonsequence::viewmap($r,$requrl);
               }
 # ------------------------------------------------------------------ Untie hash
               unless (untie(%hash)) {
@@ -480,8 +484,10 @@ sub handler {
           }
       } 
   }
-  $ENV{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
-  return HTTP_NOT_ACCEPTABLE; 
+  $r->content_type('text/html');
+  $r->send_http_header;
+  &Apache::lonsequence::viewmap($r,$requrl);
+  return OK; 
 }
 
 1;
