--- loncom/interface/lonparmset.pm	2001/08/09 19:28:47	1.33
+++ loncom/interface/lonparmset.pm	2001/10/05 21:50:25	1.36
@@ -12,13 +12,14 @@
 # 11/20,11/21,11/22,11/23,11/24,11/25,11/27,11/28,
 # 12/08,12/12,
 # 16/01/01,02/08,03/20,03/23,03/24,03/26,05/09,
-# 07/05,07/06,08/08,08/09 Gerd Kortemeyer
+# 07/05,07/06,08/08,08/09,09/01,09/21 Gerd Kortemeyer
 
 package Apache::lonparmset;
 
 use strict;
 use Apache::lonnet;
 use Apache::Constants qw(:common :http REDIRECT);
+use Apache::loncommon;
 use GDBM_File;
 
 
@@ -186,6 +187,10 @@ sub assessparms {
           $pssymb=&Apache::lonnet::symbread($url);
           $pscat='all';
           $pschp='';
+      } elsif ($ENV{'form.symb'}) {
+	  $pssymb=$ENV{'form.symb'};
+	  $pscat='all';
+	  $pschp='';
       } else {
           $ENV{'form.url'}='';
       }
@@ -223,7 +228,7 @@ sub assessparms {
               my %name=&Apache::lonnet::userenvironment($udom,$uname,
 		('firstname','middlename','lastname','generation','id'));
               $message="\n<p>\nFull Name: ".
-                          $name{'firstname'}.' '.$name{'middlename'}
+                          $name{'firstname'}.' '.$name{'middlename'}.' '
 	                 .$name{'lastname'}.' '.$name{'generation'}.
                        "<br>\nID: ".$name{'id'}.'<p>';
          }
@@ -500,7 +505,7 @@ ENDHEAD
 	    $r->print('<option value="'.$_.'"');
             if ($fcat eq $_) { $r->print(' selected'); }
             $r->print('>'.$allkeys{$_}.'</option>');
-        } keys %allkeys;
+        } reverse sort keys %allkeys;
        $r->print(
     '</select></tr><tr><td>Select Enclosing Map</td><td><select name=pschp>');
         $r->print('<option value=all>All Maps</option>');
@@ -517,7 +522,7 @@ ENDHEAD
 	    $r->print('<option value="'.$_.'"');
             if ($pscat eq $_) { $r->print(' selected'); }
             $r->print('>'.$allkeys{$_}.'</option>');
-        } keys %allkeys;
+        } reverse sort keys %allkeys;
         $r->print(
 '</select></td></tr></table><br><input name=dis type="submit" value="Display">'
                  );
@@ -558,7 +563,7 @@ ENDTABLEHEADFOUR
     if ($uname) {
   $r->print('<th>general</th><th>for Enclosing Map</th><th>for Resource</th>');
     }
-	$r->print('</tr><tr>');
+	$r->print('</tr>');
          my $defbgone='';
          my $defbgtwo='';
  	 map {
@@ -581,6 +586,7 @@ ENDTABLEHEADFOUR
 	    @outpar=();
             my $thistitle='';
             my %name=   ();
+	     undef %name;
             my %part=   ();
 	    my %display=();
 	    my %type=   ();
@@ -588,6 +594,7 @@ ENDTABLEHEADFOUR
             my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
 
             map {
+	     if (($_ eq $catmarker) || ($pscat eq 'all')) {
 		$part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
                 $name{$_}=&Apache::lonnet::metadata($uri,$_.'.name');
                 $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display');
@@ -596,13 +603,13 @@ ENDTABLEHEADFOUR
                 $default{$_}=&Apache::lonnet::metadata($uri,$_);
                 $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type');
                 $thistitle=&Apache::lonnet::metadata($uri,$_.'.title');
+	     }
             } split(/\,/,$keyp{$rid});
 
 	    my $totalparms=scalar keys %name;
-	    my $isdef=1;
-	    unless ($totalparms) { $totalparms=1; $isdef=0; }
-	    if ($pscat ne 'all') { $totalparms=1; }
-            $r->print('<td bgcolor='.$defbgone.
+	  if ($totalparms>0) {
+            my $firstrow=1;
+            $r->print('<tr><td bgcolor='.$defbgone.
                 ' rowspan='.$totalparms.'><tt><font size=-1>'.
                 join(' / ',split(/\//,$uri)).
                 '</font></tt><p><b>'.
@@ -616,11 +623,13 @@ ENDTABLEHEADFOUR
             $r->print('<td bgcolor='.$defbgone.
                     ' rowspan='.$totalparms.'><tt><font size=-1>'.
 		      join(' / ',split(/\//,$mapp{$rid})).'</font></tt></td>');
-	  if ($isdef) {
             map {
-	     if (($_ eq $catmarker) || ($pscat eq 'all')) {
 	       my $result=&parmval($part{$_}.'.'.$name{$_},$rid,$default{$_});
-
+               unless ($firstrow) { 
+                  $r->print('<tr>'); 
+               } else {
+		   $firstrow=0;
+               }
                $r->print("<td bgcolor=".$defbgtwo.
                   ">$part{$_}</td><td bgcolor=".$defbgone.
                   ">$display{$_}</td>");
@@ -686,12 +695,9 @@ ENDTABLEHEADFOUR
                $r->print(
 	'<td bgcolor=#999999><font color=#FFFFFF>'.$sessionval.'&nbsp;'.
         '</font></td>');
-               $r->print("</tr>\n<tr>");
-	   }
+               $r->print("</tr>");
 	   } sort keys %name;
-	} else {
- 	    $r->print("</tr>\n<tr>");
-        }
+	}
 # -------------------------------------------------- End entry for one resource
 	 }
 	 } @ids;
@@ -821,7 +827,7 @@ sub handler {
       $r->send_http_header;
       return OK;
    }
-
+   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 # ----------------------------------------------------- Needs to be in a course
 
    if (($ENV{'request.course.id'}) &&