--- loncom/interface/lonparmset.pm 2000/11/27 16:08:55 1.15
+++ loncom/interface/lonparmset.pm 2000/11/28 15:39:52 1.18
@@ -9,7 +9,7 @@
#
# 10/11,10/12,10/16 Gerd Kortemeyer)
#
-# 11/20,11/21,11/22,11/23,11/24,11/25,11/27 Gerd Kortemeyer
+# 11/20,11/21,11/22,11/23,11/24,11/25,11/27,11/28 Gerd Kortemeyer
package Apache::lonparmset;
@@ -17,7 +17,6 @@ use strict;
use Apache::lonnet;
use Apache::Constants qw(:common :http REDIRECT);
use GDBM_File;
-use Apache::lonmeta;
my %courseopt;
@@ -31,6 +30,10 @@ my @ids;
my %symbp;
my %mapp;
my %typep;
+my %keyp;
+my %defp;
+
+my %allkeys;
my $uname;
my $udom;
@@ -121,16 +124,6 @@ sub parmval {
return $result;
}
-# ---------------------------------------------------------------- Sort routine
-
-sub bycat {
- if ($fcat eq '') {
- $a<=>$b;
- } else {
- &parmval('0.'.$fcat,$a)<=>&parmval('0.'.$fcat,$b);
- }
-}
-
# ------------------------------------------------------------ Output for value
sub valout {
@@ -177,6 +170,8 @@ sub handler {
$csec=$ENV{'form.csec'};
$udom=$ENV{'form.udom'};
+ unless ($udom) { $udom=$r->dir_config('lonDefDomain'); }
+
my $id=$ENV{'form.id'};
if (($id) && ($udom)) {
$uname=(&Apache::lonnet::idget($udom,$id))[1];
@@ -184,7 +179,7 @@ sub handler {
$id='';
} else {
$message=
- "
Unknown ID '$id' at domain '$udom'
";
+ "Unknown ID '$id' at domain '$udom'";
}
} else {
$uname=$ENV{'form.uname'};
@@ -196,14 +191,14 @@ sub handler {
if ($uhome eq 'no_host') {
$message=
- "Unknown user '$uname' at domain '$udom'
";
+ "Unknown user '$uname' at domain '$udom'";
$uname='';
} else {
$csec=&Apache::lonnet::usection(
$udom,$uname,$ENV{'request.course.id'});
if ($csec eq '-1') {
- $message="".
- "User '$uname' at domain '$udom' not in this course
";
+ $message="".
+ "User '$uname' at domain '$udom' not in this course";
$uname='';
$csec=$ENV{'form.csec'};
} else {
@@ -229,19 +224,47 @@ sub handler {
$ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640))) {
# --------------------------------------------------------- Get all assessments
+ %allkeys=();
+ %defp=();
map {
if ($_=~/^src\_(\d+)\.(\d+)$/) {
my $mapid=$1;
my $resid=$2;
my $id=$mapid.'.'.$resid;
- if ($bighash{$_}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+ my $srcf=$bighash{$_};
+ if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
$ids[$#ids+1]=$id;
$typep{$id}=$1;
+ $keyp{$id}='';
+ map {
+ if ($_=~/^parameter\_(.*)/) {
+ my $key=$_;
+ my $allkey=$1;
+ $allkey=~s/\_/\./;
+ my $display=
+ &Apache::lonnet::metadata($srcf,$key.'.display');
+ unless ($display) {
+ $display=
+ &Apache::lonnet::metadata($srcf,$key.'.name');
+ }
+ $allkeys{$allkey}=$display;
+ if ($allkey eq $fcat) {
+ $defp{$id}=
+ &Apache::lonnet::metadata($srcf,$key.'.default');
+ }
+ if ($keyp{$id}) {
+ $keyp{$id}.=','.$key;
+ } else {
+ $keyp{$id}=$key;
+ }
+ }
+ } split(/\,/,
+ &Apache::lonnet::metadata($srcf,'keys'));
$mapp{$id}=
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid});
$symbp{$id}=$mapp{$id}.
'___'.$resid.'___'.
- &Apache::lonnet::declutter($bighash{$_});
+ &Apache::lonnet::declutter($srcf);
}
}
} keys %bighash;
@@ -300,7 +323,7 @@ sub handler {
}
if ($reply=~/^error\:(.*)/) {
- $message.="Write Error: $1
";
+ $message.="Write Error: $1";
}
# ---------------------------------------------------------------- Done storing
}
@@ -330,7 +353,15 @@ sub handler {
}
# ------------------------------------------------------------------- Sort this
- @ids=sort bycat @ids;
+
+ @ids=sort {
+ if ($fcat eq '') {
+ $a<=>$b;
+ } else {
+ $outpar[&parmval($fcat,$a,$defp{$a})]<=>
+ $outpar[&parmval($fcat,$b,$defp{$b})];
+ }
+ } @ids;
# ------------------------------------------------------------------ Start page
$r->content_type('text/html');
$r->send_http_header;
@@ -358,8 +389,7 @@ sub handler {
function psub() {
pclose();
- if ((document.parmform.pres_value.value!='') &&
- (document.parmform.pres_marker.value!='')) {
+ if (document.parmform.pres_marker.value!='') {
document.parmform.submit();
} else {
document.parmform.pres_value.value='';
@@ -389,16 +419,15 @@ at Domain
ENDHEAD
-
- $r->print($message.'Sort list by ');
+
+ $r->print('
'.$message.'
Sort list by ');
$r->print('');
# ----------------------------------------------------------------- Start Table
my $coursespan=$csec?8:5;
@@ -436,34 +465,28 @@ ENDTABLEHEADFOUR
@outpar=();
my $rid=$_;
my $thistitle='';
- my %name= ('0_deadline' => 'deadline');
- my %part= ('0_deadline' => '0');
- my %display=('0_deadline' => 'Deadline');
- my %type= ('0_deadline' => 'date_end');
- my %default=('0_deadline' => time);
- my %metadata=&Apache::lonmeta::unpackagemeta(
-&Apache::lonnet::getfile('/home/httpd/html/'.$bighash{'src_'.$rid}.'.meta'),1);
+ my %name= ();
+ my %part= ();
+ my %display=();
+ my %type= ();
+ my %default=();
+ my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
+
map {
- if ($_=~/^parameter\_(\d+)\_(\w+)$/) {
- my $hashid=$1.'_'.$2;
- $part{$hashid}=$1;
- $name{$hashid}=$2;
- my $tdef;
- ($tdef,$display{$hashid})=
- split(/\_\_dis\_\_/,$metadata{$_});
- ($type{$hashid},$default{$hashid})=split(/\:/,$tdef);
- unless ($display{$hashid}) {
- $display{$hashid}=$name{$hashid};
- }
- }
- if ($_ eq 'title') {
- $thistitle=$metadata{$_};
- }
- } keys %metadata;
+ $part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
+ $name{$_}=&Apache::lonnet::metadata($uri,$_.'.name');
+ $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display');
+ unless ($display{$_}) { $display{$_}=''; }
+ $display{$_}.=' ('.$name{$_}.')';
+ $default{$_}=&Apache::lonnet::metadata($uri,$_.'.default');
+ $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type');
+ $thistitle=&Apache::lonnet::metadata($uri,$_.'.title');
+ } split(/\,/,$keyp{$rid});
+
my $totalparms=scalar keys %name;
$r->print('
'.
- join(' / ',split(/\//,&Apache::lonnet::declutter($bighash{'src_'.$rid}))).
- ' '.
+ join(' / ',split(/\//,$uri)).
+ ' '.
$bighash{'title_'.$rid});
if ($thistitle) {
$r->print(' ('.$thistitle.')');
@@ -476,8 +499,10 @@ ENDTABLEHEADFOUR
my $result=&parmval($part{$_}.'.'.$name{$_},$rid,$default{$_});
- $r->print(" | $part{$_} | $display{$_} | ");
- my $mprefix=$rid.'&'.$_.'&';
+ $r->print("$part{$_} | $display{$_} | ");
+ my $thismarker=$_;
+ $thismarker=~s/^parameter\_//;
+ my $mprefix=$rid.'&'.$thismarker.'&';
$r->print(''.
&valout($outpar[11],$type{$_}).' | ');