--- loncom/interface/lonparmset.pm	2000/11/24 15:27:27	1.8
+++ loncom/interface/lonparmset.pm	2000/11/24 21:41:43	1.11
@@ -9,7 +9,7 @@
 #
 # 10/11,10/12,10/16 Gerd Kortemeyer)
 #
-# 11/20,11/21,11/22,11/23,11/24 Gerd Kortemeyer
+# 11/20,11/21,11/22,11/23,11/24,11/25 Gerd Kortemeyer
 
 package Apache::lonparmset;
 
@@ -29,6 +29,7 @@ my @outpar;
 
 my @ids;
 my %symbp;
+my %mapp;
 my %typep;
 
 my $uname;
@@ -42,58 +43,81 @@ my $fcat;
 # -------------------------------------------- Figure out a cascading parameter
 
 sub parmval {
-    my ($what,$id)=@_;
+    my ($what,$id,$def)=@_;
     my $result='';
+    @outpar=();
 # ----------------------------------------------------- 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 default
+
+       if ($def) { $outpar[11]=$def;
+                   $result=11; }
+
+# ----------------------------------------------------- second, check map parms
+
+       my $thisparm=$parmhash{$symbparm};
+       if ($thisparm) { $outpar[10]=$thisparm;  
+                        $result=10; }
+
+# --------------------------------------------------------- third, check course
+
+       if ($courseopt{$courselevel}) { $outpar[9]=$courseopt{$courselevel};  
+                                       $result=9; }
 
-# ----------------------------------------------------------- first, check user
+       if ($courseopt{$courselevelm}) { $outpar[8]=$courseopt{$courselevelm}; 
+                                        $result=8; }
+
+       if ($courseopt{$courselevelr}) { $outpar[7]=$courseopt{$courselevelr}; 
+                                        $result=7; }
+
+       if ($csec) {
+
+        if ($courseopt{$seclevel}) { $outpar[6]=$courseopt{$seclevel};  
+                                    $result=6; }
+
+        if ($courseopt{$seclevelm}) { $outpar[5]=$courseopt{$seclevelm};  
+                                     $result=5; }  
+ 
+        if ($courseopt{$seclevelr}) { $outpar[4]=$courseopt{$seclevelr};  
+                                     $result=4; }
+  
+      }
+
+# ---------------------------------------------------------- fourth, 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; }
-      }
-# -------------------------------------------------------- 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 ($useropt{$courselevel}) { $outpar[3]=$useropt{$courselevel};  
+                                     $result=3; }
 
-# ------------------------------------------------------ third, check map parms
+       if ($useropt{$courselevelm}) { $outpar[2]=$useropt{$courselevelm}; 
+                                      $result=2; }
 
-       my $thisparm=$parmhash{$symbparm};
-       if ($thisparm) { $result=$thisparm;  
-                        $outpar[7]=$result; }
-     
-# --------------------------------------------- last, look in resource metadata
+       if ($useropt{$courselevelr}) { $outpar[1]=$useropt{$courselevelr}; 
+                                      $result=1; }
 
-        my $filename='/home/httpd/res/'.$bighash{'src_'.$id}.'.meta';
-        if (-e $filename) {
-            my @content;
-            {
-             my $fh=Apache::File->new($filename);
-             @content=<$fh>;
-            }
-            if (join('',@content)=~
-                 /\<$what[^\>]*\>([^\<]*)\<\/$what\>/) {
-	        $result=$1; 
-                $outpar[8]=$result;
- 	    }
-        }
+      }
+     
     return $result;
 }
 
@@ -107,13 +131,21 @@ sub bycat {
     }
 }
 
+# ------------------------------------------------------------ Output for value
+
+sub valout {
+    my ($value,$type)=@_;
+    return
+	($value?(($type=~/^date/)?localtime($value):$value):'&nbsp;&nbsp;');
+}
+
 # -------------------------------------------------------- Produces link anchor
 
 sub plink {
     my ($type,$dis,$value,$marker,$return,$call)=@_;
     return '<a href="javascript:pjump('."'".$type."','".$dis."','".$value."','"
       .$marker."','".$return."','".$call."'".');">'.
-    ($value?(($type=~/^date/)?localtime($value):$value):'&nbsp;&nbsp;').'</a>';
+      &valout($value,$type).'</a>';
 }
 
 # ================================================================ Main Handler
@@ -197,8 +229,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{$_});
 	       }
@@ -261,48 +294,111 @@ ENDHEAD
             $r->print('>'.$sopt[$k+1].'</option>');
         }
         $r->print('</select>');
-	 $r->print("\n<p><table border=2>\n<tr>");
+# ----------------------------------------------------------------- Start Table
+        my $coursespan=$csec?8:5;
+	 $r->print(<<ENDTABLEHEAD);
+<p><table border=2>
+<tr><td colspan=5></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);
+<th rowspan=3>Parameter in Effect</th></tr><tr><td colspan=5></td>
+<th colspan=2>Resource Level</th>
+<th colspan=3>in Course</th>
+ENDTABLETWO
+    if ($csec) {
+	$r->print("<th colspan=3>in Section/Group $csec</th>");
+    }
+    $r->print(<<ENDTABLEHEADFOUR);
+</tr><tr><th>Assessment URL and Title</th><th>Type</th>
+<th>Enclosing Map</th><th>Part No.</th><th>Parameter Name</th>
+<th>default</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=();
             my $rid=$_;
             my $thistitle='';
-            my @part=(0,1,1);
-            my @name=('deadline','sig','tol');
-	    my @display=('Deadline','Significant Figures','Tolerance');
-	    my @type=('date','int','tolerance');
+            my %name=   ('0_deadline' => 'deadline');
+            my %part=   ('0_deadline' => '0');
+	    my %display=('0_deadline' => 'Deadline');
+	    my %type=   ('0_deadline' => 'date_end');
+            my %default=('0_deadline' => time);
             my %metadata=&Apache::lonmeta::unpackagemeta(
 &Apache::lonnet::getfile('/home/httpd/html/'.$bighash{'src_'.$rid}.'.meta'),1);
             map {
                 if ($_=~/^parameter\_(\d+)\_(\w+)$/) {
-		    $part[$#part+1]=$1;
-                    $name[$#name+1]=$2;
-                    ($type[$#type+1],$display[$#display+1])=
+                    my $hashid=$1.'_'.$2;
+		    $part{$hashid}=$1;
+                    $name{$hashid}=$2;
+                    my $tdef;
+                    ($tdef,$display{$hashid})=
 			split(/\_\_dis\_\_/,$metadata{$_});
-                    unless ($display[$#display]) {
-                        $display[$#display]=$name[$#name];
+		    ($type{$hashid},$default{$hashid})=split(/\:/,$tdef);
+                    unless ($display{$hashid}) {
+                        $display{$hashid}=$name{$hashid};
                     }
                 }
                 if ($_ eq 'title') {
 		    $thistitle=$metadata{$_};
                 }
             } keys %metadata;
-            my $totalparms=$#name+1;
+	    my $totalparms=scalar keys %name;
             $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>');
-            my $i;
-            for ($i=0;$i<$totalparms;$i++) {
-               $r->print("<td>$part[$i]</td><td>$display[$i]</td>");
-               my $j;
-               for ($j=1;$j<=7;$j++) {
-		   $r->print('<td>'.&plink($type[$i],$display[$i],$outpar[$j]).'</td>');}
+            $r->print('<td rowspan='.$totalparms.'>'.$typep{$rid}.'</td>');
+            $r->print('<td rowspan='.$totalparms.'><tt><font size=-1>'.
+		      join(' / ',split(/\//,$mapp{$rid})).'</font></tt></td>');
+            map {
+
+	       my $result=&parmval($part{$_}.'.'.$name{$_},$rid,$default{$_});
+
+               $r->print("<td>$part{$_}</td><td>$display{$_}</td>"); 
+
+               $r->print('<td>'.&valout($outpar[11],$type{$_}).'</td>');
+               $r->print('<td>'.&valout($outpar[10],$type{$_}).'</td>');
+               $r->print('<td>'.
+                  &plink($type{$_},$display{$_},$outpar[9]).'</td>');
+               $r->print('<td>'.
+                  &plink($type{$_},$display{$_},$outpar[8]).'</td>');
+               $r->print('<td>'.
+                  &plink($type{$_},$display{$_},$outpar[7]).'</td>');
+               if ($csec) {
+                 $r->print('<td>'.
+                  &plink($type{$_},$display{$_},$outpar[6]).'</td>');
+                 $r->print('<td>'.
+                  &plink($type{$_},$display{$_},$outpar[5]).'</td>');
+                 $r->print('<td>'.
+                  &plink($type{$_},$display{$_},$outpar[4]).'</td>');
+               }
+               if ($uname) {
+                 $r->print('<td>'.
+                  &plink($type{$_},$display{$_},$outpar[3]).'</td>');
+                 $r->print('<td>'.
+                  &plink($type{$_},$display{$_},$outpar[2]).'</td>');
+                 $r->print('<td>'.
+                  &plink($type{$_},$display{$_},$outpar[1]).'</td>');
+               }
+               $r->print('<td>'.&valout($outpar[$result],$type{$_}).'</td>');
                $r->print("</tr>\n<tr>");
-	   }
+	   } sort keys %name;
 # -------------------------------------------------- End entry for one resource
 	 } @ids;
          $r->print('</table></form></body></html>');
@@ -323,7 +419,4 @@ __END__
 
 
 
-
-
-