version 1.37, 2001/01/22 18:22:51
|
version 1.38, 2001/01/22 22:54:16
|
Line 328 sub sett {
|
Line 328 sub sett {
|
$t{$lb}=~s/\#/$trow/g; |
$t{$lb}=~s/\#/$trow/g; |
$t{$lb}=~s/\.\.+/\,/g; |
$t{$lb}=~s/\.\.+/\,/g; |
$t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; |
$t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; |
|
$t{$lb}=~s/(^|[^\"\'])\[([\w\.]+)\]/$1\$c\{\'$2\'\}/g; |
} |
} |
} |
} |
} keys %f; |
} keys %f; |
Line 344 sub sett {
|
Line 345 sub sett {
|
$t{$_}=$f{$_}; |
$t{$_}=$f{$_}; |
$t{$_}=~s/\.\.+/\,/g; |
$t{$_}=~s/\.\.+/\,/g; |
$t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; |
$t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; |
|
$t{$_}=~s/(^|[^\"\'])\[([\w\.]+)\]/$1\$c\{\'$2\'\}/g; |
} |
} |
} |
} |
} keys %f; |
} keys %f; |
$t{'A0'}=$f{'A0'}; |
$t{'A0'}=$f{'A0'}; |
$t{'A0'}=~s/\.\.+/\,/g; |
$t{'A0'}=~s/\.\.+/\,/g; |
$t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; |
$t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; |
|
$t{'A0'}=~s/(^|[^\"\'])\[([\w\.]+)\]/$1\$c\{\'$2\'\}/g; |
} |
} |
|
|
sub calc { |
sub calc { |
Line 1102 sub updatestudentassesssheet {
|
Line 1105 sub updatestudentassesssheet {
|
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid}). |
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid}). |
'___'.$resid.'___'. |
'___'.$resid.'___'. |
&Apache::lonnet::declutter($srcf); |
&Apache::lonnet::declutter($srcf); |
$allassess{$symb}=$bighash{'title_'.$id}; |
$allassess{$symb}= |
|
'<a href="/adm/assesscalc?usymb='.$symb.'">'.$bighash{'title_'.$id}.'</a>'; |
if ($stype eq 'assesscalc') { |
if ($stype eq 'assesscalc') { |
map { |
map { |
if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) { |
if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) { |
Line 1228 sub loadcourse {
|
Line 1231 sub loadcourse {
|
} keys %f; |
} keys %f; |
my $now=0; |
my $now=0; |
my $since=time; |
my $since=time; |
$r->print('<br><input type=text size=35 name=remaining value=Starting>'); |
$r->print('<br><input type=text size=35 name=remaining value=Starting>'. |
|
"<br><font size=0>\n"); |
$r->rflush(); |
$r->rflush(); |
map { |
map { |
if ($_=~/^A(\d+)/) { |
if ($_=~/^A(\d+)/) { |
Line 1240 sub loadcourse {
|
Line 1244 sub loadcourse {
|
$now++; |
$now++; |
$r->print('<script>document.sheet.remaining.value="'. |
$r->print('<script>document.sheet.remaining.value="'. |
$now.'/'.$total.': '.int((time-$since)/$now*($total-$now)). |
$now.'/'.$total.': '.int((time-$since)/$now*($total-$now)). |
' secs remaining";</script>'."\n"); |
' secs remaining";</script>'."<br>\n"); |
$r->rflush(); |
$r->rflush(); |
|
|
my $index=0; |
my $index=0; |
Line 1260 sub loadcourse {
|
Line 1264 sub loadcourse {
|
&setformulas($safeeval,%f); |
&setformulas($safeeval,%f); |
&setconstants($safeeval,%c); |
&setconstants($safeeval,%c); |
$r->print('<script>document.sheet.remaining.value="Done";</script>'. |
$r->print('<script>document.sheet.remaining.value="Done";</script>'. |
"<br>\n"); |
"<br>\n</font>"); |
$r->rflush(); |
$r->rflush(); |
} |
} |
|
|
Line 1286 sub loadassessment {
|
Line 1290 sub loadassessment {
|
"restore:$udom:$uname:". |
"restore:$udom:$uname:". |
&Apache::lonnet::escape($namespace).":". |
&Apache::lonnet::escape($namespace).":". |
&Apache::lonnet::escape($symb),$uhome); |
&Apache::lonnet::escape($symb),$uhome); |
|
|
my %returnhash=(); |
my %returnhash=(); |
map { |
map { |
my ($name,$value)=split(/\=/,$_); |
my ($name,$value)=split(/\=/,$_); |
Line 1298 sub loadassessment {
|
Line 1303 sub loadassessment {
|
$returnhash{$_}=$returnhash{$version.':'.$_}; |
$returnhash{$_}=$returnhash{$version.':'.$_}; |
} split(/\:/,$returnhash{$version.':keys'}); |
} split(/\:/,$returnhash{$version.':keys'}); |
} |
} |
|
|
# ----------------------------- returnhash now has all stores for this resource |
# ----------------------------- returnhash now has all stores for this resource |
|
|
# ---------------------------- initialize coursedata and userdata for this user |
# ---------------------------- initialize coursedata and userdata for this user |
Line 1338 sub loadassessment {
|
Line 1344 sub loadassessment {
|
&Apache::lonnet::unescape($value); |
&Apache::lonnet::unescape($value); |
} split(/\&/,$userrdatas{$uname.'___'.$udom}); |
} split(/\&/,$userrdatas{$uname.'___'.$udom}); |
} |
} |
|
|
# ----------------- now courseopt, useropt initialized for this user and course |
# ----------------- now courseopt, useropt initialized for this user and course |
# (used by parmval) |
# (used by parmval) |
|
|
Line 1357 sub loadassessment {
|
Line 1362 sub loadassessment {
|
$key=~s/^stores\_/resource\./; |
$key=~s/^stores\_/resource\./; |
$key=~s/\_/\./; |
$key=~s/\_/\./; |
$c{$_}=$returnhash{$key}; |
$c{$_}=$returnhash{$key}; |
|
$c{$key}=$returnhash{$key}; |
} |
} |
} |
} |
} |
} |