--- rat/lonwrapper.pm	2009/05/27 16:55:03	1.33
+++ rat/lonwrapper.pm	2009/10/21 23:47:11	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.33 2009/05/27 16:55:03 www Exp $
+# $Id: lonwrapper.pm,v 1.36 2009/10/21 23:47:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,9 +56,9 @@ sub wrapper {
     my %layout = ('border' => 0);
     if ($env{'environment.remote'} eq 'off') {
         if ($env{'environment.icons'} eq 'iconsonly') {
-           $layout{'rows'} = "100,*";
+           $layout{'rows'} = "140,*";
         } else {
-	   $layout{'rows'} = "200,*";
+	   $layout{'rows'} = "220,*";
         }
     } else {
 	$layout{'rows'} = "1,*";
@@ -131,8 +131,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