--- loncom/interface/lonparmset.pm	2000/11/25 19:57:17	1.12
+++ loncom/interface/lonparmset.pm	2000/11/27 16:08:55	1.15
@@ -9,7 +9,7 @@
 #
 # 10/11,10/12,10/16 Gerd Kortemeyer)
 #
-# 11/20,11/21,11/22,11/23,11/24,11/25 Gerd Kortemeyer
+# 11/20,11/21,11/22,11/23,11/24,11/25,11/27 Gerd Kortemeyer
 
 package Apache::lonparmset;
 
@@ -53,13 +53,13 @@ sub parmval {
 
        my $seclevel=
             $ENV{'request.course.id'}.'.['.
-		$ENV{'request.course.sec'}.'].'.$what;
+		$csec.'].'.$what;
        my $seclevelr=
             $ENV{'request.course.id'}.'.['.
-		$ENV{'request.course.sec'}.'].'.$symbparm;
+		$csec.'].'.$symbparm;
        my $seclevelm=
             $ENV{'request.course.id'}.'.['.
-		$ENV{'request.course.sec'}.'].'.$mapparm;
+		$csec.'].'.$mapparm;
 
        my $courselevel=
             $ENV{'request.course.id'}.'.'.$what;
@@ -228,6 +228,82 @@ sub handler {
           (tie(%parmhash,'GDBM_File',
            $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640))) {
 
+# --------------------------------------------------------- Get all assessments
+        map {
+	    if ($_=~/^src\_(\d+)\.(\d+)$/) {
+	       my $mapid=$1;
+               my $resid=$2;
+               my $id=$mapid.'.'.$resid;
+               if ($bighash{$_}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+		   $ids[$#ids+1]=$id;
+                   $typep{$id}=$1;
+                   $mapp{$id}=
+		       &Apache::lonnet::declutter($bighash{'map_id_'.$mapid});
+                   $symbp{$id}=$mapp{$id}.
+			'___'.$resid.'___'.
+			    &Apache::lonnet::declutter($bighash{$_});
+	       }
+            }
+        } keys %bighash;
+# ---------------------------------------------------------- Anything to store?
+        if ($ENV{'form.pres_marker'}) {
+       my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'});
+       $spnam=~s/\_/\./;
+# ---------------------------------------------------------- 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; }
+       $storeunder=&Apache::lonnet::escape($storeunder);
+ 
+       my $storecontent=
+    $storeunder.'='.&Apache::lonnet::escape($ENV{'form.pres_value'}).'&'.
+    $storeunder.'.type='.&Apache::lonnet::escape($ENV{'form.pres_type'});
+
+       my $reply='';
+           if ($snum>3) {
+# ---------------------------------------------------------------- Store Course
+            $reply=&Apache::lonnet::critical('put:'.
+             $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
+             $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':resourcedata:'.
+             $storecontent,
+             $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+           } else {
+# ------------------------------------------------------------------ Store User
+            $reply=
+            &Apache::lonnet::critical('put:'.$udom.':'.$uname.':resourcedata:'.
+             $storecontent,$uhome);
+           }
+
+         if ($reply=~/^error\:(.*)/) {
+	     $message.="<h3><font color=red>Write Error: $1</font></h3>";
+	 }
+# ---------------------------------------------------------------- Done storing
+   }
 # -------------------------------------------------------------- Get coursedata
         my $reply=&Apache::lonnet::reply('dump:'.
               $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
@@ -236,7 +312,8 @@ sub handler {
         if ($reply!~/^error\:/) {
            map {
              my ($name,$value)=split(/\=/,$_);
-             $courseopt{unescape($name)}=unescape($value);  
+             $courseopt{&Apache::lonnet::unescape($name)}=
+                        &Apache::lonnet::unescape($value);  
            } split(/\&/,$reply);
         }
 # --------------------------------------------------- Get userdata (if present)
@@ -246,27 +323,12 @@ sub handler {
            if ($reply!~/^error\:/) {
               map {
                 my ($name,$value)=split(/\=/,$_);
-                $useropt{unescape($name)}=unescape($value);  
+                $useropt{&Apache::lonnet::unescape($name)}=
+                         &Apache::lonnet::unescape($value);
               } split(/\&/,$reply);
            }
         }
-# --------------------------------------------------------- Get all assessments
-        map {
-	    if ($_=~/^src\_(\d+)\.(\d+)$/) {
-	       my $mapid=$1;
-               my $resid=$2;
-               my $id=$mapid.'.'.$resid;
-               if ($bighash{$_}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-		   $ids[$#ids+1]=$id;
-                   $typep{$id}=$1;
-                   $mapp{$id}=
-		       &Apache::lonnet::declutter($bighash{'map_id_'.$mapid});
-                   $symbp{$id}=$mapp{$id}.
-			'___'.$resid.'___'.
-			    &Apache::lonnet::declutter($bighash{$_});
-	       }
-            }
-        } keys %bighash;
+
 # ------------------------------------------------------------------- Sort this
          @ids=sort bycat @ids;
 # ------------------------------------------------------------------ Start page
@@ -277,6 +339,7 @@ sub handler {
 <head>
 <title>LON-CAPA Assessment Parameters</title>
 <script>
+
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
                  "height=350,width=350,scrollbars=no,menubar=no");
@@ -284,6 +347,7 @@ sub handler {
     }
 
     function pjump(type,dis,value,marker,ret,call) {
+        document.parmform.pres_marker.value='';
         parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
                  +"&value="+escape(value)+"&marker="+escape(marker)
                  +"&return="+escape(ret)
@@ -291,6 +355,18 @@ sub handler {
                  "height=350,width=350,scrollbars=no,menubar=no");
 
     }
+
+    function psub() {
+        pclose();
+        if ((document.parmform.pres_value.value!='') && 
+            (document.parmform.pres_marker.value!='')) {
+            document.parmform.submit();
+        } else {
+            document.parmform.pres_value.value='';
+            document.parmform.pres_marker.value='';
+        }
+    }
+
 </script>
 </head>
 <body bgcolor="#FFFFFF" onUnload="pclose()">
@@ -309,6 +385,9 @@ at Domain
 <input type="text" value="$udom" size="6" name="udom">
 </b>
 <input type="submit" value="Display">
+<input type="hidden" value='' name="pres_value">
+<input type="hidden" value='' name="pres_type">
+<input type="hidden" value='' name="pres_marker">
 ENDHEAD
 	
         $r->print($message.'<p>Sort list by ');
@@ -399,32 +478,46 @@ ENDTABLEHEADFOUR
 
                $r->print("<td>$part{$_}</td><td>$display{$_}</td>"); 
                my $mprefix=$rid.'&'.$_.'&';
+
                $r->print('<td'.(($result==11)?' bgcolor="#AAFFAA"':'').'>'.
              &valout($outpar[11],$type{$_}).'</td>');
                $r->print('<td'.(($result==10)?' bgcolor="#AAFFAA"':'').'>'.
              &valout($outpar[10],$type{$_}).'</td>');
+
                $r->print('<td'.(($result==9)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[9],$mprefix.'9').'</td>');
+             &plink($type{$_},$display{$_},$outpar[9],$mprefix.'9',
+                    'parmform.pres','psub').'</td>');
                $r->print('<td'.(($result==8)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[8],$mprefix.'8').'</td>');
+             &plink($type{$_},$display{$_},$outpar[8],$mprefix.'8',
+                    'parmform.pres','psub').'</td>');
                $r->print('<td'.(($result==7)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[7],$mprefix.'7').'</td>');
+             &plink($type{$_},$display{$_},$outpar[7],$mprefix.'7',
+                    'parmform.pres','psub').'</td>');
+
                if ($csec) {
                  $r->print('<td'.(($result==6)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[6],$mprefix.'6').'</td>');
+             &plink($type{$_},$display{$_},$outpar[6],$mprefix.'6',
+                    'parmform.pres','psub').'</td>');
                  $r->print('<td'.(($result==5)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[5],$mprefix.'5').'</td>');
+             &plink($type{$_},$display{$_},$outpar[5],$mprefix.'5',
+                    'parmform.pres','psub').'</td>');
                  $r->print('<td'.(($result==4)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[4],$mprefix.'4').'</td>');
+             &plink($type{$_},$display{$_},$outpar[4],$mprefix.'4',
+                    'parmform.pres','psub').'</td>');
                }
+
                if ($uname) {
                  $r->print('<td'.(($result==3)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[3],$mprefix.'3').'</td>');
+             &plink($type{$_},$display{$_},$outpar[3],$mprefix.'3',
+                    'parmform.pres','psub').'</td>');
                  $r->print('<td'.(($result==2)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[2],$mprefix.'2').'</td>');
+             &plink($type{$_},$display{$_},$outpar[2],$mprefix.'2',
+                    'parmform.pres','psub').'</td>');
                  $r->print('<td'.(($result==1)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[1],$mprefix.'1').'</td>');
+             &plink($type{$_},$display{$_},$outpar[1],$mprefix.'1',
+                    'parmform.pres','psub').'</td>');
                }
+
                $r->print('<td>'.&valout($outpar[$result],$type{$_}).'</td>');
                $r->print("</tr>\n<tr>");
 	   } sort keys %name;