--- loncom/interface/lonparmset.pm 2005/08/29 22:57:09 1.244
+++ loncom/interface/lonparmset.pm 2005/09/02 22:14:35 1.247
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.244 2005/08/29 22:57:09 banghart Exp $
+# $Id: lonparmset.pm,v 1.247 2005/09/02 22:14:35 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2191,18 +2191,20 @@ sub listdata {
my $foundkeys=0;
foreach my $thiskey (sort {
if ($sortorder eq 'realmstudent') {
- my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
- my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
- if (!defined($astudent) && !defined($bstudent) &&
- !defined($arealm) && !defined($brealm)) {
- ($arealm)=($a=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/);
- ($brealm)=($b=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/);
+ my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
+ my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
+ if (!defined($astudent)) {
+ ($arealm)=($a=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
}
- ($arealm cmp $brealm) || ($astudent cmp $bstudent);
+ if (!defined($bstudent)) {
+ ($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+ }
+ ($arealm cmp $brealm) || ($astudent cmp $bstudent);
} else {
$a cmp $b;
}
} keys %{$listdata}) {
+
if ($$listdata{$thiskey.'.type'}) {
my $thistype=$$listdata{$thiskey.'.type'};
if ($$resourcedata{$thiskey.'.type'}) {
@@ -2729,6 +2731,8 @@ sub setinstmeta {
my ($r)=@_;
my $next_meta;
my $output;
+ my $item_num;
+ my $put_result;
if ($env{'form.serial'}) {
$next_meta = $env{'form.serial'};
} else {
@@ -2744,57 +2748,60 @@ sub setinstmeta {
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my $key_base = $env{'course.'.$env{'request.course.id'}.'.metadata.'};
- if ($env{'form.state'}eq 'add') {
- $r->print('Compose a new metadata item:
');
- $r->print('
');
- } elsif ($env{'form.state'}eq 'save') {
- $r->print('Here we save the metadata');
- $key_base.=$env{'form.serial'}.'.';
- $r->print('The title: '.$env{'form.title'}.'
');
- $r->print('The values: '.$env{'form.values'}.'
');
- $r->print('The type: '.$env{'form.type'}.'
');
- $r->print('The number: '.$env{'form.serial'}.'
');
- my $name = 'metadata.'.$env{'form.serial'}.'.title';
- my $value = $env{'form.title'};
- my $put_result = &Apache::lonnet::put('environment',
+ foreach my $field (%env) {
+ # start by looking for populated fields
+ if ($field=~m/type(\d+)/) {
+ my $item_num = $1;
+ my $name = 'metadata.'.$item_num.'.type';
+ my $value = $env{'form.type'.$item_num};
+ $put_result = &Apache::lonnet::put('environment',
{$name=>$value},$dom,$crs);
- $r->print('the put result was: '.$put_result.'
');
- $name = 'metadata.'.$env{'form.serial'}.'.type';
- $value = $env{'form.type'};
- $put_result = &Apache::lonnet::put('environment',
+ $name = 'metadata.'.$item_num.'.values';
+ $value = $env{'form.values'.$item_num};
+ $put_result = &Apache::lonnet::put('environment',
{$name=>$value},$dom,$crs);
- $name = 'metadata.'.$env{'form.serial'}.'.values';
- $value = $env{'form.values'};
- $put_result = &Apache::lonnet::put('environment',
+ }
+ if ($field=~m/newfield/) {
+ my $item_num = $env{'form.serial'};
+ my $name = 'metadata.'.$item_num.'.type';
+ my $value = $env{'form.typenew'};
+ $put_result = &Apache::lonnet::put('environment',
{$name=>$value},$dom,$crs);
- &Apache::lonnet::coursedescription($env{'request.course.id'});
- } else {
+ $name = 'metadata.'.$item_num.'.values';
+ $value = $env{'form.valuesnew'};
+ $put_result = &Apache::lonnet::put('environment',
+ {$name=>$value},$dom,$crs);
+ $name = 'metadata.'.$item_num.'.title';
+ $value = $env{'form.titlenew'};
+ $put_result = &Apache::lonnet::put('environment',
+ {$name=>$value},$dom,$crs);
+
+ }
- foreach my $key (sort keys %env) {
- if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.\d+\.title$/) {
- $key=~m/^course\.$env{'request.course.id'}\.metadata\.(\d+)\.title/;
-
- if ($1 ge $next_meta) {
- $next_meta = $1 + 1;
- }
- $output.=''.$env{$key}.' | ';
- $output.='Select one: ';
- $output.='Select many: | ';
- $output.=' |
';
- }
+
+ }
+ &Apache::lonnet::coursedescription($env{'request.course.id'});
+ foreach my $key (sort keys %env) {
+ if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.\d+\.title$/) {
+ $key=~m/(^course\.$env{'request.course.id'}\.metadata\.)(\d+)\.title/;
+ $key_base = $1;
+ $item_num = $2;
+ if ($item_num ge $next_meta) {
+ $next_meta = $item_num + 1;
+ }
+ $output.=''.$env{$key}.' | ';
+ $output.='Select one: ';
+ $output.='Select many: | ';
+ $output.=' |
';
}
+ }
$output.='Create new instructor metadata item ';
- $output.=' | Options here | ';
- $output.=' |
';
+ $output.='';
+ $output.='Select one: ';
+ $output.='Select many: | ';
+ $output.=' | ';
+ $output.='';
+ $output.='';
$r->print(<
@@ -2808,7 +2815,7 @@ sub setinstmeta {
ENDenv
- }
+
$r->print('