[LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm

www lon-capa-cvs@mail.lon-capa.org
Wed, 29 May 2002 14:10:28 -0000


www		Wed May 29 10:10:28 2002 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  Part of bug #461: is_on_map did not recognize URL after coming back from NAV
  because query string was attached to it. Probably a problem in other parts of
  the code, too.
  
  Added removal of query string to &declutter, which should be called by
  every routine making use of the URL from $r->uri.
  
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.234 loncom/lonnet/perl/lonnet.pm:1.235
--- loncom/lonnet/perl/lonnet.pm:1.234	Mon May 27 15:03:59 2002
+++ loncom/lonnet/perl/lonnet.pm	Wed May 29 10:10:28 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.234 2002/05/27 19:03:59 www Exp $
+# $Id: lonnet.pm,v 1.235 2002/05/29 14:10:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1737,7 +1737,6 @@
     $pathname=~s/\/$filename$//;
     my $match=($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$pathname}=~
 	       /\&$filename\:([\d\|]+)\&/);
-    &logthis('is: '.$uri.' '.$match.' '.$1);
     if ($match) {
        return (1,$1);
    } else {
@@ -2788,6 +2787,7 @@
     $thisfn=~s/^$perlvar{'lonDocRoot'}//;
     $thisfn=~s/^\///;
     $thisfn=~s/^res\///;
+    $thisfn=~s/\?.+$//;
     return $thisfn;
 }