--- loncom/lond	2005/10/11 21:29:36	1.299
+++ loncom/lond	2005/12/09 20:54:23	1.302
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.299 2005/10/11 21:29:36 raeburn Exp $
+# $Id: lond,v 1.302 2005/12/09 20:54:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.299 $'; #' stupid emacs
+my $VERSION='$Revision: 1.302 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1422,7 +1422,7 @@ sub ls_handler {
 			open(FILE, $ulsdir.'/'.$ulsfn.".meta");
 			my @obsolete=<FILE>;
 			foreach my $obsolete (@obsolete) {
-			    if($obsolete =~ m|(<obsolete>)(on)|) { $obs = 1; } 
+			    if($obsolete =~ m/(<obsolete>)(on|1)/) { $obs = 1; } 
 			    if($obsolete =~ m|(<copyright>)(default)|) { $rights = 1; }
 			}
 		    }
@@ -1490,7 +1490,7 @@ sub ls2_handler {
                         open(FILE, $ulsdir.'/'.$ulsfn.".meta");
                         my @obsolete=<FILE>;
                         foreach my $obsolete (@obsolete) {
-                            if($obsolete =~ m|(<obsolete>)(on)|) { $obs = 1; } 
+                            if($obsolete =~ m/(<obsolete>)(on|1)/) { $obs = 1; } 
                             if($obsolete =~ m|(<copyright>)(default)|) {
                                 $rights = 1;
                             }
@@ -3586,11 +3586,7 @@ sub dump_dcmail_handler {
     }
     if (defined($sendersfilter)) {
         $sendersfilter=&unescape($sendersfilter);
-        if ($sendersfilter =~ /\&/) {
-            @senders = split(/\&/,$sendersfilter);
-        } else {
-            $senders[0] = $sendersfilter;
-        }
+	@senders = map { &unescape($_) } split(/\&/,$sendersfilter);
     }
 
     my $qresult='';
@@ -3598,6 +3594,7 @@ sub dump_dcmail_handler {
     if ($hashref) {
         while (my ($key,$value) = each(%$hashref)) {
             my $match = 1;
+            $key = &unescape($key);
             my ($timestamp,$subj,$uname,$udom) = split(/:/,&unescape($key),5);
             $timestamp = &unescape($timestamp);
             $subj = &unescape($subj);
@@ -3721,11 +3718,7 @@ sub dump_domainroles_handler {
     }
     if (defined($rolesfilter)) {
         $rolesfilter=&unescape($rolesfilter);
-        if ($rolesfilter =~ /\&/) {
-            @roles = split(/\&/,$rolesfilter);
-        } else {
-            $roles[0] = $rolesfilter;
-        }
+	@roles = split(/\&/,$rolesfilter);
     }
                                                                                            
     my $hashref = &tie_domain_hash($udom, "nohist_domainroles", &GDBM_WRCREAT());