--- rat/lonwrapper.pm	2008/11/10 13:22:23	1.29
+++ rat/lonwrapper.pm	2010/02/11 15:12:11	1.32.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.29 2008/11/10 13:22:23 jms Exp $
+# $Id: lonwrapper.pm,v 1.32.2.2 2010/02/11 15:12:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,23 +26,6 @@
 # http://www.lon-capa.org/
 #
 
-=pod
-
-=head1 NAME
-
-Apache::lonwrapper - External and binary file management.
-
-=head1 SYNOPSIS
-
-Wrapper for external and binary files as standalone resources. Edit handler for rat maps; TeX content handler.
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head2 Subroutines
-
-=cut
-
 
 package Apache::lonwrapper;
 
@@ -106,7 +89,7 @@ sub wrapper {
 	&Apache::loncommon::end_page({'frameset' => 1});
     
     foreach my $url ($topurl,$bottomurl) {
-	if ($url !~ /^http:/) {
+	if ($url !~ /^https?\:/) {
 	    $url = &Apache::lonenc::check_encrypt($url);
 	}
     }
@@ -162,8 +145,11 @@ sub handler {
 #
 	if ($is_ext) {
 	    $ENV{'QUERY_STRING'}=~s/(^|\&)symb=[^\&]*/$1/;
+            $ENV{'QUERY_STRING'} =~ s/\&$//;
 	}
-	$url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; 
+        unless ($ENV{'QUERY_STRING'} eq '') {
+            $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};
+        }
 	# reappend the query arguments
 	$r->print(&wrapper($orgurl,$url));
     } # not just the menu
@@ -173,7 +159,32 @@ sub handler {
 1;
 __END__
 
+=pod
+
+=head1 NAME
+
+Apache::lonwrapper - External and binary file management.
+
+=head1 SYNOPSIS
+
+Wrapper for external and binary files as standalone resources. Edit handler for rat maps; TeX content handler.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 Subroutines
+
+=over
+
+=item simple_menu()
 
+=item wrapper()
+
+=item handler()
+
+=back
+
+=cut