--- loncom/interface/lonparmset.pm	2006/11/29 22:02:47	1.349
+++ loncom/interface/lonparmset.pm	2006/12/14 20:08:15	1.350.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.349 2006/11/29 22:02:47 www Exp $
+# $Id: lonparmset.pm,v 1.350.2.1 2006/12/14 20:08:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,7 @@ use Apache::lonlocal;
 use Apache::lonnavmaps;
 use Apache::longroup;
 use Apache::lonrss;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 # --- Caches local to lonparmset
 
@@ -122,7 +122,10 @@ sub parmval_by_symb {
 # load caches
     &cacheparmhash();
 
-    my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
+    my $useropt;
+    if ($uname ne '' && $udom ne '') {
+	$useropt = &Apache::lonnet::get_userresdata($uname,$udom);
+    }
 
     my $result='';
     my @outpar=();
@@ -173,7 +176,7 @@ sub parmval_by_symb {
     }
 
 # ------------------------------------------------------ fourth, back to course
-    if (defined($csec)) {
+    if ($csec ne '') {
         if (defined($$courseopt{$seclevel})) {
 	    $outpar[9]=$$courseopt{$seclevel};
 	    $result=9;
@@ -189,7 +192,7 @@ sub parmval_by_symb {
 	}
     }
 # ------------------------------------------------------ fifth, check course group
-    if (defined($cgroup)) {
+    if ($cgroup ne '') {
         if (defined($$courseopt{$grplevel})) {
             $outpar[6]=$$courseopt{$grplevel};
             $result=6;
@@ -206,7 +209,7 @@ sub parmval_by_symb {
 
 # ---------------------------------------------------------- fifth, check user
 
-    if (defined($uname)) {
+    if ($uname ne '') {
 	if (defined($$useropt{$courselevel})) {
 	    $outpar[3]=$$useropt{$courselevel};
 	    $result=3;
@@ -270,9 +273,7 @@ sub resetrulescache {
 sub rulescache {
     my $id=shift;
     if ($rulesid ne $env{'request.course.id'}) {
-	%rules=();
-    }
-    unless (defined($rules{$id})) {
+	&& !defined($rules{$id})) {
 	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
 	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 	%rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
@@ -2363,8 +2364,7 @@ sub readdata {
 
     my $classlist=&Apache::loncoursedata::get_classlist();
     foreach (keys %$classlist) {
-        # the following undefs are for 'domain', and 'username' respectively.
-        if ($_=~/^(\w+)\:(\w+)$/) {
+        if ($_=~/^($match_username)\:($match_domain)$/) {
 	    my ($tuname,$tudom)=($1,$2);
 	    my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
             foreach my $userkey (keys %{$useropt}) {
@@ -2486,7 +2486,7 @@ sub storedata {
 
 sub extractuser {
     my $key=shift;
-    return ($key=~/^$env{'request.course.id'}.\[useropt\:(\w+)\:(\w+)\]\./);
+    return ($key=~/^$env{'request.course.id'}.\[useropt\:($match_username)\:($match_domain)\]\./);
 }
 
 sub listdata {
@@ -2544,7 +2544,7 @@ sub listdata {
 	    my $section=&mt('All Students');
 	    if ($middle=~/^\[(.*)\]/) {
 		my $issection=$1;
-		if ($issection=~/^useropt\:(\w+)\:(\w+)/) {
+		if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
 		    $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
 		} else {
 		    $section=&mt('Group/Section').': '.$issection;
@@ -2918,7 +2918,7 @@ sub parse_key {
     $data{'scope_type'} = 'all';
     if ($middle=~/^\[(.*)\]/) {
        	$data{'scope'} = $1;
-	if ($data{'scope'}=~/^useropt\:(\w+)\:(\w+)/) {
+	if ($data{'scope'}=~/^useropt\:($match_username)\:($match_domain)/) {
 	    $data{'scope_type'} = 'user';
 	    $data{'scope'} = [$1,$2];
 	} else {