--- rat/lonpage.pm 2002/05/21 02:26:16 1.38 +++ rat/lonpage.pm 2002/06/20 17:47:35 1.40 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.38 2002/05/21 02:26:16 albertel Exp $ +# $Id: lonpage.pm,v 1.40 2002/06/20 17:47:35 sakharuk 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; @@ -146,16 +147,19 @@ sub handler { if ($ENV{'browser.mathml'}) { $r->content_type('text/xml'); } else { - $r->content_type('text/html'); + $r->content_type('text/html'); } $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)) { @@ -192,6 +196,7 @@ sub handler { # ------------------------------------------------------------------ Page parms + my $number_of_columns = 1; my $j; my $lcm=1; my $contents=0; @@ -362,8 +367,19 @@ sub handler { if ($nforms) { $r->print('
'); - } + } + } else { + $r->print('\documentclass[letterpaper]{article} + \newcommand{\keephidden}[1]{} + \usepackage[dvips]{graphicx} + \usepackage{epsfig} + \usepackage{calc} + \begin{document}'); + } # ----------------------------------------------------------------- Start table + if ($target eq 'tex') { + $r->print('\begin{tabular}INSERT'); + } else { $r->print(''); } for ($i=0;$i<=$#rows;$i++) { @@ -444,15 +460,23 @@ sub handler { } unless ($target eq 'tex') { $r->print(''); + } else { + $number_of_columns++; + $r->print(' & '); } } unless ($target eq 'tex') { $r->print(''); + } else { + $number_of_columns = 1; + $r->print('REMOVE\\\\'); } } } unless ($target eq 'tex') { $r->print("\n
"); + } else { + $r->print('\end{tabular}'); } # ---------------------------------------------------------------- Submit, etc. if ($nforms) { @@ -460,14 +484,18 @@ sub handler { '
'); } - $r->print(''.&Apache::lonxml::xmlend()); + unless ($target eq 'tex') { + $r->print(''.&Apache::lonxml::xmlend()); + } else { + $r->print('\end{document}'.$number_of_columns); + } # -------------------------------------------------------------------- End page } # ------------------------------------------------------------- End render page } else { $r->content_type('text/html'); $r->send_http_header; - $r->print('Page undefined.'); + &Apache::lonsequence::viewmap($r,$requrl); } # ------------------------------------------------------------------ Untie hash unless (untie(%hash)) { @@ -480,8 +508,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;