--- rat/lonpage.pm 2004/12/10 19:59:55 1.64
+++ rat/lonpage.pm 2008/11/20 13:11:43 1.88
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.64 2004/12/10 19:59:55 albertel Exp $
+# $Id: lonpage.pm,v 1.88 2008/11/20 13:11:43 jms Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,24 +25,114 @@
#
# 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
-# YEAR=2002
-# 03/19 Gerd Kortemeyer
-#
###
+=head1 NAME
+
+Apache::lonpage - Page Handler
+
+=head1 SYNOPSIS
+
+Invoked by /etc/httpd/conf/srm.conf:
+
+
+ SetHandler perl-script
+ PerlHandler Apache::lonpage
+
+
+=head1 INTRODUCTION
+
+This module renders a .page resource.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+This routine is called by Apache and mod_perl.
+
+=over 4
+
+=item *
+
+set document type for header only
+
+=item *
+
+tie db file
+
+=item *
+
+render page
+
+=item *
+
+add to symb list
+
+=item *
+
+page parms
+
+=item *
+
+Get SSI output, post parameters
+
+=item *
+
+SSI cell rendering
+
+=item *
+
+Deal with Applet codebases
+
+=item *
+
+Build page
+
+=item *
+
+send headers
+
+=item *
+
+start body
+
+=item *
+
+start form
+
+=item *
+
+start table
+
+=item *
+
+submit element, etc, render page, untie hash
+
+=back
+
+=head1 OTHER SUBROUTINES
+
+=over 4
+
+=item *
+
+euclid() : Euclid's method for determining the greatest common denominator.
+
+=item *
+
+tracetable() : Build page table.
+
+=back
+
+=cut
+
+
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;
@@ -50,6 +140,9 @@ use Apache::lonmenu;
use HTML::TokeParser;
use GDBM_File;
use Apache::lonsequence;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
# -------------------------------------------------------------- Module Globals
my %hash;
@@ -74,7 +167,7 @@ sub tracetable {
my ($sofar,$rid,$beenhere)=@_;
my $further=$sofar;
my $randomout=0;
- unless ($ENV{'request.role.adv'}) {
+ unless ($env{'request.role.adv'}) {
$randomout = $hash{'randomout_'.$rid};
}
unless ($beenhere=~/\&$rid\&/) {
@@ -86,7 +179,7 @@ sub tracetable {
my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
$sofar=
&tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
- '&'.$frid.'&');
+ '&'.$frid.$beenhere);
$sofar++;
if ($hash{'src_'.$frid}) {
my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
@@ -149,7 +242,7 @@ sub handler {
# ------------------------------------------- Set document type for header only
if ($r->header_only) {
- if ($ENV{'browser.mathml'}) {
+ if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($r,'text/xml');
} else {
&Apache::loncommon::content_type($r,'text/html');
@@ -162,7 +255,7 @@ sub handler {
['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');
@@ -170,8 +263,8 @@ sub handler {
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)) {
# ------------------------------------------------------------------- Hash tied
@@ -191,8 +284,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];
}
}
}
@@ -212,8 +307,6 @@ sub handler {
my %ssivlink=();
my %ssialink=();
- my %metalink=();
-
my %cellemb=();
my $allscript='';
@@ -236,7 +329,6 @@ sub handler {
if ($hash{'encrypted_'.$_}) {
$src=&Apache::lonenc::encrypted($src);
}
- $metalink{$_}=$src.'.meta';
$cellemb{$_}=
&Apache::loncommon::fileembstyle($extension);
if ($cellemb{$_} eq 'ssi') {
@@ -246,26 +338,37 @@ sub handler {
my $prefix=$_.'_';
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'};
+ 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) {
- if ($_=~/^form.$prefix/) {
- my $name=$_;
- $name=~s/^form.$prefix//;
- $posthash{$name}=$ENV{$_};
- }
- }
+ 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;
+ $output=~s|//(\s*)?\s||gs;
if ($target eq 'tex') {
$output =~ s/^([^&]+)\\begin{document}//;
$output =~ s/\\end{document}//;
@@ -333,7 +436,7 @@ sub handler {
$output=~s/\