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

[raeburn]

raeburn		Fri Aug  5 22:13:46 2016 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonnavmaps.pm 
  Log:
  - For 2.11
    - Backport 1.512, 1.513, 1.514
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.509 loncom/interface/lonnavmaps.pm:1.509.2.1
--- loncom/interface/lonnavmaps.pm:1.509	Fri Sep 25 17:39:36 2015
+++ loncom/interface/lonnavmaps.pm	Fri Aug  5 22:13:46 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.509 2015/09/25 17:39:36 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.509.2.1 2016/08/05 22:13:46 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -915,6 +915,9 @@
     my $nonLinkedText = ''; # stuff after resource title not in link
 
     my $link = $params->{"resourceLink"};
+    if ($resource->ext()) {
+        $link =~ s/\#.+(\?)/$1/g;
+    }
 
     #  The URL part is not escaped at this point, but the symb is... 
 
@@ -2879,7 +2882,7 @@
     # 
     # We want the course level stuff from the way
     # parmval_real operates 
-    # TODO: Fator some of this stuff out of
+    # TODO: Factor some of this stuff out of
     # both parmval_real and here
     #
     my $courselevel = $cid . '.' .  $what;
@@ -2896,7 +2899,7 @@
     }
     # Try for the group's course level option:
 
-    if ($uname ne '' and defined($courseopt)) {
+    if ($cgroup ne '' and defined($courseopt)) {
 	if (defined($$courseopt{$grplevel})) {
 	    return $$courseopt{$grplevel};
 	}
@@ -2904,12 +2907,12 @@
 
     #  Try for section level parameters:
 
-    if ($csec and defined($courseopt)) {
+    if ($csec ne '' and defined($courseopt)) {
 	if (defined($$courseopt{$seclevel})) {
 	    return $$courseopt{$seclevel};
 	}
     }
-    # Try for 'additional' course parameterse:
+    # Try for 'additional' course parameters:
 
     if (defined($courseopt)) {
 	if (defined($$courseopt{$courselevel})) {
@@ -4530,7 +4533,7 @@
     my $due_date=$self->parmval("duedate", $part);
     if ($interval[0] =~ /\d+/) {
        my $first_access=&Apache::lonnet::get_first_access($interval[1],
-                                                          $self->symb);
+                                                          $self->{SYMB});
 	if (defined($first_access)) {
            my $interval = $first_access+$interval[0];
 	    $date = (!$due_date || $interval < $due_date) ? $interval 
@@ -4612,7 +4615,7 @@
     my $self= shift(); my $partID = shift();
     if (! defined($partID)) { $partID = '0'; }
     my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',
-                                     $self->symb);
+                                     $self->{SYMB});
     if (! defined($display) || $display eq '') {
         $display = $partID;
     }