version 1.123, 2002/10/22 18:54:53
|
version 1.127, 2002/10/24 15:34:10
|
Line 122 my $tmpdir;
|
Line 122 my $tmpdir;
|
## |
## |
sub mask { |
sub mask { |
my ($lower,$upper)=@_; |
my ($lower,$upper)=@_; |
|
# |
$lower=~/([A-Za-z]|\*)(\d+|\*)/; |
my ($la,$ld) = ($lower=~/([A-Za-z]|\*)(\d+|\*)/); |
my $la=$1; |
my ($ua,$ud) = ($upper=~/([A-Za-z]|\*)(\d+|\*)/); |
my $ld=$2; |
# |
|
|
$upper=~/([A-Za-z]|\*)(\d+|\*)/; |
|
my $ua=$1; |
|
my $ud=$2; |
|
my $alpha=''; |
my $alpha=''; |
my $num=''; |
my $num=''; |
|
# |
if (($la eq '*') || ($ua eq '*')) { |
if (($la eq '*') || ($ua eq '*')) { |
$alpha='[A-Za-z]'; |
$alpha='[A-Za-z]'; |
} else { |
} else { |
|
|
if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) || |
if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) || |
($la=~/[a-z]/) && ($ua=~/[a-z]/)) { |
($la=~/[a-z]/) && ($ua=~/[a-z]/)) { |
$alpha='['.$la.'-'.$ua.']'; |
$alpha='['.$la.'-'.$ua.']'; |
Line 188 sub mask {
|
Line 185 sub mask {
|
} |
} |
$num.=')'; |
$num.=')'; |
} else { |
} else { |
if ($lda[$#lda]!=$uda[$#uda]) { |
if ($lda[-1]!=$uda[-1]) { |
$num.='['.$lda[$#lda].'-'.$uda[$#uda].']'; |
$num.='['.$lda[-1].'-'.$uda[-1].']'; |
} |
} |
} |
} |
} |
} |
Line 237 undef %c; # Holds the constants for a sh
|
Line 234 undef %c; # Holds the constants for a sh
|
# sheets, this is the A column. Used in &MINPARM, &MAXPARM, &expandnamed, |
# sheets, this is the A column. Used in &MINPARM, &MAXPARM, &expandnamed, |
# &sett, and &setconstants. There is no &getconstants. |
# &sett, and &setconstants. There is no &getconstants. |
# &setconstants is called by &loadstudent, &loadcourse, &load assessment, |
# &setconstants is called by &loadstudent, &loadcourse, &load assessment, |
undef %rowlabel; # Holds the 'prefix' for each row. Set by &setrowlabels. |
|
# &setrowlabels is called by &updateclasssheet, &updatestudentassesssheet, |
|
undef @os; # Holds the names of other spreadsheets - this is used to specify |
undef @os; # Holds the names of other spreadsheets - this is used to specify |
# the spreadsheets that are available for the assessment sheet. |
# the spreadsheets that are available for the assessment sheet. |
# Set by &setothersheets. &setothersheets is called by &handler. A |
# Set by &setothersheets. &setothersheets is called by &handler. A |
Line 754 parametername should be a string such as
|
Line 749 parametername should be a string such as
|
sub MINPARM { |
sub MINPARM { |
my ($expression) = @_; |
my ($expression) = @_; |
my $min = undef; |
my $min = undef; |
|
study($expression); |
foreach $parameter (keys(%c)) { |
foreach $parameter (keys(%c)) { |
next if ($parameter !~ /$expression/); |
next if ($parameter !~ /$expression/); |
if ((! defined($min)) || ($min > $c{$parameter})) { |
if ((! defined($min)) || ($min > $c{$parameter})) { |
Line 776 parametername should be a string such as
|
Line 772 parametername should be a string such as
|
sub MAXPARM { |
sub MAXPARM { |
my ($expression) = @_; |
my ($expression) = @_; |
my $max = undef; |
my $max = undef; |
|
study($expression); |
foreach $parameter (keys(%c)) { |
foreach $parameter (keys(%c)) { |
next if ($parameter !~ /$expression/); |
next if ($parameter !~ /$expression/); |
if ((! defined($min)) || ($max < $c{$parameter})) { |
if ((! defined($min)) || ($max < $c{$parameter})) { |
Line 827 sub expandnamed {
|
Line 824 sub expandnamed {
|
my $returnvalue = ''; |
my $returnvalue = ''; |
my @matches = (); |
my @matches = (); |
$#matches = -1; |
$#matches = -1; |
|
study $expression; |
foreach $parameter (keys(%c)) { |
foreach $parameter (keys(%c)) { |
push @matches,$parameter if ($parameter =~ /$expression/); |
push @matches,$parameter if ($parameter =~ /$expression/); |
} |
} |
Line 915 sub sett {
|
Line 913 sub sett {
|
$t{'A0'}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge; |
$t{'A0'}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge; |
} |
} |
|
|
|
sub calc { |
|
undef %sheet_values; |
|
&sett(); |
|
my $notfinished=1; |
|
my $lastcalc=''; |
|
my $depth=0; |
|
while ($notfinished) { |
|
$notfinished=0; |
|
foreach (keys(%t)) { |
|
my $old=$sheet_values{$_}; |
|
$sheet_values{$_}=eval $t{$_}; |
|
if ($@) { |
|
undef %sheet_values; |
|
return $_.': '.$@; |
|
} |
|
if ($sheet_values{$_} ne $old) { $notfinished=1; $lastcalc=$_; } |
|
} |
|
$depth++; |
|
if ($depth>100) { |
|
undef %sheet_values; |
|
return $lastcalc.': Maximum calculation depth exceeded'; |
|
} |
|
} |
|
return ''; |
|
} |
|
|
# ------------------------------------------- End of "Inside of the safe space" |
# ------------------------------------------- End of "Inside of the safe space" |
ENDDEFS |
ENDDEFS |
$safeeval->reval($code); |
$safeeval->reval($code); |
Line 950 sub outrowassess {
|
Line 974 sub outrowassess {
|
if ($n) { |
if ($n) { |
my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n}); |
my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n}); |
if ($sheet->{'rowlabel'}->{$usy}) { |
if ($sheet->{'rowlabel'}->{$usy}) { |
$cols[0]=$sheet->{'rowlabel'}->{$usy}; |
$cols[0]=&format_rowlabel($sheet->{'rowlabel'}->{$usy}); |
if (! $csv) { |
if (! $csv) { |
$cols[0].='<br>'. |
$cols[0].='<br>'. |
'<select name="sel_'.$n.'" onChange="changesheet('.$n.')">'. |
'<select name="sel_'.$n.'" onChange="changesheet('.$n.')">'. |
Line 988 sub outrow {
|
Line 1012 sub outrow {
|
my $n=shift; |
my $n=shift; |
my @cols=(); |
my @cols=(); |
if ($n) { |
if ($n) { |
$cols[0]=$sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}}; |
$cols[0]=&format_rowlabel($sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}}); |
} else { |
} else { |
$cols[0]='<b><font size=+1>Export</font></b>'; |
$cols[0]='<b><font size=+1>Export</font></b>'; |
} |
} |
Line 1004 sub outrow {
|
Line 1028 sub outrow {
|
} |
} |
|
|
# ------------------------------------------------ Add or change formula values |
# ------------------------------------------------ Add or change formula values |
sub update_values { |
|
my $sheet = shift; |
|
%{$sheet->{'safe'}->varglob('sheet_values')}=%{$sheet->{'values'}}; |
|
return undef; |
|
} |
|
|
|
sub setvalues { |
|
my $sheet=shift; |
|
my ($values) = @_; |
|
$values = {} if (! defined($values)); |
|
if (! ref($values)) { |
|
my %tmp = @_; |
|
$values = \%tmp; |
|
} |
|
$sheet->{'values'} = $values; |
|
%{$sheet->{'safe'}->varglob('sheet_values')}=%{$sheet->{'values'}}; |
|
return undef; |
|
} |
|
|
|
sub setformulas { |
sub setformulas { |
my $sheet=shift; |
my ($sheet)=shift; |
my ($formulas) = @_; |
|
$formulas = {} if (! defined($formulas)); |
|
if (! ref($formulas)) { |
|
my %tmp = @_; |
|
$formulas = \%tmp; |
|
} |
|
$sheet->{'f'} = $formulas; |
|
%{$sheet->{'safe'}->varglob('f')}=%{$sheet->{'f'}}; |
%{$sheet->{'safe'}->varglob('f')}=%{$sheet->{'f'}}; |
return undef; |
|
} |
} |
|
|
# ------------------------------------------------ Add or change formula values |
# ------------------------------------------------ Add or change formula values |
Line 1060 sub setothersheets {
|
Line 1057 sub setothersheets {
|
# ------------------------------------------------ Add or change formula values |
# ------------------------------------------------ Add or change formula values |
sub setrowlabels { |
sub setrowlabels { |
my $sheet=shift; |
my $sheet=shift; |
%{$sheet->{'safe'}->varglob('rowlabel')}=%{$sheet->{'rowlabel'}}; |
my ($rowlabel) = @_; |
|
if (! ref($rowlabel)) { |
|
my %tmp = @_; |
|
$rowlabel = \%tmp; |
|
} |
|
$sheet->{'rowlabel'}=$rowlabel; |
} |
} |
|
|
# ------------------------------------------------------- Calculate spreadsheet |
# ------------------------------------------------------- Calculate spreadsheet |
sub calcsheet { |
sub calcsheet { |
my $sheet=shift; |
my $sheet=shift; |
&setvalues($sheet,undef); |
my $result = $sheet->{'safe'}->reval('&calc();'); |
$sheet->{'safe'}->reval('&sett();'); |
%{$sheet->{'values'}} = %{$sheet->{'safe'}->varglob('sheet_values')}; |
my %t = %{$sheet->{'safe'}->varglob('t')}; |
return $result; |
my $notfinished=1; |
|
my $lastcalc=''; |
|
my $depth=0; |
|
while ($notfinished) { |
|
$notfinished=0; |
|
foreach (keys(%t)) { |
|
my $old=$sheet->{'values'}->{$_}; |
|
$sheet->{'values'}->{$_}=$sheet->{'safe'}->reval($t{$_}.';'); |
|
if ($@) { |
|
&setvalues($sheet,undef); |
|
return $_.': '.$@; |
|
} |
|
if ($sheet->{'values'}->{$_} ne $old) { |
|
$notfinished=1; |
|
$lastcalc=$_; |
|
} |
|
} |
|
if ($notfinished) { |
|
%{$sheet->{'safe'}->varglob('sheet_values')} = |
|
%{$sheet->{'values'}}; |
|
} |
|
|
|
$depth++; |
|
if ($depth>100) { |
|
&setvalues($sheet,undef); |
|
return $lastcalc.': Maximum calculation depth exceeded'; |
|
} |
|
} |
|
return ; |
|
} |
} |
|
|
# ---------------------------------------------------------------- Get formulas |
# ---------------------------------------------------------------- Get formulas |
Line 1381 sub readsheet {
|
Line 1354 sub readsheet {
|
my $fstring=''; |
my $fstring=''; |
if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) { |
if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) { |
my %tmp = split(/___;___/,$fstring); |
my %tmp = split(/___;___/,$fstring); |
&setformulas($sheet,\%tmp); |
$sheet->{'f'} = \%tmp; |
|
&setformulas($sheet); |
} else { |
} else { |
# Not cached, need to read |
# Not cached, need to read |
my %f=(); |
my %f=(); |
Line 1416 sub readsheet {
|
Line 1390 sub readsheet {
|
} |
} |
# Cache and set |
# Cache and set |
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); |
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); |
&setformulas($sheet,\%f); |
$sheet->{'f'}=\%f; |
|
&setformulas($sheet); |
} |
} |
} |
} |
|
|
Line 1562 sub tmpread {
|
Line 1537 sub tmpread {
|
} else { |
} else { |
if ($nfield) { $fo{$nfield}=$nform; } |
if ($nfield) { $fo{$nfield}=$nform; } |
} |
} |
&setformulas($sheet,\%fo); |
$sheet->{'f'}=\%fo; |
|
&setformulas($sheet); |
} |
} |
|
|
################################################## |
################################################## |
Line 1640 sub parmval {
|
Line 1616 sub parmval {
|
return &Apache::lonnet::metadata($fn,$rwhat.'.default'); |
return &Apache::lonnet::metadata($fn,$rwhat.'.default'); |
} |
} |
|
|
|
sub format_rowlabel { |
|
my $rowlabel = shift; |
|
my ($type,$labeldata) = split(':',$rowlabel,2); |
|
my $result = ''; |
|
if ($type eq 'symb') { |
|
my ($symb,$uname,$udom,$title) = split(':',$labeldata); |
|
$symb = &Apache::lonnet::unescape($symb); |
|
if ($ENV{'form.showcsv'}) { |
|
$result = $title; |
|
} else { |
|
$result = '<a href="/adm/assesscalc?usymb='.$symb. |
|
'&uname='.$uname.'&udom='.$udom.'">'.$title.'</a>'; |
|
} |
|
} elsif ($type eq 'student') { |
|
my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata); |
|
if ($ENV{'form.showcsv'}) { |
|
$result = '"'. |
|
join('","',($sname,$sdom,$fullname,$section,$id).'"'); |
|
} else { |
|
$result ='<a href="/adm/studentcalc?uname='.$sname. |
|
'&udom='.$sdom.'">'; |
|
$result.=$section.' '.$id." ".$fullname.'</a>'; |
|
} |
|
} elsif ($type eq 'parameter') { |
|
if ($ENV{'form.showcsv'}) { |
|
$labeldata =~ s/<br>/ /g; |
|
} |
|
$result = $labeldata; |
|
} else { |
|
&Apache::lonnet::logthis("lonspreadsheet:bogus rowlabel type: $type"); |
|
} |
|
return $result; |
|
} |
|
|
# ---------------------------------------------- Update rows for course listing |
# ---------------------------------------------- Update rows for course listing |
sub updateclasssheet { |
sub updateclasssheet { |
my ($sheet) = @_; |
my ($sheet) = @_; |
Line 1662 sub updateclasssheet {
|
Line 1672 sub updateclasssheet {
|
my ($studentDomain,$studentName,$end,$start,$id,$studentSection, |
my ($studentDomain,$studentName,$end,$start,$id,$studentSection, |
$fullname,$status) = @{$classlist->{$student}}; |
$fullname,$status) = @{$classlist->{$student}}; |
if ($ENV{'form.Status'} eq $status || $ENV{'form.Status'} eq 'Any') { |
if ($ENV{'form.Status'} eq $status || $ENV{'form.Status'} eq 'Any') { |
my $rowlabel=''; |
$currentlist{$student}=join(':',('student',$studentName, |
if ($ENV{'form.showcsv'}) { |
$studentDomain,$fullname, |
$rowlabel= '"'.join('","',($studentName,$studentDomain, |
$studentSection,$id)); |
$fullname,$studentSection,$id).'"'); |
|
} else { |
|
$rowlabel='<a href="/adm/studentcalc?uname='.$studentName. |
|
'&udom='.$studentDomain.'">'; |
|
$rowlabel.=$studentSection.' '.$id." ".$fullname; |
|
$rowlabel.='</a>'; |
|
} |
|
$currentlist{$student}=$rowlabel; |
|
} |
} |
} |
} |
# |
# |
Line 1708 sub updateclasssheet {
|
Line 1710 sub updateclasssheet {
|
} |
} |
} |
} |
if ($changed) { |
if ($changed) { |
&setformulas($sheet,\%f); |
$sheet->{'f'} = \%f; |
|
&setformulas($sheet,%f); |
} |
} |
# |
# |
$sheet->{'rowlabel'} = \%currentlist; |
&setrowlabels($sheet,\%currentlist); |
&setrowlabels($sheet); |
|
} |
} |
|
|
# ----------------------------------- Update rows for student and assess sheets |
# ----------------------------------- Update rows for student and assess sheets |
Line 1736 sub updatestudentassesssheet {
|
Line 1738 sub updatestudentassesssheet {
|
return 'Could not access course data'; |
return 'Could not access course data'; |
} |
} |
# Get all assessments |
# Get all assessments |
|
# |
|
# allkeys is used in the assessment sheets to provide labels |
|
# for the parameters. |
my %allkeys=('timestamp' => |
my %allkeys=('timestamp' => |
'Timestamp of Last Transaction<br>timestamp', |
'parameter:Timestamp of Last Transaction<br>timestamp', |
'subnumber' => |
'subnumber' => |
'Number of Submissions<br>subnumber', |
'parameter:Number of Submissions<br>subnumber', |
'tutornumber' => |
'tutornumber' => |
'Number of Tutor Responses<br>tutornumber', |
'parameter:Number of Tutor Responses<br>tutornumber', |
'totalpoints' => |
'totalpoints' => |
'Total Points Granted<br>totalpoints'); |
'parameter:Total Points Granted<br>totalpoints'); |
my $adduserstr=''; |
my $adduserstr=''; |
if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){ |
if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){ |
$adduserstr='&uname='.$uname.'&udom='.$udom; |
$adduserstr='&uname='.$uname.'&udom='.$udom; |
} |
} |
|
# |
|
# allassess holds the descriptions of all assessments |
my %allassess; |
my %allassess; |
if (! $ENV{'form.showcsv'}) { |
foreach ('Feedback','Evaluation','Tutoring','Discussion') { |
%allassess = |
my $symb = '_'.lc($_); |
('_feedback' =>'<a href="/adm/assesscalc?usymb=_feedback'. |
$allassess{$symb} = join(':',('symb',$symb,$uname,$udom,$_)); |
$adduserstr.'">Feedback</a>', |
|
'_evaluation' =>'<a href="/adm/assesscalc?usymb=_evaluation'. |
|
$adduserstr.'">Evaluation</a>', |
|
'_tutoring' =>'<a href="/adm/assesscalc?usymb=_tutoring'. |
|
$adduserstr.'">Tutoring</a>', |
|
'_discussion' =>'<a href="/adm/assesscalc?usymb=_discussion'. |
|
$adduserstr.'">Discussion</a>' |
|
); |
|
} else { |
|
%allassess = |
|
('_feedback' => "Feedback", |
|
'_evaluation' => "Evaluation", |
|
'_tutoring' => "Tutoring", |
|
'_discussion' => "Discussion", |
|
); |
|
} |
} |
while (($_,undef) = each(%bighash)) { |
while (($_,undef) = each(%bighash)) { |
next if ($_!~/^src\_(\d+)\.(\d+)$/); |
next if ($_!~/^src\_(\d+)\.(\d+)$/); |
Line 1778 sub updatestudentassesssheet {
|
Line 1770 sub updatestudentassesssheet {
|
my $symb= |
my $symb= |
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid}). |
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid}). |
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf); |
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf); |
if (! $ENV{'form.showcsv'}) { |
$allassess{$symb}='symb:'.&Apache::lonnet::escape($symb).':' |
$allassess{$symb}= |
.$uname.':'.$udom.':'.$bighash{'title_'.$id}; |
'<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'. |
|
$bighash{'title_'.$id}.'</a>'; |
|
} else { |
|
$allassess{$symb}=$bighash{'title_'.$id}; |
|
} |
|
next if ($stype ne 'assesscalc'); |
next if ($stype ne 'assesscalc'); |
foreach my $key (split(/\,/, |
foreach my $key (split(/\,/, |
&Apache::lonnet::metadata($srcf,'keys') |
&Apache::lonnet::metadata($srcf,'keys') |
Line 1797 sub updatestudentassesssheet {
|
Line 1784 sub updatestudentassesssheet {
|
&Apache::lonnet::metadata($srcf,$key.'.name'); |
&Apache::lonnet::metadata($srcf,$key.'.name'); |
} |
} |
$display.='<br>'.$key; |
$display.='<br>'.$key; |
$allkeys{$key}=$display; |
$allkeys{$key}='parameter:'.$display; |
} # end of foreach |
} # end of foreach |
} |
} |
} # end of foreach (keys(%bighash)) |
} # end of foreach (keys(%bighash)) |
Line 1849 sub updatestudentassesssheet {
|
Line 1836 sub updatestudentassesssheet {
|
} |
} |
} |
} |
if ($changed) { |
if ($changed) { |
&setformulas($sheet,\%f); |
$sheet->{'f'} = \%f; |
|
&setformulas($sheet); |
} |
} |
&setrowlabels($sheet); |
|
# |
# |
undef %existing; |
undef %existing; |
} |
} |
Line 1901 sub loadstudent {
|
Line 1888 sub loadstudent {
|
} |
} |
$cachedassess=''; |
$cachedassess=''; |
undef %cachedstores; |
undef %cachedstores; |
&setformulas($sheet,\%f); |
$sheet->{'f'} = \%f; |
|
&setformulas($sheet); |
&setconstants($sheet,\%c); |
&setconstants($sheet,\%c); |
} |
} |
|
|
Line 1961 ENDPOP
|
Line 1949 ENDPOP
|
} |
} |
} |
} |
} |
} |
&setformulas($sheet,\%f); |
$sheet->{'f'}=\%f; |
|
&setformulas($sheet); |
&setconstants($sheet,\%c); |
&setconstants($sheet,\%c); |
$r->print('<script>popwin.close()</script>'); |
$r->print('<script>popwin.close()</script>'); |
$r->rflush(); |
$r->rflush(); |
Line 2066 sub loadassessment {
|
Line 2055 sub loadassessment {
|
if (tie(%parmhash,'GDBM_File', |
if (tie(%parmhash,'GDBM_File', |
$sheet->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
$sheet->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
my %f=&getformulas($sheet); |
my %f=&getformulas($sheet); |
foreach (keys(%f)) { |
foreach my $cell (keys(%f)) { |
next if ($_!~/^A/); |
next if ($cell !~ /^A/); |
next if ($f{$_}=~/^[\!\~\-]/); |
next if ($f{$cell} =~/^[\!\~\-]/); |
if ($f{$_}=~/^parameter/) { |
if ($f{$cell}=~/^parameter/) { |
if ($thisassess{$f{$_}}) { |
if (defined($thisassess{$f{$cell}})) { |
my $val=&parmval($f{$_},$sheet); |
my $val = &parmval($f{$cell},$sheet); |
$c{$_}=$val; |
$c{$cell} = $val; |
$c{$f{$_}}=$val; |
$c{$f{$cell}} = $val; |
} |
} |
} else { |
} else { |
my $key=$f{$_}; |
my $key=$f{$cell}; |
my $ckey=$key; |
my $ckey=$key; |
$key=~s/^stores\_/resource\./; |
$key=~s/^stores\_/resource\./; |
$key=~s/\_/\./g; |
$key=~s/\_/\./g; |
$c{$_}=$returnhash{$key}; |
$c{$cell}=$returnhash{$key}; |
$c{$ckey}=$returnhash{$key}; |
$c{$ckey}=$returnhash{$key}; |
} |
} |
} |
} |