--- loncom/interface/lonparmset.pm 2002/02/12 06:28:23 1.44
+++ loncom/interface/lonparmset.pm 2002/06/14 20:19:45 1.53
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.44 2002/02/12 06:28:23 albertel Exp $
+# $Id: lonparmset.pm,v 1.53 2002/06/14 20:19:45 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -366,7 +366,8 @@ sub assessparms {
$ENV{'request.course.id'});
if ($csec eq '-1') {
$message="".
- "User '$uname' at domain '$udom' not in this course";
+ "User '$uname' at domain '$udom' not ".
+ "in this course";
$uname='';
$csec=$ENV{'form.csec'};
} else {
@@ -464,14 +465,9 @@ sub assessparms {
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 %storecontent = ($storeunder => $ENV{'form.pres_value'},
+ $storeunder.'type' => $ENV{'form.pres_type'});
my $reply='';
if ($snum>3) {
# ---------------------------------------------------------------- Store Course
@@ -485,13 +481,11 @@ sub assessparms {
} else {
&Apache::lonnet::expirespread('','','assesscalc');
}
-
# Store parameter
- $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'});
+ $reply=&Apache::lonnet::cput
+ ('resourcedata',\%storecontent,
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
} else {
# ------------------------------------------------------------------ Store User
#
@@ -506,11 +500,9 @@ sub assessparms {
} else {
&Apache::lonnet::expirespread($uname,$udom,'assesscalc');
}
-
# Store parameter
- $reply=
- &Apache::lonnet::critical('put:'.$udom.':'.$uname.':resourcedata:'.
- $storecontent,$uhome);
+ $reply=&Apache::lonnet::cput
+ ('resourcedata',\%storecontent,$udom,$uname);
}
if ($reply=~/^error\:(.*)/) {
@@ -519,28 +511,13 @@ sub assessparms {
# ---------------------------------------------------------------- Done storing
}
# -------------------------------------------------------------- Get coursedata
- my $reply=&Apache::lonnet::reply('dump:'.
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':resourcedata',
- $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
- if ($reply!~/^error\:/) {
- foreach (split(/\&/,$reply)) {
- my ($name,$value)=split(/\=/,$_);
- $courseopt{&Apache::lonnet::unescape($name)}=
- &Apache::lonnet::unescape($value);
- }
- }
+ %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) {
- my $reply=
- &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
- if ($reply!~/^error\:/) {
- foreach (split(/\&/,$reply)) {
- my ($name,$value)=split(/\=/,$_);
- $useropt{&Apache::lonnet::unescape($name)}=
- &Apache::lonnet::unescape($value);
- }
- }
+ %useropt=&Apache::lonnet::dump('resourcedata',$udom,$uname);
}
# ------------------------------------------------------------------- Sort this
@@ -580,7 +557,7 @@ sub assessparms {
if (!$pssymb) {
$r->print('
Select Enclosing Map | |