--- loncom/lond	2003/03/18 22:51:03	1.115
+++ loncom/lond	2003/03/26 00:17:04	1.119
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.115 2003/03/18 22:51:03 albertel Exp $
+# $Id: lond,v 1.119 2003/03/26 00:17:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -199,7 +199,7 @@ while ($configline=<CONFIG>) {
     $hostid{$ip}=$id;
     $hostdom{$id}=$domain;
     $hostip{$id}=$ip;
-    if ($id eq $perlvar{'lonHostId'}) { $thisserver=$name; }
+    if ($id eq $perlvar{'lonHostID'}) { $thisserver=$name; }
     $PREFORK++;
 }
 close(CONFIG);
@@ -1091,7 +1091,7 @@ sub make_new_child {
 			       ) { print $hfh "P:$now:$what\n"; }
 		       }
                        my @pairs=split(/\&/,$what);
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
                            foreach $pair (@pairs) {
 			       ($key,$value)=split(/=/,$pair);
                                $hash{$key}=$value;
@@ -1133,7 +1133,7 @@ sub make_new_child {
                                  }
 		       }
                        my @pairs=split(/\&/,$what);
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
                            foreach $pair (@pairs) {
 			       ($key,$value)=split(/=/,$pair);
 			       &ManagePermissions($key, $udom, $uname,
@@ -1157,6 +1157,48 @@ sub make_new_child {
 		      } else {
                           print $client "refused\n";
                       }
+# -------------------------------------------------------------------- rolesdel
+                   } elsif ($userinput =~ /^rolesdel/) {
+		       &Debug("rolesdel");
+		    if ($wasenc==1) {
+                       my ($cmd,$exedom,$exeuser,$udom,$uname,$what)
+                          =split(/:/,$userinput);
+		       &Debug("cmd = ".$cmd." exedom= ".$exedom.
+				    "user = ".$exeuser." udom=".$udom.
+				    "what = ".$what);
+                       my $namespace='roles';
+                       chomp($what);
+                       my $proname=propath($udom,$uname);
+                       my $now=time;
+                       {
+			   my $hfh;
+			   if (
+                             $hfh=IO::File->new(">>$proname/$namespace.hist")
+			       ) { 
+                                  print $hfh "D:$now:$exedom:$exeuser:$what\n";
+                                 }
+		       }
+                       my @rolekeys=split(/\&/,$what);
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+                           foreach $key (@rolekeys) {
+                               delete $hash{$key};
+			       
+                           }
+			   if (untie(%hash)) {
+                              print $client "ok\n";
+                           } else {
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting rolesdel\n";
+                           }
+                       } else {
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                   "while attempting rolesdel\n";
+                       }
+		      } else {
+                          print $client "refused\n";
+                      }
 # ------------------------------------------------------------------------- get
                    } elsif ($userinput =~ /^get/) {
                        my ($cmd,$udom,$uname,$namespace,$what)
@@ -1167,7 +1209,7 @@ sub make_new_child {
                        my @queries=split(/\&/,$what);
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
                            for ($i=0;$i<=$#queries;$i++) {
                                $qresult.="$hash{$queries[$i]}&";
                            }
@@ -1199,7 +1241,7 @@ sub make_new_child {
                        my @queries=split(/\&/,$what);
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
                            for ($i=0;$i<=$#queries;$i++) {
                                $qresult.="$hash{$queries[$i]}&";
                            }
@@ -1245,7 +1287,7 @@ sub make_new_child {
 			       ) { print $hfh "D:$now:$what\n"; }
 		       }
                        my @keys=split(/\&/,$what);
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
                            foreach $key (@keys) {
                                delete($hash{$key});
                            }
@@ -1269,7 +1311,7 @@ sub make_new_child {
                        $namespace=~s/\W//g;
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
                            foreach $key (keys %hash) {
                                $qresult.="$key&";
                            }
@@ -1387,7 +1429,7 @@ sub make_new_child {
 		       }
                        my @pairs=split(/\&/,$what);
                          
-    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
+    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
                            my @previouskeys=split(/&/,$hash{"keys:$rid"});
                            my $key;
                            $hash{"version:$rid"}++;
@@ -1425,7 +1467,7 @@ sub make_new_child {
                        chomp($rid);
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
                 	   my $version=$hash{"version:$rid"};
                            $qresult.="version=$version&";
                            my $scope;
@@ -1492,6 +1534,71 @@ sub make_new_child {
 			       ." IO::File->new Failed ".
                                    "while attempting queryreply\n";
 		       }
+# ----------------------------------------------------------------- courseidput
+                   } elsif ($userinput =~ /^courseidput/) {
+                       my ($cmd,$udom,$what)=split(/:/,$userinput);
+                       chomp($what);
+                       $udom=~s/\W//g;
+                       my $proname=
+                              "$perlvar{'lonUsersDir'}/$udom/nohist_courseids";
+                       my $now=time;
+                       my @pairs=split(/\&/,$what);
+                 if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT(),0640)) {
+                           foreach $pair (@pairs) {
+			       ($key,$value)=split(/=/,$pair);
+                               $hash{$key}=$value.':'.$now;
+                           }
+			   if (untie(%hash)) {
+                              print $client "ok\n";
+                           } else {
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting courseidput\n";
+                           }
+                       } else {
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                      "while attempting courseidput\n";
+                       }
+# ---------------------------------------------------------------- courseiddump
+                   } elsif ($userinput =~ /^courseiddump/) {
+                       my ($cmd,$udom,$since,$description)
+                          =split(/:/,$userinput);
+                       if (defined($description)) {
+                          $description=&unescape($description);
+		       } else {
+                          $description='.';
+		       }
+                       unless (defined($since)) { $since=0; }
+                       my $qresult='';
+                       my $proname=
+                              "$perlvar{'lonUsersDir'}/$udom/nohist_courseids";
+                if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER(),0640)) {
+                           while (($key,$value) = each(%hash)) {
+                               my ($descr,$lasttime)=split(/\:/,$value);
+                               if ($lasttime<$since) { next; }
+                               if ($regexp eq '.') {
+                                   $qresult.=$key.'='.$descr.'&';
+                               } else {
+                                   my $unescapeVal = &unescape($descr);
+                                   if (eval('$unescapeVal=~/$description/')) {
+                                       $qresult.="$key=$descr&";
+                                   }
+                               }
+                           }
+                           if (untie(%hash)) {
+                               chop($qresult);
+                               print $client "$qresult\n";
+                           } else {
+                               print $client "error: ".($!+0)
+				   ." untie(GDBM) Failed ".
+                                       "while attempting courseiddump\n";
+                           }
+                       } else {
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                      "while attempting courseiddump\n";
+                       }
 # ----------------------------------------------------------------------- idput
                    } elsif ($userinput =~ /^idput/) {
                        my ($cmd,$udom,$what)=split(/:/,$userinput);
@@ -1506,7 +1613,7 @@ sub make_new_child {
 			       ) { print $hfh "P:$now:$what\n"; }
 		       }
                        my @pairs=split(/\&/,$what);
-                 if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT,0640)) {
+                 if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT(),0640)) {
                            foreach $pair (@pairs) {
 			       ($key,$value)=split(/=/,$pair);
                                $hash{$key}=$value;
@@ -1531,7 +1638,7 @@ sub make_new_child {
                        my $proname="$perlvar{'lonUsersDir'}/$udom/ids";
                        my @queries=split(/\&/,$what);
                        my $qresult='';
-                 if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER,0640)) {
+                 if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER(),0640)) {
                            for ($i=0;$i<=$#queries;$i++) {
                                $qresult.="$hash{$queries[$i]}&";
                            }