--- loncom/interface/Attic/lonspreadsheet.pm 2001/03/05 21:26:29 1.39
+++ loncom/interface/Attic/lonspreadsheet.pm 2001/03/08 23:22:11 1.40
@@ -4,7 +4,7 @@
# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,
# 12/08,12/09,12/11,12/12,12/15,12/16,12/18,12/19,12/30,
# 01/01/01,02/01,03/01,19/01,20/01,22/01,
-# 03/05 Gerd Kortemeyer
+# 03/05,03/08 Gerd Kortemeyer
package Apache::lonspreadsheet;
@@ -48,25 +48,6 @@ my %parmhash;
my $includedir;
my $tmpdir;
-
-sub mdeb {
- my $msg=shift;
- my $mem='';
- {
- my $mfh=Apache::File->new('/proc/'.$$.'/status');
- my $line;
- while ($line=<$mfh>) {
- my ($name,$value)=split(/\:/,$line);
- if ($name eq 'VmSize') { $mem=$value; }
- }
- $mfh->close();
- }
- print $msg.$mem."
\n";
-}
-
-
-
-
# =============================================================================
# ===================================== Implements an instance of a spreadsheet
@@ -336,7 +317,7 @@ sub sett {
$t{$lb}=~s/\#/$trow/g;
$t{$lb}=~s/\.\.+/\,/g;
$t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
- $t{$lb}=~s/(^|[^\"\'])\[([\w\.]+)\]/$1\$c\{\'$2\'\}/g;
+ $t{$lb}=~s/(^|[^\"\'])\[(\w+)\]/$1\$c\{\'$2\'\}/g;
}
}
} keys %f;
@@ -1122,9 +1103,10 @@ sub updatestudentassesssheet {
my $display=
&Apache::lonnet::metadata($srcf,$key.'.display');
unless ($display) {
- $display=
+ $display.=
&Apache::lonnet::metadata($srcf,$key.'.name');
}
+ $display.='
'.$key;
$allkeys{$key}=$display;
}
} split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));
@@ -1408,13 +1390,16 @@ sub loadassessment {
if ($_=~/^A/) {
unless ($f{$_}=~/^\!/) {
if ($f{$_}=~/^parameter/) {
- $c{$_}=&parmval($f{$_},$safeeval);
+ my $val=&parmval($f{$_},$safeeval);
+ $c{$_}=$val;
+ $c{$f{$_}}=$val;
} else {
my $key=$f{$_};
+ my $ckey=$key;
$key=~s/^stores\_/resource\./;
$key=~s/\_/\./;
$c{$_}=$returnhash{$key};
- $c{$key}=$returnhash{$key};
+ $c{$ckey}=$returnhash{$key};
}
}
}