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

[albertel]

albertel		Sat Feb  5 01:52:50 2005 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  - 3rd parmval fixed up for BUG#1444 
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.314 loncom/interface/lonnavmaps.pm:1.315
--- loncom/interface/lonnavmaps.pm:1.314	Tue Feb  1 16:03:13 2005
+++ loncom/interface/lonnavmaps.pm	Sat Feb  5 01:52:50 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.314 2005/02/01 21:03:13 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.315 2005/02/05 06:52:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2478,8 +2478,6 @@
 
     if (defined($courseopt)) {
         if (defined($$courseopt{$courselevelr})) { return $$courseopt{$courselevelr}; }
-        if (defined($$courseopt{$courselevelm})) { return $$courseopt{$courselevelm}; }
-        if (defined($$courseopt{$courselevel})) { return $$courseopt{$courselevel}; }
     }
 
 # ----------------------------------------------------- third, check map parms
@@ -2496,7 +2494,13 @@
     $default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat);
     if (defined($default)) { return $default}
 
-# --------------------------------------------------- fifth , cascade up parts
+# --------------------------------------------------- fifth, check more course
+    if (defined($courseopt)) {
+        if (defined($$courseopt{$courselevelm})) { return $$courseopt{$courselevelm}; }
+        if (defined($$courseopt{$courselevel})) { return $$courseopt{$courselevel}; }
+    }
+
+# --------------------------------------------------- sixth , cascade up parts
 
     my ($space,@qualifier)=split(/\./,$rwhat);
     my $qualifier=join('.',@qualifier);