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

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 13 Mar 2003 20:56:13 -0000


albertel		Thu Mar 13 15:56:13 2003 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  - full cascade up
  
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.159 loncom/interface/lonnavmaps.pm:1.160
--- loncom/interface/lonnavmaps.pm:1.159	Thu Mar 13 15:46:36 2003
+++ loncom/interface/lonnavmaps.pm	Thu Mar 13 15:56:13 2003
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.159 2003/03/13 20:46:36 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.160 2003/03/13 20:56:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1623,14 +1623,12 @@
     my ($space,@qualifier)=split(/\./,$rwhat);
     my $qualifier=join('.',@qualifier);
     unless ($space eq '0') {
-        my ($part,$id)=split(/\_/,$space);
-        if ($id) {
-            my $partgeneral=$self->parmval($part.".$qualifier",$symb);
-            if (defined($partgeneral)) { return $partgeneral; }
-        } else {
-            my $resourcegeneral=$self->parmval("0.$qualifier",$symb);
-            if (defined($resourcegeneral)) { return $resourcegeneral; }
-        }
+	my @parts=split(/_/,$space);
+	my $id=pop(@parts);
+	my $part=join('_',@parts);
+	if ($part eq '') { $part='0'; }
+	my $partgeneral=$self->parmval($part.".$qualifier",$symb);
+	if (defined($partgeneral)) { return $partgeneral; }
     }
     return '';
 }