--- rat/lonpage.pm 2005/06/29 19:02:14 1.71
+++ rat/lonpage.pm 2006/05/30 17:15:10 1.75
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.71 2005/06/29 19:02:14 albertel Exp $
+# $Id: lonpage.pm,v 1.75 2006/05/30 17:15:10 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,6 +39,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;
@@ -180,8 +183,10 @@ sub handler {
for ($i=0;$i<=$#rows;$i++) {
if ($rows[$i]) {
my @colcont=split(/\&/,$rows[$i]);
- foreach (@colcont) {
- $symbhash{$hash{'src_'.$_}}=['page','notasymb'];
+ foreach my $rid (@colcont) {
+ my ($mapid,$resid)=split(/\./,$rid);
+ $symbhash{$hash{'src_'.$rid}}=
+ [$hash{'src_'.$rid},$resid];
}
}
}
@@ -244,15 +249,25 @@ sub handler {
$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;
@@ -348,17 +363,11 @@ sub handler {
unless ($contents) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- $r->print(''."\n".
- ''."\n".
- &Apache::lonmenu::registerurl(1,undef)."\n".
- ''."\n".
- ''.
- &Apache::lonmenu::menubuttons(undef,$target,1)
- );
+ $r->print(&Apache::loncommon::start_page(undef,undef,
+ {'force_register' => 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').'.');
+ $r->print('
'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').
+ &Apache::loncommon::end_page());
} else {
# ------------------------------------------------------------------ Build page
@@ -366,31 +375,20 @@ sub handler {
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('');
}
+ $r->send_http_header;
# ------------------------------------------------------------------------ Head
- $r->print("\n\n".$allmeta);
if ($allscript) {
- $r->print("\n\n");
+ $allscript .=
+ "\n\n";
}
- $r->print(&Apache::lonmenu::registerurl(1,undef));
- $r->print("\n\n");
# ------------------------------------------------------------------ Start body
- if ($isxml) {
- $r->print($xmlbody);
- } else {
- $r->print(
- ''.
- &Apache::lonmenu::menubuttons(undef,$target,1)
- );
- }
+ $r->print(&Apache::loncommon::start_page(undef,undef,
+ {'force_register' => 1,
+ 'bgcolor' => '#ffffff',}));
# ------------------------------------------------------------------ Start form
if ($nforms) {
$r->print(''.
+ $metainfo =''.
''.
'
'.
'';
}
$metainfo .= ''.
'
'.
'';
@@ -451,17 +449,17 @@ sub handler {
'___'.$resid.'___'.
&Apache::lonnet::declutter($hash{'src_'.$rid});
$metainfo.=
- ''.
'&command=submission">'.
'
'.
''.
- ''.
'&command=gradingmenu">'.
'
'.
''.
- ''.
'" >'.
'
'.
@@ -544,7 +542,7 @@ sub handler {
(($nforms>1)?'submit':'hidden').'">');
}
unless ($target eq 'tex') {
- $r->print(''.&Apache::lonxml::xmlend());
+ $r->print(&Apache::loncommon::end_page());
} else {
$r->print('\end{document}'.$number_of_columns);
}