X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fguile%2Fchatlog;h=d66489ed4ea607292bd544523b6822947674b483;hb=d6932520155665f13a3af7ab40ca6a724328d09f;hp=0c5b09796aa70e186bfa2eb259c1fd35506a0626;hpb=d3372da97568d5e1f35fa19787c8ec8af93a0435;p=doldaconnect.git

diff --git a/lib/guile/chatlog b/lib/guile/chatlog
index 0c5b097..d66489e 100755
--- a/lib/guile/chatlog
+++ b/lib/guile/chatlog
@@ -1,8 +1,25 @@
 #!/usr/bin/guile -s
 !#
 
+;  Dolda Connect - Modular multiuser Direct Connect-style client
+;  Copyright (C) 2007 Fredrik Tolf <fredrik@dolda2000.com>
+;  
+;  This program is free software; you can redistribute it and/or modify
+;  it under the terms of the GNU General Public License as published by
+;  the Free Software Foundation; either version 2 of the License, or
+;  (at your option) any later version.
+;  
+;  This program is distributed in the hope that it will be useful,
+;  but WITHOUT ANY WARRANTY; without even the implied warranty of
+;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;  GNU General Public License for more details.
+;  
+;  You should have received a copy of the GNU General Public License
+;  along with this program; if not, write to the Free Software
+;  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 (use-modules (dolcon ui))
-(use-modules (ice-9 pretty-print))
+(use-modules (ice-9 pretty-print) (ice-9 rdelim))
 
 (define fnetnodes '())
 
@@ -44,8 +61,8 @@
 	(let ((ires #f))
 	  (while (begin (set! ires (dc-intresp resp)) ires)
 		 (if (assoc (car ires) fnetnodes)
-		     (set-cdr! (assoc (car ires) fnetnodes) (caddr ires))
-		     (set! fnetnodes (cons (cons (car ires) (caddr ires)) fnetnodes))))))))
+		     (set-cdr! (assoc (car ires) fnetnodes) (list-ref ires 5))
+		     (set! fnetnodes (cons (cons (car ires) (list-ref ires 5)) fnetnodes))))))))
 
 (define (fn-getname id)
   (if (not (assoc id fnetnodes))
@@ -87,8 +104,6 @@
 	      )
 	)
       )
-    (if (not dc-server) (set! dc-server (getenv "DCSERVER")))
-    (if (not dc-server) (set! dc-server "localhost"))
     (if (not log-dir) (set! log-dir (string-append (getenv "HOME") "/dc/chatlog")))
 
     (dc-c&l #t dc-server #t)
@@ -118,18 +133,18 @@
 						    (set! last-fn (vector-ref ires 0))))
 					 (for-each
 					  (lambda (p)
-					    (write-line (string-append (strftime "%H:%M:%S" (localtime (current-time))) ": <" (vector-ref ires 3) "> " (vector-ref ires 4)) p))
+					    (write-line (string-append (strftime "%H:%M:%S" (localtime (current-time))) (if (eq? (vector-ref ires 1) 0) "!" ":") " <" (vector-ref ires 3) "> " (vector-ref ires 4)) p))
 					  (list p (current-output-port)))
 					 (close-port p))
 				       ))
 				 )
-				((602)
-				 (let ((ires (dc-intresp resp)))
-				   (if ires
-				       (let ((ent (assoc (car ires) fnetnodes)))
-					 (if ent
-					     (set-cdr! ent (cadr ires))
-					     (set! fnetnodes (cons (cons (car ires) (cadr ires)) fnetnodes)))))))
+;				((602)
+;				 (let ((ires (dc-intresp resp)))
+;				   (if ires
+;				       (let ((ent (assoc (car ires) fnetnodes)))
+;					 (if ent
+;					     (set-cdr! ent (cadr ires))
+;					     (set! fnetnodes (cons (cons (car ires) (cadr ires)) fnetnodes)))))))
 				
 				)
 			      )