[LON-CAPA-cvs] cvs: loncom /interface/spreadsheet assesscalc.pm

[albertel]

albertel		Sat Feb  5 01:56:25 2005 EDT

  Modified files:              
    /loncom/interface/spreadsheet	assesscalc.pm 
  Log:
  - sprs cascade changes for bug#1444
  
  
Index: loncom/interface/spreadsheet/assesscalc.pm
diff -u loncom/interface/spreadsheet/assesscalc.pm:1.35 loncom/interface/spreadsheet/assesscalc.pm:1.36
--- loncom/interface/spreadsheet/assesscalc.pm:1.35	Tue Dec  7 19:15:18 2004
+++ loncom/interface/spreadsheet/assesscalc.pm	Sat Feb  5 01:56:24 2005
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.35 2004/12/08 00:15:18 albertel Exp $
+# $Id: assesscalc.pm,v 1.36 2005/02/05 06:56:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -337,15 +337,16 @@
     #
     # check course
     return $courseopt{$courselevelr} if (defined($courseopt{$courselevelr}));
-    return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm}));
-    return $courseopt{$courselevel}  if (defined($courseopt{$courselevel}));
     # check map parms
     my $thisparm = $parmhash{$symbparm};
     return $thisparm if (defined($thisparm));
     # check default
     $thisparm = &Apache::lonnet::metadata($fn,$rwhat.'.default');
     return $thisparm if (defined($thisparm));
-    #
+    # check more course
+    return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm}));
+    return $courseopt{$courselevel}  if (defined($courseopt{$courselevel}));
+
     # Cascade Up
     my $space=$what;
     $space=~s/\.[^._]+$//;