--- loncom/interface/lonnavmaps.pm	2002/09/30 16:45:01	1.56
+++ loncom/interface/lonnavmaps.pm	2002/10/01 07:09:05	1.57
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.56 2002/09/30 16:45:01 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.57 2002/10/01 07:09:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -124,32 +124,32 @@ sub parmval {
     my $courselevelm=$usercourseprefix.'.'.$mapparm;
 
 # ---------------------------------------------------------- first, check user
-    if ($uname) {
-        if ($useropt{$courselevelr}) { return $useropt{$courselevelr}; }
-        if ($useropt{$courselevelm}) { return $useropt{$courselevelm}; }
-        if ($useropt{$courselevel}) { return $useropt{$courselevel}; }
+    if (defined($uname)) {
+        if (defined($useropt{$courselevelr})) { return $useropt{$courselevelr}; }
+        if (defined($useropt{$courselevelm})) { return $useropt{$courselevelm}; }
+        if (defined($useropt{$courselevel})) { return $useropt{$courselevel}; }
     }
 
 # ------------------------------------------------------- second, check course
-    if ($csec) {
-        if ($courseopt{$seclevelr}) { return $courseopt{$seclevelr}; }
-        if ($courseopt{$seclevelm}) { return $courseopt{$seclevelm}; }
-        if ($courseopt{$seclevel}) { return $courseopt{$seclevel}; }
+    if (defined($csec)) {
+        if (defined($courseopt{$seclevelr})) { return $courseopt{$seclevelr}; }
+        if (defined($courseopt{$seclevelm})) { return $courseopt{$seclevelm}; }
+        if (defined($courseopt{$seclevel})) { return $courseopt{$seclevel}; }
     }
 
-    if ($courseopt{$courselevelr}) { return $courseopt{$courselevelr}; }
-    if ($courseopt{$courselevelm}) { return $courseopt{$courselevelm}; }
-    if ($courseopt{$courselevel}) { return $courseopt{$courselevel}; }
+    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
 
     my $thisparm=$parmhash{$symbparm};
-    if ($thisparm) { return $thisparm; }
+    if (defined($thisparm)) { return $thisparm; }
 
 # ----------------------------------------------------- fourth , check default
 
     my $default=&Apache::lonnet::metadata($fn,$rwhat.'.default');
-    if ($default) { return $default}
+    if (defined($default)) { return $default}
 
 # --------------------------------------------------- fifth , cascade up parts
 
@@ -159,10 +159,10 @@ sub parmval {
         my ($part,$id)=split(/\_/,$space);
         if ($id) {
             my $partgeneral=&parmval($part.".$qualifier",$symb);
-            if ($partgeneral) { return $partgeneral; }
+            if (defined($partgeneral)) { return $partgeneral; }
         } else {
             my $resourcegeneral=&parmval("0.$qualifier",$symb);
-            if ($resourcegeneral) { return $resourcegeneral; }
+            if (defined($resourcegeneral)) { return $resourcegeneral; }
         }
     }
     return '';
@@ -1376,33 +1376,33 @@ sub parmval {
 
 # ---------------------------------------------------------- first, check user
     if ($uname and defined($useropt)) {
-        if ($$useropt{$courselevelr}) { return $$useropt{$courselevelr}; }
-        if ($$useropt{$courselevelm}) { return $$useropt{$courselevelm}; }
-        if ($$useropt{$courselevel}) { return $$useropt{$courselevel}; }
+        if (defined($$useropt{$courselevelr})) { return $$useropt{$courselevelr}; }
+        if (defined($$useropt{$courselevelm})) { return $$useropt{$courselevelm}; }
+        if (defined($$useropt{$courselevel})) { return $$useropt{$courselevel}; }
     }
 
 # ------------------------------------------------------- second, check course
     if ($csec and defined($courseopt)) {
-        if ($$courseopt{$seclevelr}) { return $$courseopt{$seclevelr}; }
-        if ($$courseopt{$seclevelm}) { return $$courseopt{$seclevelm}; }
-        if ($$courseopt{$seclevel}) { return $$courseopt{$seclevel}; }
+        if (defined($$courseopt{$seclevelr})) { return $$courseopt{$seclevelr}; }
+        if (defined($$courseopt{$seclevelm})) { return $$courseopt{$seclevelm}; }
+        if (defined($$courseopt{$seclevel})) { return $$courseopt{$seclevel}; }
     }
 
     if (defined($courseopt)) {
-        if ($$courseopt{$courselevelr}) { return $$courseopt{$courselevelr}; }
-        if ($$courseopt{$courselevelm}) { return $$courseopt{$courselevelm}; }
-        if ($$courseopt{$courselevel}) { return $$courseopt{$courselevel}; }
+        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
 
     my $thisparm=$$parmhash{$symbparm};
-    if ($thisparm) { return $thisparm; }
+    if (defined($thisparm)) { return $thisparm; }
 
 # ----------------------------------------------------- fourth , check default
 
     my $default=&Apache::lonnet::metadata($fn,$rwhat.'.default');
-    if ($default) { return $default}
+    if (defined($default)) { return $default}
 
 # --------------------------------------------------- fifth , cascade up parts
 
@@ -1412,10 +1412,10 @@ sub parmval {
         my ($part,$id)=split(/\_/,$space);
         if ($id) {
             my $partgeneral=$self->parmval($part.".$qualifier",$symb);
-            if ($partgeneral) { return $partgeneral; }
+            if (defined($partgeneral)) { return $partgeneral; }
         } else {
             my $resourcegeneral=$self->parmval("0.$qualifier",$symb);
-            if ($resourcegeneral) { return $resourcegeneral; }
+            if (defined($resourcegeneral)) { return $resourcegeneral; }
         }
     }
     return '';