--- rat/lonpage.pm 2002/03/19 15:09:17 1.33 +++ rat/lonpage.pm 2004/03/22 20:37:06 1.56 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.33 2002/03/19 15:09:17 www Exp $ +# $Id: lonpage.pm,v 1.56 2004/03/22 20:37:06 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,7 +33,6 @@ # 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16, # YEAR=2001 # 08/13/01,08/30,10/1 Gerd Kortemeyer -# 12/16 Scott Harrison # YEAR=2002 # 03/19 Gerd Kortemeyer # @@ -46,8 +45,10 @@ use Apache::Constants qw(:common :http); use Apache::lonnet(); use Apache::loncommon(); use Apache::lonxml(); +use Apache::lonmenu; use HTML::TokeParser; use GDBM_File; +use Apache::lonsequence; # -------------------------------------------------------------- Module Globals my %hash; @@ -144,20 +145,30 @@ sub handler { if ($r->header_only) { if ($ENV{'browser.mathml'}) { - $r->content_type('text/xml'); + &Apache::loncommon::content_type($r,'text/xml'); } else { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); } $r->send_http_header; return OK; } - - my $requrl=$r->uri; + + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['forceselect','launch']); + my $number_of_columns = 1; + my $requrl=$r->uri; + my $target = $ENV{'form.grade_target'}; +# &Apache::lonnet::logthis("Got a target of $target"); + if ($target eq 'meta') { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + return OK; + } # ----------------------------------------------------------------- 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)) { + if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) { # ------------------------------------------------------------------- Hash tied my $firstres=$hash{'map_start_'.$requrl}; my $lastres=$hash{'map_finish_'.$requrl}; @@ -166,14 +177,7 @@ sub handler { @rows=(); - &tracetable(0,$firstres,'&'.$lastres.'&'); - if ($hash{'src_'.$lastres}) { - my $brepriv= - &Apache::lonnet::allowed('bre',$hash{'src_'.$lastres}); - if (($brepriv eq '2') || ($brepriv eq 'F')) { - $rows[$#rows+1]=''.$lastres; - } - } + &tracetable(0,$firstres,'&'); # ------------------------------------------------------------ Add to symb list @@ -230,6 +234,13 @@ sub handler { # --------------------------------------------------------- This is an SSI cell my $prefix=$_.'_'; my %posthash=('request.prefix' => $prefix); + if ($ENV{'form.grade_target'} eq 'tex') { + $posthash{'grade_target'}=$ENV{'form.grade_target'}; + $posthash{'textwidth'}=$ENV{'form.textwidth'}; + $posthash{'problem_split'}=$ENV{'form.problem_split'}; + $posthash{'latex_type'}=$ENV{'form.latex_type'}; + $posthash{'rndseed'}=$ENV{'form.rndseed'}; + } if (($ENV{'form.'.$prefix.'submit'}) || ($ENV{'form.all_submit'})) { foreach (keys %ENV) { @@ -241,6 +252,15 @@ sub handler { } } my $output=Apache::lonnet::ssi($src,%posthash); + $output=~ + s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; + if ($target eq 'tex') { + $output =~ s/^([^&]+)\\begin{document}//; + $output =~ s/\\end{document}//; + $output = '\parbox{\minipagewidth}{ '.$output.' }'; + #some additional cleanup necessary for LateX (due to limitations of table environment + $output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g; + } my $parser=HTML::TokeParser->new(\$output); my $token; my $thisdir=$src; @@ -324,59 +344,79 @@ sub handler { } } unless ($contents) { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print('Empty page.'); + $r->print(''.&mt('Empty page').'.'); } else { # ------------------------------------------------------------------ Build page # ---------------------------------------------------------------- Send headers - if ($isxml) { - $r->content_type('text/xml'); - $r->send_http_header; - $r->print($xmlheader); - } else { - $r->content_type('text/html'); - $r->send_http_header; - $r->print(''); - } + unless ($target eq 'tex') { + if ($isxml) { + &Apache::loncommon::content_type($r,'text/xml'); + $r->send_http_header; + $r->print($xmlheader); + } else { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $r->print(''); + } # ------------------------------------------------------------------------ Head - $r->print("\n\n".$allmeta); - $allscript=~ - s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; - if ($allscript) { - $r->print("\n\n"); - } - $r->print(&Apache::lonxml::registerurl(1,undef)); - $r->print("\n\n"); + $r->print("\n\n".$allmeta); + if ($allscript) { + $r->print("\n\n"); + } + $r->print(&Apache::lonmenu::registerurl(1,undef)); + $r->print("\n\n"); # ------------------------------------------------------------------ Start body - if ($isxml) { - $r->print($xmlbody); - } else { - $r->print( - ''); - } + if ($isxml) { + $r->print($xmlbody); + } else { + $r->print( + ''. + &Apache::lonmenu::menubuttons(undef,$target,1) + ); + } # ------------------------------------------------------------------ Start form - if ($nforms) { - $r->print('
'); - } + if ($nforms) { + $r->print(''); + } + } elsif ($target eq 'tex') { + $r->print('\documentclass{article} + \newcommand{\keephidden}[1]{} + \usepackage[dvips]{graphicx} + \usepackage{epsfig} + \usepackage{calc} + \usepackage{longtable} + \begin{document}'); + } # ----------------------------------------------------------------- Start table - $r->print(''); + if ($target eq 'tex') { + $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead '); + if ($number_of_columns le $lcm) {$number_of_columns=$lcm;}; + } else { + $r->print('
'); + } for ($i=0;$i<=$#rows;$i++) { if ($rows[$i]) { - $r->print("\n"); + unless ($target eq 'tex') { + $r->print("\n"); + } my @colcont=split(/\&/,$rows[$i]); my $avespan=$lcm/($#colcont+1); for ($j=0;$j<=$#colcont;$j++) { my $rid=$colcont[$j]; - my $metainfo=''. + ''. ''. - ''. + ''. ''. ''; if ( @@ -388,67 +428,106 @@ sub handler { '___'.$resid.'___'. &Apache::lonnet::declutter($hash{'src_'.$rid}); $metainfo.= - ''. + ''. + '&command=submission">'. ''. ''. - ''. + ''. + '&command=gradingmenu">'. ''. ''. - ''. + ''. + '" >'. ''. ''; } $metainfo.='

'; - $r->print(''); + unless ($target eq 'tex') { + $r->print(''); + } else { + for (my $incol=1;$incol<=$avespan;$incol++) { + $r->print(' & '); + } + } } - $r->print(''); + unless ($target eq 'tex') { + $r->print(''); + } else { + $r->print('REMOVETHEHEADOFLONGTABLE\\\\'); + } } } - $r->print("\n
print('print(' bgcolor="'. - $ssibgcolor{$rid}.'"'); - } - $r->print('>'.$metainfo.'print(' text="'.$ssitext{$rid}.'"'); - } - if ($ssilink{$rid}) { - $r->print(' link="'.$ssilink{$rid}.'"'); - } - if ($ssitext{$rid}) { - $r->print(' vlink="'.$ssivlink{$rid}.'"'); - } - if ($ssialink{$rid}) { - $r->print(' alink="'.$ssialink{$rid}.'"'); + unless ($target eq 'tex') { + if ($ssibgcolor{$rid}) { + $r->print(' bgcolor="'. + $ssibgcolor{$rid}.'"'); + } + $r->print('>'.$metainfo.'print(' text="'.$ssitext{$rid}.'"'); + } + if ($ssilink{$rid}) { + $r->print(' link="'.$ssilink{$rid}.'"'); + } + if ($ssitext{$rid}) { + $r->print(' vlink="'.$ssivlink{$rid}.'"'); + } + if ($ssialink{$rid}) { + $r->print(' alink="'.$ssialink{$rid}.'"'); + } + $r->print('>'); + } + $r->print($ssibody{$rid}); + unless ($target eq 'tex') { + $r->print(''); } - - $r->print('>'.$ssibody{$rid}.''); - } elsif ($cellemb{$rid} eq 'img') { + if ($ENV{'course.'. + $ENV{'request.course.id'}. + '.pageseparators'} eq 'yes') { + unless($target eq 'tex') { + $r->print('
'); + } else { + $r->print('\hline'); + } + } + } elsif ($cellemb{$rid} eq 'img') { $r->print('>'.$metainfo.''); } elsif ($cellemb{$rid} eq 'emb') { $r->print('>'.$metainfo.''); } - $r->print('
"); + unless ($target eq 'tex') { + $r->print("\n"); + } else { + $r->print('\end{longtable}\strut'); + } # ---------------------------------------------------------------- Submit, etc. if ($nforms) { $r->print( '
'); } - $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)) { @@ -461,8 +540,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;