--- rat/lonsequence.pm 2002/08/31 00:43:13 1.14
+++ rat/lonsequence.pm 2003/09/22 03:02:06 1.16
@@ -2,7 +2,7 @@
#
# Sequence Handler
#
-# $Id: lonsequence.pm,v 1.14 2002/08/31 00:43:13 www Exp $
+# $Id: lonsequence.pm,v 1.16 2003/09/22 03:02:06 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -46,6 +46,7 @@ use Apache::lonratedt;
use Apache::lonratsrv;
use Apache::lonpageflip;
use Apache::loncommon;
+use Apache::lonlocal;
my %selhash;
my $successtied;
@@ -62,6 +63,16 @@ sub attemptread {
}
}
+sub mapread {
+ my $fn=shift;
+ &Apache::lonnet::repcopy($fn);
+ if (-e $fn) {
+ return &Apache::lonratedt::mapread($fn,'');
+ } else {
+ return ();
+ }
+}
+
# ---------------------------------------------------------------- View Handler
sub viewmap {
@@ -152,6 +163,10 @@ ENDSELECT
}
}
# ----------------------------- successtied is now '1' if in working selectmode
+ my ($errtext,$fatal)=&mapread(&Apache::lonnet::filelocation('',$url),'');
+ if ($fatal==1) {
+ $r->print('
'.&mt('Map contents are not shown in order.').'
');
+ }
my $idx=0;
foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
if (defined($_)) {
@@ -163,7 +178,7 @@ ENDSELECT
$title=~s/\&colon\;/\:/g;
$url=~s/\&colon\;/\:/g;
unless ($title) { $title=(split(/\//,$url))[-1] };
- unless ($title) { $title='Empty'; }
+ unless ($title) { $title=''.&mt('Empty').''; }
if ($url) {
if ($successtied) {
my $checked='';
@@ -215,7 +230,7 @@ sub handler {
my $r=shift;
if ($r->header_only) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
@@ -281,11 +296,11 @@ sub handler {
# -------------------------------------------------- Has first or last resource
&Apache::lonnet::symblist($requrl,$disurl => $dismapid,
'last_known' => &Apache::lonnet::declutter($disurl));
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.$disurl);
return REDIRECT;
} else {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
&viewmap($r,$requrl);
return OK;