--- rat/lonpage.pm 2000/10/16 17:29:11 1.13 +++ rat/lonpage.pm 2002/07/01 15:02:19 1.43 @@ -1,19 +1,54 @@ # The LearningOnline Network with CAPA # Page Handler # +# $Id: lonpage.pm,v 1.43 2002/07/01 15:02:19 sakharuk Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # (TeX Content Handler # +# YEAR=2000 # 05/29/00,05/30 Gerd Kortemeyer) # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23, -# 10/02,10/10,10/14,10/16 Gerd Kortemeyer +# 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 +# +### package Apache::lonpage; use strict; use Apache::Constants qw(:common :http); use Apache::lonnet(); +use Apache::loncommon(); +use Apache::lonxml(); use HTML::TokeParser; use GDBM_File; +use Apache::lonsequence; # -------------------------------------------------------------- Module Globals my %hash; @@ -76,7 +111,7 @@ sub tracetable { if (defined($hash{'to_'.$rid})) { my $mincond=1; my $next=''; - map { + foreach (split(/\,/,$hash{'to_'.$rid})) { my $thiscond= &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}}); if ($thiscond>=$mincond) { @@ -87,14 +122,14 @@ sub tracetable { } if ($thiscond>$mincond) { $mincond=$thiscond; } } - } split(/\,/,$hash{'to_'.$rid}); - map { + } + foreach (split(/\,/,$next)) { my ($linkid,$condval)=split(/\:/,$_); if ($condval>=$mincond) { my $now=&tracetable($sofar,$hash{'goesto_'.$linkid},$beenhere); if ($now>$further) { $further=$now; } } - } split(/\,/,$next); + } } } @@ -112,15 +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; } - - 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'}; # ----------------------------------------------------------------- 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)) { @@ -148,9 +187,9 @@ sub handler { for ($i=0;$i<=$#rows;$i++) { if ($rows[$i]) { my @colcont=split(/\&/,$rows[$i]); - map { + foreach (@colcont) { $symbhash{$hash{'src_'.$_}}=''; - } @colcont; + } } } &Apache::lonnet::symblist($requrl,%symbhash); @@ -168,6 +207,9 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); + + my %metalink=(); + my %cellemb=(); my $allscript=''; @@ -184,23 +226,24 @@ sub handler { $contents++; my @colcont=split(/\&/,$rows[$i]); $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1)); - map { + foreach (@colcont) { my $src=$hash{'src_'.$_}; $src=~/\.(\w+)$/; - $cellemb{$_}=Apache::lonnet::fileembstyle($1); + $metalink{$_}=$src.'.meta'; + $cellemb{$_}=Apache::loncommon::fileembstyle($1); if ($cellemb{$_} eq 'ssi') { # --------------------------------------------------------- This is an SSI cell my $prefix=$_.'_'; my %posthash=('request.prefix' => $prefix); if (($ENV{'form.'.$prefix.'submit'}) || ($ENV{'form.all_submit'})) { - map { + foreach (keys %ENV) { if ($_=~/^form.$prefix/) { my $name=$_; $name=~s/^form.$prefix//; $posthash{$name}=$ENV{$_}; } - } keys %ENV; + } } my $output=Apache::lonnet::ssi($src,%posthash); my $parser=HTML::TokeParser->new(\$output); @@ -242,7 +285,11 @@ sub handler { $xmlbody=$token->[4]; } } elsif ($token->[1] eq 'meta') { + if ($token->[4] !~ m:/>$:) { $allmeta.="\n".$token->[4].''; + } else { + $allmeta.="\n".$token->[4]; + } } elsif (($token->[1] eq 'script') && ($bodydef==0)) { $allscript.="\n\n" @@ -258,22 +305,27 @@ sub handler { $nforms++; $output=~s/\