--- rat/lonpage.pm 2002/05/27 12:04:36 1.39
+++ rat/lonpage.pm 2006/01/11 09:13:15 1.73
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.39 2002/05/27 12:04:36 www Exp $
+# $Id: lonpage.pm,v 1.73 2006/01/11 09:13:15 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,27 +25,17 @@
#
# 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,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::lonnet;
use Apache::loncommon();
use Apache::lonxml();
+use Apache::lonlocal;
+use Apache::lonmenu;
use HTML::TokeParser;
use GDBM_File;
use Apache::lonsequence;
@@ -72,66 +62,70 @@ sub euclid {
sub tracetable {
my ($sofar,$rid,$beenhere)=@_;
my $further=$sofar;
+ my $randomout=0;
+ unless ($env{'request.role.adv'}) {
+ $randomout = $hash{'randomout_'.$rid};
+ }
unless ($beenhere=~/\&$rid\&/) {
- $beenhere.=$rid.'&';
-
- if (defined($hash{'is_map_'.$rid})) {
- if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) &&
- (defined($hash{'map_finish_'.$hash{'src_'.$rid}}))) {
- my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
- $sofar=
- &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
- '&'.$frid.'&');
- $sofar++;
- if ($hash{'src_'.$frid}) {
- my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
- if (($brepriv eq '2') || ($brepriv eq 'F')) {
- if (defined($rows[$sofar])) {
- $rows[$sofar].='&'.$frid;
- } else {
- $rows[$sofar]=$frid;
- }
- }
- }
- }
- } else {
- $sofar++;
- if ($hash{'src_'.$rid}) {
- my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid});
- if (($brepriv eq '2') || ($brepriv eq 'F')) {
- if (defined($rows[$sofar])) {
- $rows[$sofar].='&'.$rid;
- } else {
- $rows[$sofar]=$rid;
- }
- }
- }
- }
-
- if (defined($hash{'to_'.$rid})) {
- my $mincond=1;
- my $next='';
- foreach (split(/\,/,$hash{'to_'.$rid})) {
- my $thiscond=
+ $beenhere.=$rid.'&';
+ unless ($randomout) {
+ if (defined($hash{'is_map_'.$rid})) {
+ if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) &&
+ (defined($hash{'map_finish_'.$hash{'src_'.$rid}}))) {
+ my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
+ $sofar=
+ &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
+ '&'.$frid.'&');
+ $sofar++;
+ if ($hash{'src_'.$frid}) {
+ my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
+ if (($brepriv eq '2') || ($brepriv eq 'F')) {
+ if (defined($rows[$sofar])) {
+ $rows[$sofar].='&'.$frid;
+ } else {
+ $rows[$sofar]=$frid;
+ }
+ }
+ }
+ }
+ } else {
+ $sofar++;
+ if ($hash{'src_'.$rid}) {
+ my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid});
+ if (($brepriv eq '2') || ($brepriv eq 'F')) {
+ if (defined($rows[$sofar])) {
+ $rows[$sofar].='&'.$rid;
+ } else {
+ $rows[$sofar]=$rid;
+ }
+ }
+ }
+ }
+ }
+
+ if (defined($hash{'to_'.$rid})) {
+ my $mincond=1;
+ my $next='';
+ foreach (split(/\,/,$hash{'to_'.$rid})) {
+ my $thiscond=
&Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}});
- if ($thiscond>=$mincond) {
- if ($next) {
- $next.=','.$_.':'.$thiscond;
- } else {
- $next=$_.':'.$thiscond;
- }
- if ($thiscond>$mincond) { $mincond=$thiscond; }
- }
- }
- foreach (split(/\,/,$next)) {
- my ($linkid,$condval)=split(/\:/,$_);
- if ($condval>=$mincond) {
- my $now=&tracetable($sofar,$hash{'goesto_'.$linkid},$beenhere);
- if ($now>$further) { $further=$now; }
- }
- }
-
- }
+ if ($thiscond>=$mincond) {
+ if ($next) {
+ $next.=','.$_.':'.$thiscond;
+ } else {
+ $next=$_.':'.$thiscond;
+ }
+ if ($thiscond>$mincond) { $mincond=$thiscond; }
+ }
+ }
+ foreach (split(/\,/,$next)) {
+ my ($linkid,$condval)=split(/\:/,$_);
+ if ($condval>=$mincond) {
+ my $now=&tracetable($sofar,$hash{'goesto_'.$linkid},$beenhere);
+ if ($now>$further) { $further=$now; }
+ }
+ }
+ }
}
return $further;
}
@@ -144,25 +138,31 @@ sub handler {
# ------------------------------------------- Set document type for header only
if ($r->header_only) {
- if ($ENV{'browser.mathml'}) {
- $r->content_type('text/xml');
+ if ($env{'browser.mathml'}) {
+ &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;
}
-
+
&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'};
+ 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'}) && (!$ENV{'form.forceselect'})) {
- my $fn=$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};
@@ -171,14 +171,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
@@ -187,8 +180,10 @@ sub handler {
for ($i=0;$i<=$#rows;$i++) {
if ($rows[$i]) {
my @colcont=split(/\&/,$rows[$i]);
- foreach (@colcont) {
- $symbhash{$hash{'src_'.$_}}='';
+ foreach my $rid (@colcont) {
+ my ($mapid,$resid)=split(/\./,$rid);
+ $symbhash{$hash{'src_'.$rid}}=
+ [$hash{'src_'.$rid},$resid];
}
}
}
@@ -228,24 +223,58 @@ sub handler {
$lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
foreach (@colcont) {
my $src=$hash{'src_'.$_};
- $src=~/\.(\w+)$/;
+ my ($extension)=($src=~/\.(\w+)$/);
+ if ($hash{'encrypted_'.$_}) {
+ $src=&Apache::lonenc::encrypted($src);
+ }
$metalink{$_}=$src.'.meta';
- $cellemb{$_}=Apache::loncommon::fileembstyle($1);
+ $cellemb{$_}=
+ &Apache::loncommon::fileembstyle($extension);
if ($cellemb{$_} eq 'ssi') {
# --------------------------------------------------------- This is an SSI cell
+ my ($mapid,$resid)=split(/\./,$_);
+ my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
+
my $prefix=$_.'_';
- my %posthash=('request.prefix' => $prefix);
- if (($ENV{'form.'.$prefix.'submit'})
- || ($ENV{'form.all_submit'})) {
- foreach (keys %ENV) {
- if ($_=~/^form.$prefix/) {
- my $name=$_;
- $name=~s/^form.$prefix//;
- $posthash{$name}=$ENV{$_};
- }
- }
+ my %posthash=('request.prefix' => $prefix,
+ 'LONCAPA_INTERNAL_no_discussion' => 'true',
+ 'symb' => $symb);
+ 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'};
+ }
+ my $submitted=exists($env{'form.all_submit'});
+ if (!$submitted) {
+ foreach my $key (keys(%env)) {
+ if ($key=~/^form.\Q$prefix\Esubmit_/) {
+ $submitted=1;last;
+ }
+ }
+ }
+ if ($submitted) {
+ foreach my $key (keys(%env)) {
+ if ($key=~/^form.\Q$prefix\E/) {
+ my $name=$key;
+ $name=~s/^form.\Q$prefix\E//;
+ $posthash{$name}=$env{$key};
+ }
+ }
+ if (exists($env{'form.all_submit'})) {
+ $posthash{'all_submit'}='yes';
+ }
}
my $output=Apache::lonnet::ssi($src,%posthash);
+ $output=~s|//(\s*)?\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;
@@ -329,46 +358,72 @@ 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(''."\n".
+ ''."\n".
+ &Apache::lonmenu::registerurl(1,undef)."\n".
+ ''."\n".
+ ''.
+ &Apache::lonmenu::menubuttons(undef,$target,1)
+ );
+ $r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. ');
+ $r->print('
'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').'.');
} else {
# ------------------------------------------------------------------ Build page
# ---------------------------------------------------------------- Send headers
unless ($target eq 'tex') {
if ($isxml) {
- $r->content_type('text/xml');
+ &Apache::loncommon::content_type($r,'text/xml');
$r->send_http_header;
$r->print($xmlheader);
} else {
- $r->content_type('text/html');
+ &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(&Apache::lonmenu::registerurl(1,undef));
$r->print("\n\n");
# ------------------------------------------------------------------ Start body
if ($isxml) {
$r->print($xmlbody);
} else {
- $r->print('');
+ $r->print(
+ ''.
+ &Apache::lonmenu::menubuttons(undef,$target,1)
+ );
}
# ------------------------------------------------------------------ Start form
if ($nforms) {
$r->print('