--- loncom/interface/Attic/lonspreadsheet.pm 2002/12/03 10:04:21 1.153
+++ loncom/interface/Attic/lonspreadsheet.pm 2002/12/04 21:49:33 1.154
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.153 2002/12/03 10:04:21 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.154 2002/12/04 21:49:33 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -981,7 +981,11 @@ sub outrowassess {
if ($n) {
my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n});
if (exists($sheet->{'rowlabel'}->{$usy})) {
- $rowlabel = $sheet->{'rowlabel'}->{$usy};
+ # This is dumb, but we need the information when we output
+ # the html version of the studentcalc spreadsheet for the
+ # links to the assesscalc sheets.
+ $rowlabel = $sheet->{'rowlabel'}->{$usy}.':'.
+ &Apache::lonnet::escape($ufn);
} else {
$rowlabel = '';
}
@@ -1198,9 +1202,13 @@ sub sort_indicies {
my @sortby2=(undef);
# Skip row 0
for (my $row=1;$row<=$sheet->{'maxrow'};$row++) {
- my (undef,$symb,$uname,$udom,$mapid,$resid,$title) =
- split(':',$sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$row}});
- $symb = &Apache::lonnet::unescape($symb);
+ my ($key,undef) = split(/__&&&\__/,$sheet->{'f'}->{'A'.$row});
+ my $rowlabel = $sheet->{'rowlabel'}->{$key};
+ my (undef,$symb,$mapid,$resid,$title,$ufn) =
+ split(':',$rowlabel);
+ $ufn = &Apache::lonnet::unescape($ufn);
+ $symb = &Apache::lonnet::unescape($symb);
+ $title = &Apache::lonnet::unescape($title);
my ($sequence) = ($symb =~ /\/([^\/]*\.sequence)/);
if ($sequence eq '') {
$sequence = $symb;
@@ -1387,18 +1395,21 @@ END
if ($sheet->{'sheettype'} eq 'classcalc') {
$row_html.='
'.&format_html_rowlabel($sheet,$rowlabel).'
';
# Output links for each student?
- # Nope, that is already done for us in format_html_rowlabel (for now)
+ # Nope, that is already done for us in format_html_rowlabel
+ # (for now)
} elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+ my $ufn = (split(/:/,$rowlabel))[5];
$row_html.='