--- loncom/interface/lonparmset.pm 2004/07/27 23:35:34 1.171
+++ loncom/interface/lonparmset.pm 2004/09/10 21:29:54 1.175
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.171 2004/07/27 23:35:34 www Exp $
+# $Id: lonparmset.pm,v 1.175 2004/09/10 21:29:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -581,12 +581,14 @@ sub extractResourceInformation {
foreach (keys %$bighash) {
if ($_=~/^src\_(\d+)\.(\d+)$/) {
+ # there are no resources in the 0 level
+ if ($1 eq '0') { next; }
my $mapid=$1;
my $resid=$2;
my $id=$mapid.'.'.$resid;
my $srcf=$$bighash{$_};
-# if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
if (1) {
+ $srcf=~/\.(\w+)$/;
$$ids[$#$ids+1]=$id;
$$typep{$id}=$1;
$$keyp{$id}='';
@@ -595,6 +597,10 @@ sub extractResourceInformation {
my $key=$_;
my $allkey=$1;
$allkey=~s/\_/\./g;
+ if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq
+ 'parm') {
+ next; #hide hidden things
+ }
my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
@@ -619,8 +625,12 @@ sub extractResourceInformation {
&Apache::lonnet::declutter($$bighash{'map_id_'.$mapid});
$$mapp{$mapid}=$$mapp{$id};
$$allmaps{$mapid}=$$mapp{$id};
- $$maptitles{$mapid}=
- $$bighash{'title_'.$$bighash{'ids_'.&Apache::lonnet::clutter($$mapp{$id})}};
+ if ($mapid eq '1') {
+ $$maptitles{$mapid}='Main Course Documents';
+ } else {
+ $$maptitles{$mapid}=
+ $$bighash{'title_'.$$bighash{'ids_'.&Apache::lonnet::clutter($$mapp{$id})}};
+ }
$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
$$symbp{$id}=$$mapp{$id}.
'___'.$resid.'___'.
@@ -689,8 +699,12 @@ sub assessparms {
my $message='';
$csec=$ENV{'form.csec'};
- $udom=$ENV{'form.udom'};
- unless ($udom) { $udom=$r->dir_config('lonDefDomain'); }
+ if ($udom=$ENV{'form.udom'}) {
+ } elsif ($udom=$ENV{'request.role.domain'}) {
+ } elsif ($udom=$ENV{'user.domain'}) {
+ } else {
+ $udom=$r->dir_config('lonDefDomain');
+ }
my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
my $pschp=$ENV{'form.pschp'};
@@ -1830,9 +1844,10 @@ ENDOVER
$middle=~s/\.$//;
my $realm=''.&mt('All Resources').'';
if ($middle=~/^(.+)\_\_\_\(all\)$/) {
- $realm=''.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).'';
+ $realm=''.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).'
('.$1.')';
} elsif ($middle) {
- $realm=''.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).'';
+ my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+ $realm=''.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).'
('.$url.' in '.$map.' id: '.$id.')';
}
if ($section ne $oldsection) {
$r->print(&tableend()."\n