--- loncom/interface/loncommon.pm 2006/08/11 22:00:07 1.444
+++ loncom/interface/loncommon.pm 2006/08/18 20:24:54 1.446
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.444 2006/08/11 22:00:07 albertel Exp $
+# $Id: loncommon.pm,v 1.446 2006/08/18 20:24:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5849,9 +5849,12 @@ sub construct_course {
#
unless (($args->{'nonstandard'}) || ($args->{'firstres'} eq 'blank')
|| ($cloneid)) {
+ use LONCAPA::map;
$outcome .= &mt('Setting first resource').': ';
- my ($errtext,$fatal)=
- &Apache::londocs::mapread($$crsunum,$$crsudom,'default.sequence');
+
+ my $map = '/uploaded/'.$$crsudom.'/'.$$crsunum.'/default.sequence';
+ my ($errtext,$fatal)=&LONCAPA::map::mapread($map);
+
$outcome .= ($fatal?$errtext:'read ok').' - ';
my $title; my $url;
if ($args->{'firstres'} eq 'syl') {
@@ -5861,10 +5864,12 @@ sub construct_course {
$title='Navigate Contents';
$url='/adm/navmaps';
}
- $Apache::lonratedt::resources[1]=$title.':'.$url.':false:start:res';
- ($errtext,$fatal)=
- &Apache::londocs::storemap($$crsunum,$$crsudom,'default.sequence');
- $outcome .= ($fatal?$errtext:'write ok').'
';
+
+ $LONCAPA::map::resources[1]=$title.':'.$url.':false:start:res';
+ (my $outtext,$errtext) = &LONCAPA::map::storemap($map,1);
+
+ if ($errtext) { $fatal=2; }
+ $outcome .= ($fatal?$errtext:'write ok').'
';
}
return $outcome;
}
@@ -5916,6 +5921,15 @@ sub lonhttpdurl {
return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
}
+sub absolute_url {
+ my ($host_name) = @_;
+ my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://');
+ if ($host_name eq '') {
+ $host_name = $ENV{'SERVER_NAME'};
+ }
+ return $protocol.$host_name;
+}
+
sub connection_aborted {
my ($r)=@_;
$r->print(" ");$r->rflush();