--- loncom/interface/lonparmset.pm	2000/11/24 17:22:13	1.9
+++ loncom/interface/lonparmset.pm	2000/11/24 20:00:27	1.10
@@ -29,6 +29,7 @@ my @outpar;
 
 my @ids;
 my %symbp;
+my %mapp;
 my %typep;
 
 my $uname;
@@ -45,39 +46,59 @@ sub parmval {
     my ($what,$id)=@_;
     my $result='';
 # ----------------------------------------------------- Cascading lookup scheme
+
        my $symbparm=$symbp{$id}.'.'.$what;
-       my $reslevel=
-	    $ENV{'request.course.id'}.'.'.$symbparm;
+       my $mapparm=$mapp{$id}.'___(all).'.$what;
+
        my $seclevel=
-            $ENV{'request.course.id'}.'.'.
-		$ENV{'request.course.sec'}.'.'.$what;
+            $ENV{'request.course.id'}.'.['.
+		$ENV{'request.course.sec'}.'].'.$what;
+       my $seclevelr=
+            $ENV{'request.course.id'}.'.['.
+		$ENV{'request.course.sec'}.'].'.$symbparm;
+       my $seclevelm=
+            $ENV{'request.course.id'}.'.['.
+		$ENV{'request.course.sec'}.'].'.$mapparm;
+
        my $courselevel=
             $ENV{'request.course.id'}.'.'.$what;
+       my $courselevelr=
+            $ENV{'request.course.id'}.'.'.$symbparm;
+       my $courselevelm=
+            $ENV{'request.course.id'}.'.'.$mapparm;
 
 # ----------------------------------------------------------- first, check user
       
       if ($uname) { 
-       if ($useropt{$reslevel}) { $result=$useropt{$reslevel}; 
-                                  $outpar[1]=$result; }
-       if ($useropt{$seclevel}) { $result=$useropt{$seclevel};  
-                                  $outpar[2]=$result; }
-       if ($useropt{$courselevel}) { $result=$useropt{$courselevel};  
-                                     $outpar[3]=$result; }
+       if ($useropt{$courselevelr}) { $outpar[1]=$useropt{$courselevelr}; 
+                                      $result=1; }
+       if ($useropt{$courselevelm}) { $outpar[2]=$useropt{$courselevelm}; 
+                                      $result=2; }
+       if ($useropt{$courselevel}) { $outpar[3]=$useropt{$courselevel};  
+                                     $result=3; }
       }
+
 # -------------------------------------------------------- second, check course
 
-       if ($courseopt{$reslevel}) { $result=$courseopt{$reslevel};  
-                                    $outpar[4]=$result; }
-       if ($courseopt{$seclevel}) { $result=$courseopt{$seclevel};  
-                                    $outpar[5]=$result; }  
-       if ($courseopt{$courselevel}) { $result=$courseopt{$courselevel};  
-                                       $outpar[6]=$result; }
+       if ($courseopt{$seclevelr}) { $outpar[4]=$courseopt{$seclevelr};  
+                                     $result=4; }  
+       if ($courseopt{$seclevelm}) { $outpar[5]=$courseopt{$seclevelm};  
+                                     $result=5; }  
+       if ($courseopt{$seclevel}) { $outpar[6]=$courseopt{$seclevel};  
+                                    $result=6; }  
+
+       if ($courseopt{$courselevelr}) { $outpar[7]=$courseopt{$courselevelr}; 
+                                        $result=7; }
+       if ($courseopt{$courselevelm}) { $outpar[8]=$courseopt{$courselevelm}; 
+                                        $result=8; }
+       if ($courseopt{$courselevel}) { $outpar[9]=$courseopt{$courselevel};  
+                                       $result=9; }
 
 # ------------------------------------------------------ third, check map parms
 
        my $thisparm=$parmhash{$symbparm};
-       if ($thisparm) { $result=$thisparm;  
-                        $outpar[7]=$result; }
+       if ($thisparm) { $outpar[10]=$thisparm;  
+                        $result=10; }
      
 # --------------------------------------------- last, look in resource metadata
 
@@ -90,8 +111,8 @@ sub parmval {
             }
             if (join('',@content)=~
                  /\<$what[^\>]*\>([^\<]*)\<\/$what\>/) {
-	        $result=$1; 
-                $outpar[8]=$result;
+	        $outpar[11]=$1; 
+                $result=11;
  	    }
         }
     return $result;
@@ -205,8 +226,9 @@ sub handler {
                if ($bighash{$_}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 		   $ids[$#ids+1]=$id;
                    $typep{$id}=$1;
-                   $symbp{$id}=
-		    &Apache::lonnet::declutter($bighash{'map_id_'.$mapid}).
+                   $mapp{$id}=
+		       &Apache::lonnet::declutter($bighash{'map_id_'.$mapid});
+                   $symbp{$id}=$mapp{$id}.
 			'___'.$resid.'___'.
 			    &Apache::lonnet::declutter($bighash{$_});
 	       }
@@ -269,24 +291,38 @@ ENDHEAD
             $r->print('>'.$sopt[$k+1].'</option>');
         }
         $r->print('</select>');
+# ----------------------------------------------------------------- Start Table
+        my $coursespan=$csec?8:5;
 	 $r->print(<<ENDTABLEHEAD);
 <p><table border=2>
-<tr><th>Assessment URL and Title</th><th>Part No.</th><th>Parameter Name</th>
-<th>Resource Metadata</th><th>Enclosing Map Parameter</th>
-<th>Course</th>
+<tr><td colspan=4></td>
+<th colspan=$coursespan>Any User</th>
 ENDTABLEHEAD
+    if ($uname) {
+	$r->print("<th colspan=3 rowspan=2>User $uname at Domain $udom</th>");
+    }
+    $r->print(<<ENDTABLETWO);
+</tr><tr><td colspan=4></td>
+<th colspan=2>Resource Level</th>
+<th colspan=3>in Course</th>
+ENDTABLETWO
     if ($csec) {
-	$r->print('<th>Section/Group: '.$csec.'</th>');
+	$r->print("<th colspan=3>in Section/Group $csec</th>");
     }
-	$r->print('<th>Resource in Course</th>');
-	if ($uname) {
-	    $r->print('<th>User in Course</th>');
-            if ($csec) {
-		$r->print('<th>User in Section/Group: '.$csec.'</th>');
-            }
-            $r->print('<th>User for Resource in Course</th>');
-	}
-	$r->print('<tr>');
+    $r->print('</tr><tr>');
+    $r->print(<<ENDTABLEHEADFOUR);
+<tr><th>Assessment URL and Title</th>
+<th>Enclosing Map</th><th>Part No.</th><th>Parameter Name</th>
+<th>from Metadata</th><th>from Enclosing Map</th>
+<th>general</th><th>for Enclosing Map</th><th>for Resource</th>
+ENDTABLEHEADFOUR
+    if ($csec) {
+  $r->print('<th>general</th><th>for Enclosing Map</th><th>for Resource</th>');
+    }
+    if ($uname) {
+  $r->print('<th>general</th><th>for Enclosing Map</th><th>for Resource</th>');
+    }
+	$r->print('</tr><tr>');
  	 map {
 # ------------------------------------------------------ Entry for one resource
 	    @outpar=();
@@ -314,12 +350,15 @@ ENDTABLEHEAD
             } keys %metadata;
             my $totalparms=$#name+1;
             $r->print('<td rowspan='.$totalparms.'><tt><font size=-1>'.
-          join(' / ',split(/\//,$bighash{'src_'.$rid})).'</font></tt><p><b>'.
+  join(' / ',split(/\//,&Apache::lonnet::declutter($bighash{'src_'.$rid}))).
+           '</font></tt><p><b>'.
                       $bighash{'title_'.$rid});
             if ($thistitle) {
 		$r->print(' ('.$thistitle.')');
             }
-            $r->print('</b></td>');
+            $r->print('</b></td><td rowspan='.$totalparms.'>');
+            $r->print('<tt><font size=-1>'.
+		      join(' / ',split(/\//,$mapp{$rid})).'</font></tt></td>');
             my $i;
             for ($i=0;$i<$totalparms;$i++) {
                $r->print("<td>$part[$i]</td><td>$display[$i]</td>");