--- loncom/interface/lonparmset.pm	2001/03/23 23:04:32	1.26
+++ loncom/interface/lonparmset.pm	2001/05/10 01:06:06	1.29
@@ -11,7 +11,7 @@
 #
 # 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 Gerd Kortemeyer
+# 16/01/01,02/08,03/20,03/23,03/24,03/26,05/09 Gerd Kortemeyer
 
 package Apache::lonparmset;
 
@@ -186,7 +186,21 @@ sub handler {
 
       my $pscat=$ENV{'form.pscat'};
       my $pschp=$ENV{'form.pschp'};
+      my $pssymb='';
 
+# ----------------------------------------------- Was this started from grades?
+
+      if (($ENV{'form.command'} eq 'set') && ($ENV{'form.url'})
+          && (!$ENV{'form.dis'})) {
+	  my $url=$ENV{'form.url'};
+          $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+          $pssymb=&Apache::lonnet::symbread($url);
+          $pscat='all';
+          $pschp='';
+      } else {
+          $ENV{'form.url'}='';
+      }
+ 
       my $id=$ENV{'form.id'};
       if (($id) && ($udom)) {
           $uname=(&Apache::lonnet::idget($udom,$id))[1];
@@ -401,10 +415,11 @@ sub handler {
            if ($fcat eq '') {
               $a<=>$b;
            } else {
-              $outpar[&parmval($fcat,$a,$defp{$a})]<=>
-              $outpar[&parmval($fcat,$b,$defp{$b})];
+              1*$outpar[&parmval($fcat,$a,$defp{$a})]<=>
+              1*$outpar[&parmval($fcat,$b,$defp{$b})];
            } 
-        } @ids;
+       } @ids;
+
 # ------------------------------------------------------------------ Start page
          $r->content_type('text/html');
          $r->send_http_header;
@@ -436,6 +451,7 @@ sub handler {
             document.parmform.action+='#'+document.parmform.pres_marker.value;
             var typedef=new Array();
             typedef=document.parmform.pres_type.value.split('_');
+           if (document.parmform.pres_type.value!='') {
             if (typedef[0]=='date') {
                 eval('document.parmform.recent_'+
                      document.parmform.pres_type.value+
@@ -444,6 +460,7 @@ sub handler {
                 eval('document.parmform.recent_'+typedef[0]+
 		     '.value=document.parmform.pres_value.value;');
             }
+	   }
             document.parmform.submit();
         } else {
             document.parmform.pres_value.value='';
@@ -470,8 +487,12 @@ at Domain
 </b>
 <input type="hidden" value='' name="pres_value">
 <input type="hidden" value='' name="pres_type">
-<input type="hidden" value='' name="pres_marker">
+<input type="hidden" value='' name="pres_marker"> 
 ENDHEAD
+    if ($ENV{'form.url'}) {
+	$r->print('<input type="hidden" value="'.$ENV{'form.url'}.
+	      '" name="url"><input type="hidden" name="command" value="set">');
+    }
     map {
       $r->print('<input type="hidden" value="'.
           $ENV{'form.recent_'.$_}.'" name="recent_'.$_.'">');
@@ -491,7 +512,8 @@ ENDHEAD
         $r->print('<option value=all>All Maps</option>');
         map {
 	    $r->print('<option value="'.$_.'"');
-            if ($pschp eq $_) { $r->print(' selected'); }
+            if (($pssymb=~/^$allmaps{$_}/) || 
+                ($pschp eq $_)) { $r->print(' selected'); }
             $r->print('>'.$allmaps{$_}.'</option>');
         } keys %allmaps;
         $r->print(
@@ -503,8 +525,9 @@ ENDHEAD
             $r->print('>'.$allkeys{$_}.'</option>');
         } keys %allkeys;
         $r->print(
-      '</select></td></tr></table><br><input type="submit" value="Display">');
-      if (($pscat) || ($pschp)) {
+'</select></td></tr></table><br><input name=dis type="submit" value="Display">'
+                 );
+      if (($pscat) || ($pschp) || ($pssymb)) {
 # ----------------------------------------------------------------- Start Table
 	my $catmarker='parameter_'.$pscat;
         $catmarker=~s/\./\_/g;
@@ -542,7 +565,10 @@ ENDTABLEHEADFOUR
          my $defbgtwo='';
  	 map {
            my $rid=$_;
-           if (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid})) {
+           my ($inmapid)=($rid=~/\.(\d+)$/);
+           if (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid}) ||
+               ($pssymb eq $mapp{$rid}.'___'.$inmapid.'___'.
+                &Apache::lonnet::declutter($bighash{'src_'.$rid}))) {
 # ------------------------------------------------------ Entry for one resource
 	     if ($defbgone eq '"E0E099"') {
 		 $defbgone='"E0E0DD"';