--- loncom/interface/Attic/lonspreadsheet.pm	2001/07/21 22:45:46	1.56
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/07/21 23:55:31	1.57
@@ -87,9 +87,6 @@ undef %c;
 undef %rl;
 undef @os;
 
-    undef $nfield;
-    undef $nsheet;
-
 $maxrow=0;
 $sheettype='';
 
@@ -404,7 +401,7 @@ sub outrowassess {
     my @cols=();
     if ($n) {
        my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{'A'.$n});
-       $cols[0]=$rl{$f{'A'.$n}}.'<br>'.
+       $cols[0]=$f{'A'.$n}.'<br>'.$rl{$usy}.'<br>'.
                 '<select name="sel_'.$n.'" onChange="changesheet('.$n.
                 ')"><option name="default">Default</option>';
        map {
@@ -532,12 +529,6 @@ sub getmaxrow {
     my $safeeval=shift;
     return $safeeval->reval('$maxrow');
 }
-# -------------------------------------------- Store which sheet needs changing
-
-sub changesheet {
-    my ($safeeval,$nfield,$nsheet)=@_;
-    $safeeval->reval('$nfield='.$nfield.'; $nsheet='.$nsheet.';');
-}
 
 # ---------------------------------------------------------------- Set filename
 
@@ -964,8 +955,9 @@ sub tmpread {
         }
     }
     if ($nform eq 'changesheet') {
+        $fo{'A'.$nfield}=(split(/\_\_\&\&\&\_\_/,$fo{'A'.$nfield}))[0];
         unless ($ENV{'form.sel_'.$nfield} eq 'Default') {
-	    &changesheet($safeeval,$nfield,$ENV{'form.sel_'.$nfield});
+	    $fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield};
         }
     } else {
        if ($nfield) { $fo{$nfield}=$nform; }
@@ -1237,10 +1229,14 @@ sub updatestudentassesssheet {
 	map {
 	    if ($_=~/^A(\d+)/) {
                 $maxrow=($1>$maxrow)?$1:$maxrow;
-                $existing{$f{$_}}=1;
-		unless ((defined($current{$f{$_}})) || (!$1)) {
+                my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
+                $existing{$usy}=1;
+		unless ((defined($current{$usy})) || (!$1)) {
 		   $f{$_}='!!! Obsolete';
                    $changed=1;
+	        } elsif ($ufn) {
+		    $current{$usy}
+                       =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/;
                 }
             }
         } keys %f;