--- loncom/interface/lonparmset.pm	2005/02/02 19:23:59	1.181
+++ loncom/interface/lonparmset.pm	2005/06/04 15:26:13	1.207
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.181 2005/02/02 19:23:59 albertel Exp $
+# $Id: lonparmset.pm,v 1.207 2005/06/04 15:26:13 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,24 +62,16 @@ use GDBM_File;
 use Apache::lonhomework;
 use Apache::lonxml;
 use Apache::lonlocal;
+use Apache::lonnavmaps;
 
-my %courseopt;
-my %useropt;
+# --- Caches local to lonparmset
+
+my $parmhashid;
 my %parmhash;
+my $symbsid;
+my %symbs;
 
-my @ids;
-my %symbp;
-my %mapp;
-my %typep;
-my %keyp;
-
-my %maptitles;
-
-my $uname;
-my $udom;
-my $uhome;
-my $csec;
-my $coursename;
+# --- end local caches
 
 ##################################################
 ##################################################
@@ -96,10 +88,10 @@ Inputs:  $what - a parameter spec (inclu
 
 Returns:  A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 11 possible levels
 
-11- resource default
-10- map default
-9 - General Course
-8 - Map or Folder level in course
+11 - General Course
+10 - Map or Folder level in course
+9- resource default
+8- map default
 7 - resource level in course
 6 - General for section
 5 - Map or Folder level for section
@@ -111,87 +103,258 @@ Returns:  A list, the first item is the
 =cut
 
 ##################################################
-##################################################
 sub parmval {
-    my ($what,$id,$def)=@_;
+    my ($what,$id,$def,$uname,$udom,$csec)=@_;
+    return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec);
+}
+
+sub parmval_by_symb {
+    my ($what,$symb,$def,$uname,$udom,$csec)=@_;
+# load caches
+
+    &cacheparmhash();
+
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
+    my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+
+
     my $result='';
     my @outpar=();
 # ----------------------------------------------------- Cascading lookup scheme
+    my $map=(&Apache::lonnet::decode_symb($symb))[0];    
 
-    my $symbparm=$symbp{$id}.'.'.$what;
-    my $mapparm=$mapp{$id}.'___(all).'.$what;
-
-    my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$what;
-    my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;
-    my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;
+    my $symbparm=$symb.'.'.$what;
+    my $mapparm=$map.'___(all).'.$what;
 
-    my $courselevel=$ENV{'request.course.id'}.'.'.$what;
-    my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
-    my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;
+    my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$what;
+    my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
+    my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;
 
-# -------------------------------------------------------- first, check default
+    my $courselevel=$env{'request.course.id'}.'.'.$what;
+    my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;
+    my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
 
-    if (defined($def)) { $outpar[11]=$def; $result=11; }
 
-# ----------------------------------------------------- second, check map parms
 
-    my $thisparm=$parmhash{$symbparm};
-    if (defined($thisparm)) { $outpar[10]=$thisparm; $result=10; }
-
-# --------------------------------------------------------- third, check course
+# --------------------------------------------------------- first, check course
 
-    if (defined($courseopt{$courselevel})) {
-	$outpar[9]=$courseopt{$courselevel};
-	$result=9;
+    if (defined($$courseopt{$courselevel})) {
+	$outpar[11]=$$courseopt{$courselevel};
+	$result=11;
     }
 
-    if (defined($courseopt{$courselevelm})) {
-	$outpar[8]=$courseopt{$courselevelm};
-	$result=8;
+    if (defined($$courseopt{$courselevelm})) {
+	$outpar[10]=$$courseopt{$courselevelm};
+	$result=10;
     }
 
-    if (defined($courseopt{$courselevelr})) {
-	$outpar[7]=$courseopt{$courselevelr};
+# ------------------------------------------------------- second, check default
+
+    if (defined($def)) { $outpar[9]=$def; $result=9; }
+
+# ------------------------------------------------------ third, check map parms
+
+    my $thisparm=$parmhash{$symbparm};
+    if (defined($thisparm)) { $outpar[8]=$thisparm; $result=8; }
+
+    if (defined($$courseopt{$courselevelr})) {
+	$outpar[7]=$$courseopt{$courselevelr};
 	$result=7;
     }
 
+# ------------------------------------------------------ fourth, back to course
     if (defined($csec)) {
-        if (defined($courseopt{$seclevel})) {
-	    $outpar[6]=$courseopt{$seclevel};
+        if (defined($$courseopt{$seclevel})) {
+	    $outpar[6]=$$courseopt{$seclevel};
 	    $result=6;
 	}
-        if (defined($courseopt{$seclevelm})) {
-	    $outpar[5]=$courseopt{$seclevelm};
+        if (defined($$courseopt{$seclevelm})) {
+	    $outpar[5]=$$courseopt{$seclevelm};
 	    $result=5;
 	}
 
-        if (defined($courseopt{$seclevelr})) {
-	    $outpar[4]=$courseopt{$seclevelr};
+        if (defined($$courseopt{$seclevelr})) {
+	    $outpar[4]=$$courseopt{$seclevelr};
 	    $result=4;
 	}
     }
 
-# ---------------------------------------------------------- fourth, check user
+# ---------------------------------------------------------- fifth, check user
 
     if (defined($uname)) {
-	if (defined($useropt{$courselevel})) {
-	    $outpar[3]=$useropt{$courselevel};
+	if (defined($$useropt{$courselevel})) {
+	    $outpar[3]=$$useropt{$courselevel};
 	    $result=3;
 	}
 
-	if (defined($useropt{$courselevelm})) {
-	    $outpar[2]=$useropt{$courselevelm};
+	if (defined($$useropt{$courselevelm})) {
+	    $outpar[2]=$$useropt{$courselevelm};
 	    $result=2;
 	}
 
-	if (defined($useropt{$courselevelr})) {
-	    $outpar[1]=$useropt{$courselevelr};
+	if (defined($$useropt{$courselevelr})) {
+	    $outpar[1]=$$useropt{$courselevelr};
 	    $result=1;
 	}
     }
     return ($result,@outpar);
 }
 
+sub resetparmhash {
+    $parmhashid='';
+}
+
+sub cacheparmhash {
+    if ($parmhashid eq  $env{'request.course.fn'}) { return; }
+    my %parmhashfile;
+    if (tie(%parmhashfile,'GDBM_File',
+	      $env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640)) {
+	%parmhash=%parmhashfile;
+	untie %parmhashfile;
+	$parmhashid=$env{'request.course.fn'};
+    }
+}
+
+sub resetsymbcache {
+    $symbsid='';
+}
+
+sub symbcache {
+    my $id=shift;
+    if ($symbsid ne $env{'request.course.id'}) {
+	%symbs=();
+    }
+    unless ($symbs{$id}) {
+	my $navmap = Apache::lonnavmaps::navmap->new();
+	if ($id=~/\./) {
+	    my $resource=$navmap->getById($id);
+	    $symbs{$id}=$resource->symb();
+	} else {
+	    my $resource=$navmap->getByMapPc($id);
+	    $symbs{$id}=&Apache::lonnet::declutter($resource->src());
+	}
+	$symbsid=$env{'request.course.id'};
+    }
+    return $symbs{$id};
+}
+
+##################################################
+##################################################
+#
+# Store a parameter by ID
+#
+# Takes
+# - resource id
+# - name of parameter
+# - level
+# - new value
+# - new type
+# - username
+# - userdomain
+
+sub storeparm {
+    my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
+    &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
+}
+
+#
+# Store a parameter by symb
+#
+# Takes
+# - symb
+# - name of parameter
+# - level
+# - new value
+# - new type
+# - username
+# - userdomain
+
+sub storeparm_by_symb {
+# ---------------------------------------------------------- Get symb, map, etc
+    my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
+# ---------------------------------------------------------- Construct prefixes
+    $spnam=~s/\_([^\_]+)$/\.$1/;
+    my $map=(&Apache::lonnet::decode_symb($symb))[0];    
+    my $symbparm=$symb.'.'.$spnam;
+    my $mapparm=$map.'___(all).'.$spnam;
+
+    my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$spnam;
+    my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
+    my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;
+    
+    my $courselevel=$env{'request.course.id'}.'.'.$spnam;
+    my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;
+    my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
+    
+    my $storeunder='';
+    if (($snum==11) || ($snum==3)) { $storeunder=$courselevel; }
+    if (($snum==10) || ($snum==2)) { $storeunder=$courselevelm; }
+    if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }
+    if ($snum==6) { $storeunder=$seclevel; }
+    if ($snum==5) { $storeunder=$seclevelm; }
+    if ($snum==4) { $storeunder=$seclevelr; }
+    
+    my $delete;
+    if ($nval eq '') { $delete=1;}
+    my %storecontent = ($storeunder         => $nval,
+			$storeunder.'.type' => $ntype);
+    my $reply='';
+    if ($snum>3) {
+# ---------------------------------------------------------------- Store Course
+#
+	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+# Expire sheets
+	&Apache::lonnet::expirespread('','','studentcalc');
+	if (($snum==7) || ($snum==4)) {
+	    &Apache::lonnet::expirespread('','','assesscalc',$symb);
+	} elsif (($snum==8) || ($snum==5)) {
+	    &Apache::lonnet::expirespread('','','assesscalc',$map);
+	} else {
+	    &Apache::lonnet::expirespread('','','assesscalc');
+	}
+# Store parameter
+	if ($delete) {
+	    $reply=&Apache::lonnet::del
+		('resourcedata',[keys(%storecontent)],$cdom,$cnum);
+	} else {
+	    $reply=&Apache::lonnet::cput
+		('resourcedata',\%storecontent,$cdom,$cnum);
+	}
+	&Apache::lonnet::devalidatecourseresdata($cnum,$cdom);
+    } else {
+# ------------------------------------------------------------------ Store User
+#
+# Expire sheets
+	&Apache::lonnet::expirespread($uname,$udom,'studentcalc');
+	if ($snum==1) {
+	    &Apache::lonnet::expirespread
+		($uname,$udom,'assesscalc',$symb);
+	} elsif ($snum==2) {
+	    &Apache::lonnet::expirespread
+		($uname,$udom,'assesscalc',$map);
+	} else {
+	    &Apache::lonnet::expirespread($uname,$udom,'assesscalc');
+	}
+# Store parameter
+	if ($delete) {
+	    $reply=&Apache::lonnet::del
+		('resourcedata',[keys(%storecontent)],$udom,$uname);
+	} else {
+	    $reply=&Apache::lonnet::cput
+		('resourcedata',\%storecontent,$udom,$uname);
+	}
+	&Apache::lonnet::devalidateuserresdata($uname,$udom);
+    }
+    
+    if ($reply=~/^error\:(.*)/) {
+	return "<font color=red>Write Error: $1</font>";
+    }
+    return '';
+}
+
 ##################################################
 ##################################################
 
@@ -272,9 +435,9 @@ sub plink {
     my $winvalue=$value;
     unless ($winvalue) {
 	if ($type=~/^date/) {
-            $winvalue=$ENV{'form.recent_'.$type};
+            $winvalue=$env{'form.recent_'.$type};
         } else {
-            $winvalue=$ENV{'form.recent_'.(split(/\_/,$type))[0]};
+            $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
         }
     }
     return 
@@ -283,34 +446,26 @@ sub plink {
 		&valout($value,$type).'</a><a name="'.$marker.'"></a>';
 }
 
-
 sub startpage {
-    my ($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader)=@_;
+    my ($r,$id,$udom,$csec,$uname,$have_assessments)=@_;
 
     my $bodytag=&Apache::loncommon::bodytag('Set/Modify Course Parameters','',
                                             'onUnload="pclose()"');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Table Mode Parameter Setting');
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
         &Apache::loncommon::selectstudent_link('parmform','uname','udom');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my %lt=&Apache::lonlocal::texthash(
-		    'cep'   => "Course Environment Parameters",
-		    'scep'  => "Set Course Environment Parameters",
-		    'smcap' => "Set/Modify Course Assessment Parameter",
-		    'mcap'  => "Modify Course Assessment Parameters",
-		    'caphm' => "Course Assessment Parameter - Helper Mode",
-		    'capom' => "Course Assessment Parameters - Overview Mode",
                     'captm' => "Course Assessments Parameters - Table Mode",
 		    'sg'    => "Section/Group",
 		    'fu'    => "For User",
 		    'oi'    => "or ID",
 		    'ad'    => "at Domain"
 				       );
-    my $overallhelp=
-	&Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');
-    my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEAD);
-<html>
+$html
 <head>
 <title>LON-CAPA Course Parameters</title>
 <script>
@@ -357,45 +512,37 @@ sub startpage {
 $selscript
 </head>
 $bodytag
-$overallhelp
+$breadcrumbs
 ENDHEAD
-
-    unless ($trimheader) {$r->print(<<ENDHEAD2);
-<form method="post" action="/adm/parmset" name="envform">
-<h4>$lt{'cep'}</h4>
-<input type="submit" name="crsenv" value="$lt{'scep'}" />
-</form>
-<hr />
-$assessparmhelp
-<form method="post" action="/adm/helper/parameter.helper" name="helpform">
-<h4>$lt{'caphm'}</h4>
-<input type="submit" value="$lt{'smcap'}" />
-</form>
-<hr />
-<form method="post" action="/adm/parmset" name="overview">
-<h4>$lt{'capom'}</h4>
-<input type="submit" name="overview" value="$lt{'mcap'}" />
-</form>
-<hr />
-ENDHEAD2
-}
-    $r->print(<<ENDHEAD3);
-<form method="post" action="/adm/parmset" name="parmform">
+    my %sectionhash=();
+    my $sections='';
+    if (&Apache::loncommon::get_sections(
+                 $env{'course.'.$env{'request.course.id'}.'.domain'},
+                 $env{'course.'.$env{'request.course.id'}.'.num'},
+					 \%sectionhash)) {
+        $sections=$lt{'sg'}.': <select name="csec">';
+	foreach ('',sort keys %sectionhash) {
+	    $sections.='<option value="'.$_.'"'.
+		($_ eq $csec?'selected="selected"':'').'>'.$_.'</option>';
+        }
+        $sections.='</select>';
+     }
+     $r->print(<<ENDHEAD3);
+<form method="post" action="/adm/parmset?action=settable" name="parmform">
 <h4>$lt{'captm'}</h4>
 ENDHEAD3
 
-    if (!$have_assesments) {
-	$r->print('<font color="red">'.&mt('There are no assesment parameters in this course to set.').'</font><br />');	
+    if (!$have_assessments) {
+	$r->print('<font color="red">'.&mt('There are no assessment parameters in this course to set.').'</font><br />');	
     } else {
 	$r->print(<<ENDHEAD);
 <b>
-$lt{'sg'}:
-<input type="text" value="$csec" size="6" name="csec">
-<br>
+$sections
+<br />
 $lt{'fu'} 
-<input type="text" value="$uname" size="12" name="uname">
+<input type="text" value="$uname" size="12" name="uname" />
 $lt{'oi'}
-<input type="text" value="$id" size="12" name="id"> 
+<input type="text" value="$id" size="12" name="id" /> 
 $lt{'ad'}
 $chooseopt
 </b>
@@ -407,30 +554,29 @@ ENDHEAD
 }
 
 sub print_row {
-    my ($r,$which,$part,$name,$rid,$default,$defaulttype,$display,$defbgone,
-	$defbgtwo,$parmlev)=@_;
+    my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
+	$defbgtwo,$parmlev,$uname,$udom,$csec)=@_;
 # get the values for the parameter in cascading order
 # empty levels will remain empty
     my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which},
-				  $rid,$$default{$which});
+				  $rid,$$default{$which},$uname,$udom,$csec);
 # get the type for the parameters
 # problem: these may not be set for all levels
     my ($typeresult,@typeoutpar)=&parmval($$part{$which}.'.'.
                                           $$name{$which}.'.type',
-				  $rid,$$defaulttype{$which});
+				  $rid,$$defaulttype{$which},$uname,$udom,$csec);
 # cascade down manually
-    my $cascadetype=$defaulttype;
-    for (my $i=$#typeoutpar;$i>0;$i--) {
+    my $cascadetype=$$defaulttype{$which};
+    for (my $i=11;$i>0;$i--) {
 	 if ($typeoutpar[$i]) { 
             $cascadetype=$typeoutpar[$i];
 	} else {
             $typeoutpar[$i]=$cascadetype;
         }
     }
- 
     my $parm=$$display{$which};
 
-    if ($parmlev eq 'full' || $parmlev eq 'brief') {
+    if ($parmlev eq 'full') {
         $r->print('<td bgcolor='.$defbgtwo.' align="center">'
                   .$$part{$which}.'</td>');
     } else {    
@@ -450,7 +596,7 @@ sub print_row {
         } elsif ($csec) {
             &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
         } else {
-            &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
+            &print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
         }
     } elsif ($parmlev eq 'map') {
 
@@ -459,53 +605,36 @@ sub print_row {
         } elsif ($csec) {
             &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         } else {
-            &print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         }
     } else {
 
-        &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+        &print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
 
-        if ($parmlev eq 'brief') {
-
-           &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-
-           if ($csec) {
-               &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-           if ($uname) {
-               &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-        } else {
-
-           &print_td($r,10,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           &print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,9,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,8,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	
+	if ($csec) {
+	    &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	}
+	if ($uname) {
+	    &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	}
 
-           if ($csec) {
-               &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-           if ($uname) {
-               &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-        } # end of $brief if/else
     } # end of $parmlev if/else
 
     $r->print('<td bgcolor=#CCCCFF align="center">'.
                   &valout($outpar[$result],$typeoutpar[$result]).'</td>');
 
-    if ($parmlev eq 'full' || $parmlev eq 'brief') {
+    if ($parmlev eq 'full') {
         my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
-                                        '.'.$$name{$which},$symbp{$rid});
-
-# this doesn't seem to work, and I don't think is correct
-#    my $sessionvaltype=&Apache::lonnet::EXT('resource.'.$$part{$which}.
-#                                      '.'.$$name{$which}.'.type',$symbp{$rid});
-# this seems to work
+                                        '.'.$$name{$which},$$symbp{$rid});
         my $sessionvaltype=$typeoutpar[$result];
         if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
         $r->print('<td bgcolor=#999999 align="center"><font color=#FFFFFF>'.
@@ -520,7 +649,7 @@ sub print_td {
     my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
     $r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).
               ' align="center">');
-    if ($which<10) {
+    if ($which<8 || $which > 9) {
 	$r->print(&plink($$typeoutpar[$which],
 			 $$display{$value},$$outpar[$which],
 			 $mprefix."$which",'parmform.pres','psub'));
@@ -530,6 +659,7 @@ sub print_td {
     $r->print('</td>'."\n");
 }
 
+
 =pod
 
 =item B<extractResourceInformation>: Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
@@ -565,7 +695,6 @@ Input: See list below:
 =cut
 
 sub extractResourceInformation {
-    my $bighash = shift;
     my $ids = shift;
     my $typep = shift;
     my $keyp = shift;
@@ -578,63 +707,62 @@ sub extractResourceInformation {
     my $mapp = shift;
     my $symbp = shift;
     my $maptitles=shift;
+    my $uris=shift;
 
-    foreach (keys %$bighash) {
-	if ($_=~/^src\_(\d+)\.(\d+)$/) {
-	    # there are no resources in the 0 level
-	    if ($1 eq '0') { next; }
-	    my $mapid=$1;
-	    my $resid=$2;
-	    my $id=$mapid.'.'.$resid;
-	    my $srcf=$$bighash{$_};
-	    if (1) {
-		$srcf=~/\.(\w+)$/;
-		$$ids[$#$ids+1]=$id;
-		$$typep{$id}=$1;
-		$$keyp{$id}='';
-		foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
-		  if ($_=~/^parameter\_(.*)/) {
-                    my $key=$_;
-                    my $allkey=$1;
-                    $allkey=~s/\_/\./g;
-		    if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 
-			'parm') {
-			next; #hide hidden things
-		    }
-                    my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
-                    my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
-                    my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
-                    my $parmdis = $display;
-                    $parmdis =~ s|(\[Part.*$)||g;
-                    my $partkey = $part;
-                    $partkey =~ tr|_|.|;
-                    $$allparms{$name} = $parmdis;
-                    $$allparts{$part} = "[Part $part]";
-                    $$allkeys{$allkey}=$display;
-                    if ($allkey eq $fcat) {
-		        $$defp{$id}= &Apache::lonnet::metadata($srcf,$key);
-		    }
-		    if ($$keyp{$id}) {
-		        $$keyp{$id}.=','.$key;
-		    } else {
-		        $$keyp{$id}=$key;
-		    }
-		  }
+
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my @allres=$navmap->retrieveResources(undef,undef,1,undef,1);
+    foreach my $resource (@allres) {
+	my $id=$resource->id();
+        my ($mapid,$resid)=split(/\./,$id);
+	if ($mapid eq '0') { next; }
+	$$ids[$#$ids+1]=$id;
+	my $srcf=$resource->src();
+	$srcf=~/\.(\w+)$/;
+	$$typep{$id}=$1;
+	$$keyp{$id}='';
+        $$uris{$id}=$srcf;
+	foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
+	    if ($_=~/^parameter\_(.*)/) {
+		my $key=$_;
+		my $allkey=$1;
+		$allkey=~s/\_/\./g;
+		if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 
+		    'parm') {
+		    next; #hide hidden things
 		}
-		$$mapp{$id}=
-		    &Apache::lonnet::declutter($$bighash{'map_id_'.$mapid});
-                $$mapp{$mapid}=$$mapp{$id};
-		$$allmaps{$mapid}=$$mapp{$id};
-		if ($mapid eq '1') {
-		    $$maptitles{$mapid}='Main Course Documents';
+		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
+		my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
+		my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
+		my $parmdis = $display;
+		$parmdis =~ s|(\[Part.*)$||g;
+		my $partkey = $part;
+		$partkey =~ tr|_|.|;
+		$$allparms{$name} = $parmdis;
+		$$allparts{$part} = "[Part $part]";
+		$$allkeys{$allkey}=$display;
+		if ($allkey eq $fcat) {
+		    $$defp{$id}= &Apache::lonnet::metadata($srcf,$key);
+		}
+		if ($$keyp{$id}) {
+		    $$keyp{$id}.=','.$key;
 		} else {
-		    $$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));
+		    $$keyp{$id}=$key;
 		}
-		$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
-		$$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
-                $$symbp{$mapid}=$$mapp{$id}.'___(all)';
 	    }
 	}
+	$$mapp{$id}=
+	    &Apache::lonnet::declutter($resource->enclosing_map_src());
+	$$mapp{$mapid}=$$mapp{$id};
+	$$allmaps{$mapid}=$$mapp{$id};
+	if ($mapid eq '1') {
+	    $$maptitles{$mapid}='Main Course Documents';
+	} else {
+	    $$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));
+	}
+	$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
+	$$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
+	$$symbp{$mapid}=$$mapp{$id}.'___(all)';
     }
 }
 
@@ -671,13 +799,28 @@ Variables used (guessed by Jeremy):
 sub assessparms {
 
     my $r=shift;
+
+    my @ids=();
+    my %symbp=();
+    my %mapp=();
+    my %typep=();
+    my %keyp=();
+    my %uris=();
+    my %maptitles=();
+
 # -------------------------------------------------------- Variable declaration
     my %allkeys=();
     my %allmaps=();
     my %alllevs=();
 
+    my $uname;
+    my $udom;
+    my $uhome;
+    my $csec;
+ 
+    my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
+
     $alllevs{'Resource Level'}='full';
-#    $alllevs{'Resource Level [BRIEF]'}='brief';
     $alllevs{'Map Level'}='map';
     $alllevs{'Course Level'}='general';
 
@@ -685,9 +828,6 @@ sub assessparms {
     my %allparts;
 
     my %defp;
-    %courseopt=();
-    %useropt=();
-    my %bighash=();
 
     @ids=();
     %symbp=();
@@ -695,57 +835,51 @@ sub assessparms {
 
     my $message='';
 
-    $csec=$ENV{'form.csec'};
-    if      ($udom=$ENV{'form.udom'}) {
-    } elsif ($udom=$ENV{'request.role.domain'}) {
-    } elsif ($udom=$ENV{'user.domain'}) {
+    $csec=$env{'form.csec'};
+
+    if      ($udom=$env{'form.udom'}) {
+    } elsif ($udom=$env{'request.role.domain'}) {
+    } elsif ($udom=$env{'user.domain'}) {
     } else {
 	$udom=$r->dir_config('lonDefDomain');
     }
 
     my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
-    my $pschp=$ENV{'form.pschp'};
+    my $pschp=$env{'form.pschp'};
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
     if (!@psprt) { $psprt[0]='0'; }
-    my $showoptions=$ENV{'form.showoptions'};
+    my $showoptions=$env{'form.showoptions'};
 
     my $pssymb='';
     my $parmlev='';
-    my $trimheader='';
-    my $prevvisit=$ENV{'form.prevvisit'};
-
-#    unless ($parmlev==$ENV{'form.parmlev'}) {
-#        $parmlev = 'full';
-#    }
+    my $prevvisit=$env{'form.prevvisit'};
  
-    unless ($ENV{'form.parmlev'}) {
+    unless ($env{'form.parmlev'}) {
         $parmlev = 'map';
     } else {
-        $parmlev = $ENV{'form.parmlev'};
+        $parmlev = $env{'form.parmlev'};
     }
 
 # ----------------------------------------------- Was this started from grades?
 
-    if (($ENV{'form.command'} eq 'set') && ($ENV{'form.url'})
-	&& (!$ENV{'form.dis'})) {
-	my $url=$ENV{'form.url'};
+    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);
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
-        $trimheader='yes';
-    } elsif ($ENV{'form.symb'}) {
-	$pssymb=$ENV{'form.symb'};
+    } elsif ($env{'form.symb'}) {
+	$pssymb=$env{'form.symb'};
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
-        $trimheader='yes';
     } else {
-	$ENV{'form.url'}='';
+	$env{'form.url'}='';
     }
 
-    my $id=$ENV{'form.id'};
+    my $id=$env{'form.id'};
     if (($id) && ($udom)) {
 	$uname=(&Apache::lonnet::idget($udom,$id))[1];
 	if ($uname) {
@@ -756,7 +890,7 @@ sub assessparms {
 		&mt('at domain')." '$udom'</font>";
 	}
     } else {
-	$uname=$ENV{'form.uname'};
+	$uname=$env{'form.uname'};
     }
     unless ($udom) { $uname=''; }
     $uhome='';
@@ -769,13 +903,13 @@ sub assessparms {
 	    $uname='';
         } else {
 	    $csec=&Apache::lonnet::getsection($udom,$uname,
-					      $ENV{'request.course.id'});
+					      $env{'request.course.id'});
 	    if ($csec eq '-1') {
 		$message="<font color=red>".
 		    &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
 		    &mt("not in this course")."</font>";
 		$uname='';
-		$csec=$ENV{'form.csec'};
+		$csec=$env{'form.csec'};
 	    } else {
 		my %name=&Apache::lonnet::userenvironment($udom,$uname,
 		      ('firstname','middlename','lastname','generation','id'));
@@ -789,135 +923,38 @@ sub assessparms {
 
     unless ($csec) { $csec=''; }
 
-    my $fcat=$ENV{'form.fcat'};
+    my $fcat=$env{'form.fcat'};
     unless ($fcat) { $fcat=''; }
 
-# ------------------------------------------------------------------- Tie hashs
-    if (!(tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-	      &GDBM_READER(),0640))) {
-	$r->print("Unable to access course data. (File $ENV{'request.course.fn'}.db not tieable)");
-	return ;
-    }
-    if (!(tie(%parmhash,'GDBM_File',
-	      $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640))) {
-	$r->print("Unable to access parameter data. (File $ENV{'request.course.fn'}_parms.db not tieable)");
-	return ;
-    }
-
 # --------------------------------------------------------- Get all assessments
-    extractResourceInformation(\%bighash, \@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allkeys, \%allmaps, $fcat, \%defp, \%mapp, \%symbp,\%maptitles);
+    &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allkeys, \%allmaps, $fcat, \%defp, \%mapp, \%symbp,\%maptitles,\%uris);
 
     $mapp{'0.0'} = '';
     $symbp{'0.0'} = '';
 
 # ---------------------------------------------------------- Anything to store?
-    if ($ENV{'form.pres_marker'}) {
-	my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'});
-	$spnam=~s/\_([^\_]+)$/\.$1/;
-# ---------------------------------------------------------- Construct prefixes
-
-	my $symbparm=$symbp{$sresid}.'.'.$spnam;
-	my $mapparm=$mapp{$sresid}.'___(all).'.$spnam;
-	
-	my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$spnam;
-	my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;
-	my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;
-	
-	my $courselevel=$ENV{'request.course.id'}.'.'.$spnam;
-	my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
-	my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;
-	
-	my $storeunder='';
-	if (($snum==9) || ($snum==3)) { $storeunder=$courselevel; }
-	if (($snum==8) || ($snum==2)) { $storeunder=$courselevelm; }
-	if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }
-	if ($snum==6) { $storeunder=$seclevel; }
-	if ($snum==5) { $storeunder=$seclevelm; }
-	if ($snum==4) { $storeunder=$seclevelr; }
-	
-	my $delete;
-	if ($ENV{'form.pres_value'} eq '') { $delete=1;}
-        my %storecontent = ($storeunder         => $ENV{'form.pres_value'},
-                            $storeunder.'.type' => $ENV{'form.pres_type'});
-	my $reply='';
-	if ($snum>3) {
-# ---------------------------------------------------------------- Store Course
-#
-# Expire sheets
-	    &Apache::lonnet::expirespread('','','studentcalc');
-	    if (($snum==7) || ($snum==4)) {
-		&Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});
-	    } elsif (($snum==8) || ($snum==5)) {
-		&Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});
-	    } else {
-		&Apache::lonnet::expirespread('','','assesscalc');
-	    }
-# Store parameter
-	    if ($delete) {
-		$reply=&Apache::lonnet::del
-		    ('resourcedata',[keys(%storecontent)],
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-	    } else {
-		$reply=&Apache::lonnet::cput
-		    ('resourcedata',\%storecontent,
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-	    }
-	} else {
-# ------------------------------------------------------------------ Store User
-#
-# Expire sheets
-	    &Apache::lonnet::expirespread($uname,$udom,'studentcalc');
-	    if ($snum==1) {
-		&Apache::lonnet::expirespread
-		    ($uname,$udom,'assesscalc',$symbp{$sresid});
-	    } elsif ($snum==2) {
-		&Apache::lonnet::expirespread
-		    ($uname,$udom,'assesscalc',$mapp{$sresid});
-	    } else {
-		&Apache::lonnet::expirespread($uname,$udom,'assesscalc');
-	    }
-# Store parameter
-	    if ($delete) {
-		$reply=&Apache::lonnet::del
-		    ('resourcedata',[keys(%storecontent)],$udom,$uname);
-	    } else {
-		$reply=&Apache::lonnet::cput
-		    ('resourcedata',\%storecontent,$udom,$uname);
-	    }
-	}
-
-	if ($reply=~/^error\:(.*)/) {
-	    $message.="<font color=red>Write Error: $1</font>";
+    if ($env{'form.pres_marker'}) {
+        my @markers=split(/\&\&\&/,$env{'form.pres_marker'});
+        my @values=split(/\&\&\&/,$env{'form.pres_value'});
+        my @types=split(/\&\&\&/,$env{'form.pres_type'});
+	for (my $i=0;$i<=$#markers;$i++) {
+	    $message.=&storeparm(split(/\&/,$markers[$i]),
+				 $values[$i],
+				 $types[$i],
+				 $uname,$udom,$csec);
 	}
 # ---------------------------------------------------------------- Done storing
 	$message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';
     }
-# --------------------------------------------- Devalidate cache for this child
-    &Apache::lonnet::devalidatecourseresdata(
-                 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
-                 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'});
-    &Apache::lonnet::clear_EXT_cache_status();
-# -------------------------------------------------------------- Get coursedata
-    %courseopt = &Apache::lonnet::dump
-        ('resourcedata',
-         $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-         $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-# --------------------------------------------------- Get userdata (if present)
-    if ($uname) {
-        %useropt=&Apache::lonnet::dump('resourcedata',$udom,$uname);
-    }
-
 # ------------------------------------------------------------------- Sort this
 
     @ids=sort  {
 	if ($fcat eq '') {
 	    $a<=>$b;
 	} else {
-	    my ($result,@outpar)=&parmval($fcat,$a,$defp{$a});
+	    my ($result,@outpar)=&parmval($fcat,$a,$defp{$a},$uname,$udom,$csec);
 	    my $aparm=$outpar[$result];
-	    ($result,@outpar)=&parmval($fcat,$b,$defp{$b});
+	    ($result,@outpar)=&parmval($fcat,$b,$defp{$b},$uname,$udom,$csec);
 	    my $bparm=$outpar[$result];
 	    1*$aparm<=>1*$bparm;
 	}
@@ -927,26 +964,14 @@ sub assessparms {
     if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);}
 # ------------------------------------------------------------------ Start page
 
-    my $have_assesments=1;
-    if (scalar(keys(%allkeys)) eq 0) { $have_assesments=0; }
+    &startpage($r,$id,$udom,$csec,$uname,scalar(keys(%allkeys)));
 
-    &startpage($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader);
-
-    if (!$have_assesments) {
-	untie(%bighash);
-	untie(%parmhash);
-	return '';
-    }
-#    if ($ENV{'form.url'}) {
-#	$r->print('<input type="hidden" value="'.$ENV{'form.url'}.
-#		  '" name="url"><input type="hidden" name="command" value="set">');
-#    }
     $r->print('<input type="hidden" value="true" name="prevvisit">');
 
     foreach ('tolerance','date_default','date_start','date_end',
 	     'date_interval','int','float','string') {
 	$r->print('<input type="hidden" value="'.
-		  $ENV{'form.recent_'.$_}.'" name="recent_'.$_.'">');
+		  $env{'form.recent_'.$_}.'" name="recent_'.$_.'">');
     }
 
     $r->print('<h2>'.$message.'</h2><table>');
@@ -986,9 +1011,9 @@ sub assessparms {
         $r->print('<input type="hidden" value="'.$pssymb.'" name="symb">');
     }
 
-    $r->print('<tr><td colspan="3"><hr /><input type="checkbox"');
+    $r->print('<tr><td colspan="3"><hr /><label><input type="checkbox"');
     if ($showoptions eq 'show') {$r->print(" checked ");}
-    $r->print(' name="showoptions" value="show">'.&mt('Show More Options').'<hr /></td></tr>');
+    $r->print(' name="showoptions" value="show" />'.&mt('Show More Options').'</label><hr /></td></tr>');
 #    $r->print("<tr><td>Show: $showoptions</td></tr>");
 #    $r->print("<tr><td>pscat: @pscat</td></tr>");
 #    $r->print("<tr><td>psprt: @psprt</td></tr>");
@@ -1112,10 +1137,10 @@ sub assessparms {
     if (($prevvisit) || ($pschp) || ($pssymb)) {
 # ----------------------------------------------------------------- Start Table
         my @catmarker=map { tr|.|_|; 'parameter_'.$_; } @pscat;
-        my $csuname=$ENV{'user.name'};
-        my $csudom=$ENV{'user.domain'};
+        my $csuname=$env{'user.name'};
+        my $csudom=$env{'user.domain'};
 
-        if ($parmlev eq 'full' || $parmlev eq 'brief') {
+        if ($parmlev eq 'full') {
            my $coursespan=$csec?8:5;
            $r->print('<p><table border=2>');
            $r->print('<tr><td colspan=5></td>');
@@ -1144,8 +1169,9 @@ sub assessparms {
            $r->print(<<ENDTABLETWO);
 <th rowspan=3>$lt{'pie'}</th>
 <th rowspan=3>$lt{'csv'}<br>($csuname $lt{'at'} $csudom)</th>
-</tr><tr><td colspan=5></td><th colspan=2>$lt{'rl'}</th>
-<th colspan=3>$lt{'ic'}</th>
+</tr><tr><td colspan=5></td><th colspan=2>$lt{'ic'}</th><th colspan=2>$lt{'rl'}</th>
+<th colspan=1>$lt{'ic'}</th>
+
 ENDTABLETWO
            if ($csec) {
                 $r->print("<th colspan=3>".
@@ -1154,8 +1180,8 @@ ENDTABLETWO
            $r->print(<<ENDTABLEHEADFOUR);
 </tr><tr><th>$lt{'aut'}</th><th>$lt{'type'}</th>
 <th>$lt{'emof'}</th><th>$lt{'part'}</th><th>$lt{'pn'}</th>
-<th>$lt{'def'}</th><th>$lt{'femof'}</th>
-<th>$lt{'gen'}</th><th>$lt{'foremf'}</th><th>$lt{'fr'}</th>
+<th>$lt{'gen'}</th><th>$lt{'foremf'}</th>
+<th>$lt{'def'}</th><th>$lt{'femof'}</th><th>$lt{'fr'}</th>
 ENDTABLEHEADFOUR
 
            if ($csec) {
@@ -1181,15 +1207,15 @@ ENDTABLEHEADFOUR
 		    ||
 		    ($pssymb && $pssymb eq $symbp{$rid})) {
 # ------------------------------------------------------ Entry for one resource
-                    if ($defbgone eq '"E0E099"') {
-                        $defbgone='"E0E0DD"';
+                    if ($defbgone eq '"#E0E099"') {
+                        $defbgone='"#E0E0DD"';
                     } else {
-                        $defbgone='"E0E099"';
+                        $defbgone='"#E0E099"';
                     }
-                    if ($defbgtwo eq '"FFFF99"') {
-                        $defbgtwo='"FFFFDD"';
+                    if ($defbgtwo eq '"#FFFF99"') {
+                        $defbgtwo='"#FFFFDD"';
                     } else {
-                        $defbgtwo='"FFFF99"';
+                        $defbgtwo='"#FFFF99"';
                     }
                     my $thistitle='';
                     my %name=   ();
@@ -1198,7 +1224,7 @@ ENDTABLEHEADFOUR
                     my %display=();
                     my %type=   ();
                     my %default=();
-                    my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
+                    my $uri=&Apache::lonnet::declutter($uris{$rid});
 
                     foreach (split(/\,/,$keyp{$rid})) {
                         my $tempkeyp = $_;
@@ -1251,16 +1277,16 @@ ENDTABLEHEADFOUR
                                 undef $firstrow;
                             }
 
-                            &print_row($r,$_,\%part,\%name,$rid,\%default,
+                            &print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
-                                       $parmlev);
+                                       $parmlev,$uname,$udom,$csec);
                         }
                     }
                 }
             } # end foreach ids
 # -------------------------------------------------- End entry for one resource
             $r->print('</table>');
-        } # end of  brief/full
+        } # end of  full
 #--------------------------------------------------- Entry for parm level map
         if ($parmlev eq 'map') {
             my $defbgone = '"E0E099"';
@@ -1297,7 +1323,7 @@ ENDTABLEHEADFOUR
 #                  $r->print("$mapid:$map:   $rid <br /> \n");
 
                   if ($map eq $mapid) {
-                    my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
+                    my $uri=&Apache::lonnet::declutter($uris{$rid});
 #                    $r->print("Keys: $keyp{$rid} <br />\n");
 
 #--------------------------------------------------------------------
@@ -1359,9 +1385,9 @@ ENDMAPONE
 
 	        foreach (sort keys %name) {
                     $r->print('<tr>');
-                    &print_row($r,$_,\%part,\%name,$mapid,\%default,
+                    &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,
-                           $parmlev);
+                           $parmlev,$uname,$udom,$csec);
 #                    $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
                 }
                 $r->print("</table></center>");
@@ -1385,7 +1411,7 @@ ENDMAPONE
             foreach (@ids) {
                 my $rid = $_;
         
-                my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
+                my $uri=&Apache::lonnet::declutter($uris{$rid});
 
 #--------------------------------------------------------------------
 # @catmarker contains list of all possible parameters including part #s
@@ -1437,16 +1463,14 @@ ENDMAPONE
 
 	    foreach (sort keys %name) {
                 $r->print('<tr>');
-                &print_row($r,$_,\%part,\%name,$mapid,\%default,
-                       \%type,\%display,$defbgone,$defbgtwo,$parmlev);
+                &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
+                       \%type,\%display,$defbgone,$defbgtwo,$parmlev,$uname,$udom,$csec);
 #                    $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
             }
             $r->print("</table></center>");
         } # end of $parmlev eq general
     }
     $r->print('</form></body></html>');
-    untie(%bighash);
-    untie(%parmhash);
 } # end sub assessparms
 
 
@@ -1473,17 +1497,19 @@ sub crsenv {
     my $setoutput='';
     my $bodytag=&Apache::loncommon::bodytag(
                              'Set Course Environment Parameters');
-    my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-    my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,
+						    'Edit Course Environment');
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     #
     # Go through list of changes
-    foreach (keys %ENV) {
+    foreach (keys %env) {
         next if ($_!~/^form\.(.+)\_setparmval$/);
         my $name  = $1;
-        my $value = $ENV{'form.'.$name.'_value'};
+        my $value = $env{'form.'.$name.'_value'};
         if ($name eq 'newp') {
-            $name = $ENV{'form.newp_name'};
+            $name = $env{'form.newp_name'};
         }
         if ($name eq 'url') {
             $value=~s/^\/res\///;
@@ -1559,7 +1585,7 @@ sub crsenv {
     }
 # ------------------------- Re-init course environment entries for this session
 
-    &Apache::lonnet::coursedescription($ENV{'request.course.id'});
+    &Apache::lonnet::coursedescription($env{'request.course.id'});
 
 # -------------------------------------------------------- Get parameters again
 
@@ -1754,16 +1780,18 @@ sub crsenv {
     my $Value=&mt('Value');
     my $Set=&mt('Set');
     my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');
-    $r->print(<<ENDENV);
-<html>
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print(<<ENDenv);
+$html
+<head>
 <script type="text/javascript" language="Javascript" >
 $browse_js
 </script>
-<head>
 <title>LON-CAPA Course Environment</title>
 </head>
 $bodytag
-<form method="post" action="/adm/parmset" name="envform">
+$breadcrumbs
+<form method="post" action="/adm/parmset?action=crsenv" name="envform">
 $setoutput
 <p>
 <table border=2>
@@ -1774,10 +1802,11 @@ $output
 </form>
 </body>
 </html>    
-ENDENV
+ENDenv
 }
 ##################################################
-
+# Overview mode
+##################################################
 my $tableopen;
 
 sub tablestart {
@@ -1799,43 +1828,117 @@ sub tableend {
     }
 }
 
+sub readdata {
+    my ($crs,$dom)=@_;
+# Read coursedata
+    my $resourcedata=&Apache::lonnet::get_courseresdata($crs,$dom);
+# Read userdata
+
+    my $classlist=&Apache::loncoursedata::get_classlist();
+    foreach (keys %$classlist) {
+        # the following undefs are for 'domain', and 'username' respectively.
+        if ($_=~/^(\w+)\:(\w+)$/) {
+	    my ($tuname,$tudom)=($1,$2);
+	    my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
+            foreach my $userkey (keys %{$useropt}) {
+		if ($userkey=~/^$env{'request.course.id'}/) {
+                    my $newkey=$userkey;
+		    $newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
+		    $$resourcedata{$newkey}=$$useropt{$userkey};
+		}
+	    }
+	}
+    }
+    return $resourcedata;
+}
+
+sub extractuser {
+    my $key=shift;
+    return ($key=~/^$env{'request.course.id'}.\[useropt\:(\w+)\:(\w+)\]\./);
+}
+
 sub overview {
     my $r=shift;
     my $bodytag=&Apache::loncommon::bodytag(
                              'Set/Modify Course Assessment Parameters');
-    my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-    my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDOVER);
-<html>
+$html
 <head>
 <title>LON-CAPA Course Environment</title>
 </head>
 $bodytag
-<form method="post" action="/adm/parmset" name="overviewform">
+$breadcrumbs
+<form method="post" action="/adm/parmset?action=setoverview" name="overviewform">
 <input type="hidden" name="overview" value="1" />
 ENDOVER
 # Setting
-    my %olddata=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+# Set userlevel immediately
+# Do an intermediate store of course level
+    my $olddata=&readdata($crs,$dom);
     my %newdata=();
     undef %newdata;
     my @deldata=();
     undef @deldata;
-    foreach (keys %ENV) {
+    foreach (keys %env) {
 	if ($_=~/^form\.([a-z]+)\_(.+)$/) {
 	    my $cmd=$1;
 	    my $thiskey=$2;
+	    my ($tuname,$tudom)=&extractuser($thiskey);
+	    my $tkey=$thiskey;
+            if ($tuname) {
+		$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
+	    }
 	    if ($cmd eq 'set') {
-		my $data=$ENV{$_};
-		if ($olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
+		my $data=$env{$_};
+		if ($$olddata{$thiskey} ne $data) { 
+		    if ($tuname) {
+			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data},$tudom,$tuname) eq 'ok') {
+			    $r->print('<br />'.&mt('Stored modified parameter for').' '.
+				      &Apache::loncommon::plainname($tuname,$tudom));
+			} else {
+			    $r->print('<h2><font color="red">'.
+				      &mt('Error storing parameters').'</font></h2>');
+			}
+			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		    } else {
+			$newdata{$thiskey}=$data;
+                    } 
+		}
 	    } elsif ($cmd eq 'del') {
-		push (@deldata,$thiskey);
+		if ($tuname) {
+		    if (&Apache::lonnet::del('resourcedata',[$tkey],$tudom,$tuname) eq 'ok') {
+			$r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
+		    } else {
+			$r->print('<h2><font color="red">'.
+				  &mt('Error deleting parameters').'</font></h2>');
+		    }
+		    &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		} else {
+		    push (@deldata,$thiskey);
+		}
 	    } elsif ($cmd eq 'datepointer') {
-		my $data=&Apache::lonhtmlcommon::get_date_from_form($ENV{$_});
-		if (defined($data) and $olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
+		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
+		if (defined($data) and $$olddata{$thiskey} ne $data) { 
+		    if ($tuname) {
+			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data},$tudom,$tuname) eq 'ok') {
+			    $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
+			} else {
+			    $r->print('<h2><font color="red">'.
+				      &mt('Error storing parameters').'</font></h2>');
+			}
+			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		    } else {
+			$newdata{$thiskey}=$data; 
+		    }
+		}
 	    }
 	}
     }
-# Store
+# Store all course level
     my $delentries=$#deldata+1;
     my @newdatakeys=keys %newdata;
     my $putentries=$#newdatakeys+1;
@@ -1846,6 +1949,7 @@ ENDOVER
 	    $r->print('<h2><font color="red">'.
 		      &mt('Error deleting parameters').'</font></h2>');
 	}
+	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
     if ($putentries) {
 	if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
@@ -1854,25 +1958,36 @@ ENDOVER
 	    $r->print('<h2><font color="red">'.
 		      &mt('Error storing parameters').'</font></h2>');
 	}
+	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
-# Read and display
-    my %resourcedata=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+# Read modified data
+
+    my $resourcedata=&readdata($crs,$dom);
+
+# Start list output
+
     my $oldsection='';
     my $oldrealm='';
     my $oldpart='';
     my $pointer=0;
     $tableopen=0;
     my $foundkeys=0;
-    foreach my $thiskey (sort keys %resourcedata) {
-	if ($resourcedata{$thiskey.'.type'}) {
-	    my ($course,$middle,$part,$name)=
-		($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+    foreach my $thiskey (sort keys %{$resourcedata}) {
+	if ($$resourcedata{$thiskey.'.type'}) {
+	    my ($middle,$part,$name)=
+		($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
 	    my $section=&mt('All Students');
-	    if ($middle=~/^\[(.*)\]\./) {
-		$section=&mt('Group/Section').': '.$1;
-		$middle=~s/^\[(.*)\]\.//;
+	    if ($middle=~/^\[(.*)\]/) {
+		my $issection=$1;
+		if ($issection=~/^useropt\:(\w+)\:(\w+)/) {
+		    $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
+		} else {
+		    $section=&mt('Group/Section').': '.$issection;
+		}
+		$middle=~s/^\[(.*)\]//;
 	    }
-	    $middle=~s/\.$//;
+	    $middle=~s/\.+$//;
+	    $middle=~s/^\.+//;
 	    my $realm='<font color="red">'.&mt('All Resources').'</font>';
 	    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
 		$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
@@ -1902,19 +2017,19 @@ ENDOVER
 		      ':</b></td><td><input type="checkbox" name="del_'.
 		      $thiskey.'" /></td><td>');
 	    $foundkeys++;
-	    if ($resourcedata{$thiskey.'.type'}=~/^date/) {
+	    if ($$resourcedata{$thiskey.'.type'}=~/^date/) {
 		my $jskey='key_'.$pointer;
 		$pointer++;
 		$r->print(
 			  &Apache::lonhtmlcommon::date_setter('overviewform',
 							      $jskey,
-						      $resourcedata{$thiskey}).
+						      $$resourcedata{$thiskey}).
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'
 			  );
 	    } else {
 		$r->print(
 			  '<input type="text" name="set_'.$thiskey.'" value="'.
-			  $resourcedata{$thiskey}.'">');
+			  $$resourcedata{$thiskey}.'">');
 	    }
 	    $r->print('</td></tr>');
 	}
@@ -1951,8 +2066,8 @@ Returns:
 sub change_clone {
     my ($clonelist,$oldcloner) = @_;
     my ($uname,$udom);
-    my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
-    my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $clone_crs = $cnum.':'.$cdom;
     
     if ($cnum && $cdom) {
@@ -2008,6 +2123,94 @@ sub change_clone {
     }
 }
 
+
+##################################################
+##################################################
+
+=pod
+
+=item * header
+
+Output html header for page
+
+=cut
+
+##################################################
+##################################################
+sub header {
+    my $html=&Apache::lonxml::xmlbegin();
+    my $bodytag=&Apache::loncommon::bodytag('Parameter Manager');
+    my $title = &mt('LON-CAPA Parameter Manager');
+    return(<<ENDHEAD);
+$html
+<head>
+<title>$title</title>
+</head>
+$bodytag
+ENDHEAD
+}
+##################################################
+##################################################
+sub print_main_menu {
+    my ($r,$parm_permission)=@_;
+    #
+    $r->print(<<ENDMAINFORMHEAD);
+<form method="post" enctype="multipart/form-data"
+      action="/adm/parmset" name="studentform">
+ENDMAINFORMHEAD
+#
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my @menu =
+        (
+          { text => 'Set Course Environment Parameters',
+	    action => 'crsenv',
+            permission => $parm_permission,
+            },
+          { text => 'Set/Modify Course Assessment Parameters - Helper Mode',
+            url => '/adm/helper/parameter.helper',
+            permission => $parm_permission,
+            },
+          { text => 'Modify Course Assessment Parameters - Overview Mode',
+            action => 'setoverview',
+            permission => $parm_permission,
+            },
+          { text => 'Set/Modify Course Assessment Parameters - Table Mode',
+            action => 'settable',
+            permission => $parm_permission,
+            help => 'Cascading_Parameters',
+            },
+#          { text => 'Set Parameter Default Preferences',
+#            help => 'Course_View_Class_List',
+#            action => 'setdefaults',
+#            permission => $parm_permission,
+#            },
+          );
+    my $menu_html = '';
+    foreach my $menu_item (@menu) {
+        next if (! $menu_item->{'permission'});
+        $menu_html.='<p>';
+        $menu_html.='<font size="+1">';
+        if (exists($menu_item->{'url'})) {
+            $menu_html.=qq{<a href="$menu_item->{'url'}">};
+        } else {
+            $menu_html.=
+                qq{<a href="/adm/parmset?action=$menu_item->{'action'}">};
+        }
+        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+        if (exists($menu_item->{'help'})) {
+            $menu_html.=
+                &Apache::loncommon::help_open_topic($menu_item->{'help'});
+        }
+        $menu_html.='</p>'.$/;
+    }
+    $r->print($menu_html);
+    return;
+}
+
+
+
+
 ##################################################
 ##################################################
 
@@ -2018,7 +2221,6 @@ sub change_clone {
 Main handler.  Calls &assessparms and &crsenv subroutines.
 
 =cut
-
 ##################################################
 ##################################################
     use Data::Dumper;
@@ -2030,49 +2232,70 @@ sub handler {
 	$r->send_http_header;
 	return OK;
     }
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
-
-# ----------------------------------------------------------- Clear out garbage
-
-    %courseopt=();
-    %useropt=();
-    %parmhash=();
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+					    ['action','state',
+                                             'pres_marker',
+                                             'pres_value',
+                                             'pres_type',
+                                             'udom','uname']);
 
-    @ids=();
-    %symbp=();
-    %mapp=();
-    %typep=();
-    %keyp=();
 
-    %maptitles=();
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
+					    text=>"Parameter Manager",
+					    faq=>10,
+					    bug=>'Instructor Interface'});
 
 # ----------------------------------------------------- Needs to be in a course
+    my $parm_permission =
+	(&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
+	 &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
+				  $env{'request.course.sec'}));
+    if ($env{'request.course.id'} &&  $parm_permission) {
 
-    if (($ENV{'request.course.id'}) && 
-	(&Apache::lonnet::allowed('opa',$ENV{'request.course.id'}) || 
-	 &Apache::lonnet::allowed('opa',$ENV{'request.course.id'}.'/'.
-				  $ENV{'request.course.sec'})
-	 )) {
-
+        # Start Page
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
- 
-        $coursename=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
 
-	if (($ENV{'form.crsenv'}) || (!$ENV{'request.course.fn'})) {
-# ---------------------------------------------- This is for course environment
-# -------------------------- also call if toplevel map coudl not be initialized
-	    &crsenv($r);
-	} elsif ($ENV{'form.overview'}) {
-# --------------------------------------------------------------- Overview mode
+
+        # id numbers can change on re-ordering of folders
+
+        &resetsymbcache();
+
+        #
+        # Main switch on form.action and form.state, as appropriate
+        #
+        # Check first if coming from someone else headed directly for
+        #  the table mode
+        if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
+	     && (!$env{'form.dis'})) || ($env{'form.symb'})) {
+	    &assessparms($r);
+
+        } elsif (! exists($env{'form.action'})) {
+            $r->print(&header());
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
+							 'Parameter Manager'));
+            &print_main_menu($r,$parm_permission);
+        } elsif ($env{'form.action'} eq 'crsenv' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
+						    text=>"Course Environment"});
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
+						   'Edit Course Environment'));
+            &crsenv($r); 
+        } elsif ($env{'form.action'} eq 'setoverview' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+						    text=>"Overview Mode"});
 	    &overview($r);
-	} else {
-# --------------------------------------------------------- Bring up assessment
+        } elsif ($env{'form.action'} eq 'settable' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+						    text=>"Table Mode",
+						    help => 'Course_Setting_Parameters'});
 	    &assessparms($r);
-	}
+        }
+        
     } else {
 # ----------------------------- Not in a course, or not allowed to modify parms
-	$ENV{'user.error.msg'}=
+	$env{'user.error.msg'}=
 	    "/adm/parmset:opa:0:0:Cannot modify assessment parameters";
 	return HTTP_NOT_ACCEPTABLE;
     }