[LON-CAPA-cvs] cvs: loncom / lond /interface lonchatfetch.pm

www lon-capa-cvs@mail.lon-capa.org
Fri, 28 Mar 2003 23:16:26 -0000


www		Fri Mar 28 18:16:26 2003 EDT

  Modified files:              
    /loncom	lond 
    /loncom/interface	lonchatfetch.pm 
  Log:
  Chat participants
  
  
Index: loncom/lond
diff -u loncom/lond:1.123 loncom/lond:1.124
--- loncom/lond:1.123	Fri Mar 28 15:40:52 2003
+++ loncom/lond	Fri Mar 28 18:16:25 2003
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.123 2003/03/28 20:40:52 www Exp $
+# $Id: lond,v 1.124 2003/03/28 23:16:25 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,7 +73,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.123 $'; #' stupid emacs
+my $VERSION='$Revision: 1.124 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -1843,18 +1843,19 @@
 	@entries=map { $_.':'.$hash{$_} } sort keys %hash;
 	untie %hash;
     }
+    my @participants=();
     $cutoff=time-60;
     if (tie(%hash,'GDBM_File',"$proname/nohist_inchatroom.db",
-	    &GDBM_READER(),0640)) {
-	$hash{$uname.':'.$undom}=time;
+	    &GDBM_WRCREAT(),0640)) {
+        $hash{$uname.':'.$udom}=time;
         foreach (sort keys %hash) {
 	    if ($hash{$_}>$cutoff) {
-		$entries[$#entries+1]='active_participant:'.$_;
+		$participants[$#participants+1]='active_participant:'.$_;
             }
         }
         untie %hash;
     }
-    return @entries;
+    return (@participants,@entries);
 }
 
 sub chatadd {
Index: loncom/interface/lonchatfetch.pm
diff -u loncom/interface/lonchatfetch.pm:1.7 loncom/interface/lonchatfetch.pm:1.8
--- loncom/interface/lonchatfetch.pm:1.7	Fri Mar 28 15:40:52 2003
+++ loncom/interface/lonchatfetch.pm	Fri Mar 28 18:16:25 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Chat Fetching
 #
-# $Id: lonchatfetch.pm,v 1.7 2003/03/28 20:40:52 www Exp $
+# $Id: lonchatfetch.pm,v 1.8 2003/03/28 23:16:25 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,7 +55,8 @@
     my $chome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
 
     my @entries=split(/\:/,
-                       &Apache::lonnet::reply("chatretr:$cdom:$cnum",$chome));
+       &Apache::lonnet::reply(
+        "chatretr:$cdom:$cnum:$ENV{'user.domain'}:$ENV{'user.name'}",$chome));
     my ($lastid)=($entries[$#entries]=~/^(\w+)/);
     my ($thentime,$idnum)=split(/\_/,$lastid);
 # ----------------------------------------------------------- Can see identity?
@@ -78,7 +79,7 @@
 	if ($include) {
 	    my ($id,$msg,$uname)=split(/\:/,&Apache::lonnet::unescape($_));
 	    if ($id eq 'active_participant') {
-		$newstuff.='participant: '.$msg.' '.$uname;
+#		$newstuff.='participant: '.$msg.' '.$uname;
 	    } else {
 		chomp($msg);
 		my ($msgtime,$msgnum)=split(/\_/,$id);