- cl-irc-cvs@common-lisp.net - mailman3.common-lisp.net

[Cl-irc-cvs] CVS update: cl-irc/example/cliki.lisp
by lisppaste＠common-lisp.net 13 Oct '05

13 Oct '05

Update of /project/cl-irc/cvsroot/cl-irc/example In directory common-lisp.net:/home/lisppaste/cl-irc/example Modified Files: cliki.lisp Log Message: for bmastenbrook: length limit Date: Thu Oct 13 21:52:34 2005 Author: lisppaste Index: cl-irc/example/cliki.lisp diff -u cl-irc/example/cliki.lisp:1.36 cl-irc/example/cliki.lisp:1.37 --- cl-irc/example/cliki.lisp:1.36 Thu Oct 13 20:35:08 2005 +++ cl-irc/example/cliki.lisp Thu Oct 13 21:52:33 2005 @@ -1,4 +1,4 @@ -;;;; $Id: cliki.lisp,v 1.36 2005/10/13 18:35:08 lisppaste Exp $ +;;;; $Id: cliki.lisp,v 1.37 2005/10/13 19:52:33 lisppaste Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/example/cliki.lisp,v $ ;;;; cliki.lisp - CLiki as an infobot; only works on SBCL. @@ -684,10 +684,11 @@ (nth-value 1 (scan-to-strings "^(?i)what\\s+([a-zA-Z\"]+)\\s+(means|stands\\s+for)$" first-pass))))) (and str (let ((letters (remove #\" (elt str 0)))) - (if (and (> (length letters) 2) - (string-equal (subseq letters (- (length letters) 2)) "cl")) - (steel-bazooka:steel-whatever :letters (string-downcase (subseq letters 0 (- (length letters) 2)))) - (steel-bazooka:steel-whatever :letters (string-downcase letters) :suffix nil))))) + (when (< (length letters) 9) + (if (and (> (length letters) 2) + (string-equal (subseq letters (- (length letters) 2)) "cl")) + (steel-bazooka:steel-whatever :letters (string-downcase (subseq letters 0 (- (length letters) 2)))) + (steel-bazooka:steel-whatever :letters (string-downcase letters) :suffix nil)))))) (let ((str (nth-value 1 (scan-to-strings "^(?i)shorten\\s+(\\w+://.+\\S)\\s*$" term-with-question)))) (and str (shorten (elt str 0))))

1 0

[Cl-irc-cvs] CVS update: cl-irc/example/cliki.lisp
by lisppaste＠common-lisp.net 13 Oct '05

13 Oct '05

Update of /project/cl-irc/cvsroot/cl-irc/example In directory common-lisp.net:/home/lisppaste/cl-irc/example Modified Files: cliki.lisp Log Message: for bmastenbrook: quotes! Date: Thu Oct 13 20:35:08 2005 Author: lisppaste Index: cl-irc/example/cliki.lisp diff -u cl-irc/example/cliki.lisp:1.35 cl-irc/example/cliki.lisp:1.36 --- cl-irc/example/cliki.lisp:1.35 Thu Oct 13 20:33:13 2005 +++ cl-irc/example/cliki.lisp Thu Oct 13 20:35:08 2005 @@ -1,4 +1,4 @@ -;;;; $Id: cliki.lisp,v 1.35 2005/10/13 18:33:13 lisppaste Exp $ +;;;; $Id: cliki.lisp,v 1.36 2005/10/13 18:35:08 lisppaste Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/example/cliki.lisp,v $ ;;;; cliki.lisp - CLiki as an infobot; only works on SBCL. @@ -680,10 +680,10 @@ (lookup-advice (elt str 0)))) (let ((str (or - (nth-value 1 (scan-to-strings "^(?i)what\\s+does\\s+([a-zA-Z]+)\\s+(mean|stand\\s+for)$" first-pass)) - (nth-value 1 (scan-to-strings "^(?i)what\\s+([a-zA-Z]+)\\s+(means|stands\\s+for)$" first-pass))))) + (nth-value 1 (scan-to-strings "^(?i)what\\s+does\\s+([a-zA-Z\"]+)\\s+(mean|stand\\s+for)$" first-pass)) + (nth-value 1 (scan-to-strings "^(?i)what\\s+([a-zA-Z\"]+)\\s+(means|stands\\s+for)$" first-pass))))) (and str - (let ((letters (elt str 0))) + (let ((letters (remove #\" (elt str 0)))) (if (and (> (length letters) 2) (string-equal (subseq letters (- (length letters) 2)) "cl")) (steel-bazooka:steel-whatever :letters (string-downcase (subseq letters 0 (- (length letters) 2))))

1 0

[Cl-irc-cvs] CVS update: cl-irc/example/cliki.lisp
by lisppaste＠common-lisp.net 13 Oct '05

13 Oct '05

Update of /project/cl-irc/cvsroot/cl-irc/example In directory common-lisp.net:/home/lisppaste/cl-irc/example Modified Files: cliki.lisp Log Message: MORE REGEXPS Date: Thu Oct 13 20:33:13 2005 Author: lisppaste Index: cl-irc/example/cliki.lisp diff -u cl-irc/example/cliki.lisp:1.34 cl-irc/example/cliki.lisp:1.35 --- cl-irc/example/cliki.lisp:1.34 Thu Oct 13 20:26:21 2005 +++ cl-irc/example/cliki.lisp Thu Oct 13 20:33:13 2005 @@ -1,4 +1,4 @@ -;;;; $Id: cliki.lisp,v 1.34 2005/10/13 18:26:21 lisppaste Exp $ +;;;; $Id: cliki.lisp,v 1.35 2005/10/13 18:33:13 lisppaste Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/example/cliki.lisp,v $ ;;;; cliki.lisp - CLiki as an infobot; only works on SBCL. @@ -678,7 +678,10 @@ (let ((str (nth-value 1 (scan-to-strings "^(?i)advice\\W+(\\d+)$" first-pass)))) (and str (lookup-advice (elt str 0)))) - (let ((str (nth-value 1 (scan-to-strings "^(?i)what\\s+does\\s+([a-zA-Z]+)\\s+(mean|stand\\s+for)$" first-pass)))) + (let ((str + (or + (nth-value 1 (scan-to-strings "^(?i)what\\s+does\\s+([a-zA-Z]+)\\s+(mean|stand\\s+for)$" first-pass)) + (nth-value 1 (scan-to-strings "^(?i)what\\s+([a-zA-Z]+)\\s+(means|stands\\s+for)$" first-pass))))) (and str (let ((letters (elt str 0))) (if (and (> (length letters) 2)

1 0

[Cl-irc-cvs] CVS update: cl-irc/example/cliki.lisp
by lisppaste＠common-lisp.net 13 Oct '05

13 Oct '05

Update of /project/cl-irc/cvsroot/cl-irc/example In directory common-lisp.net:/home/lisppaste/cl-irc/example Modified Files: cliki.lisp Log Message: for bmastenbrook: MORE HELP Date: Thu Oct 13 20:26:21 2005 Author: lisppaste Index: cl-irc/example/cliki.lisp diff -u cl-irc/example/cliki.lisp:1.33 cl-irc/example/cliki.lisp:1.34 --- cl-irc/example/cliki.lisp:1.33 Thu Oct 13 20:22:38 2005 +++ cl-irc/example/cliki.lisp Thu Oct 13 20:26:21 2005 @@ -1,4 +1,4 @@ -;;;; $Id: cliki.lisp,v 1.33 2005/10/13 18:22:38 lisppaste Exp $ +;;;; $Id: cliki.lisp,v 1.34 2005/10/13 18:26:21 lisppaste Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/example/cliki.lisp,v $ ;;;; cliki.lisp - CLiki as an infobot; only works on SBCL. @@ -407,7 +407,10 @@ (format nil "Try saying something like ``~A: advice #11904'' to get some advice." nick))) ("apropos" . ,(lambda (nick) - (format nil "Try ``~A: apropos foo'' to search for all small definitions containing ''foo''." nick))))) + (format nil "Try ``~A: apropos foo'' to search for all small definitions containing ''foo''." nick))) + ("acronyms" . + ,(lambda (nick) + (format nil "See an acronym you don't recognize? Try ``~A: what does sbcl stand for?'' to find out what it means!" nick))))) (defun cliki-bot-help (nick) (format nil "There are multiple help modules. Try ``/msg ~A help kind'', where kind is one of: ~{\"~A\"~^, ~}."

1 0

[Cl-irc-cvs] CVS update: cl-irc/example/steel-bazooka.lisp cl-irc/example/words cl-irc/example/cliki-bot.asd cl-irc/example/cliki.lisp
by lisppaste＠common-lisp.net 13 Oct '05

13 Oct '05

Update of /project/cl-irc/cvsroot/cl-irc/example In directory common-lisp.net:/home/lisppaste/cl-irc/example Modified Files: cliki-bot.asd cliki.lisp Added Files: steel-bazooka.lisp words Log Message: For bmastenbrook: Steel Bazooka Common Lisp! Date: Thu Oct 13 20:22:40 2005 Author: lisppaste Index: cl-irc/example/cliki-bot.asd diff -u cl-irc/example/cliki-bot.asd:1.4 cl-irc/example/cliki-bot.asd:1.5 --- cl-irc/example/cliki-bot.asd:1.4 Tue May 10 02:36:26 2005 +++ cl-irc/example/cliki-bot.asd Thu Oct 13 20:22:38 2005 @@ -1,4 +1,4 @@ -;;;; $Id: cliki-bot.asd,v 1.4 2005/05/10 00:36:26 lisppaste Exp $ +;;;; $Id: cliki-bot.asd,v 1.5 2005/10/13 18:22:38 lisppaste Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/example/cliki-bot.asd,v $ ;;;; See the LICENSE file for licensing information. @@ -19,7 +19,7 @@ :depends-on (:cl-irc :cl-ppcre :split-sequence :trivial-http) :properties ((#:author-email . "cl-irc-devel(a)common-lisp.net") - (#:date . "$Date: 2005/05/10 00:36:26 $") + (#:date . "$Date: 2005/10/13 18:22:38 $") ((#:albert #:output-dir) . "doc/api-doc/") ((#:albert #:formats) . ("docbook")) ((#:albert #:docbook #:template) . "book") @@ -28,5 +28,6 @@ :components ((:file "mp2eliza") (:file "eliza-rules" :depends-on ("mp2eliza")) + (:file "steel-bazooka") (:file "cliki" - :depends-on ("mp2eliza")))) + :depends-on ("mp2eliza" "steel-bazooka")))) Index: cl-irc/example/cliki.lisp diff -u cl-irc/example/cliki.lisp:1.32 cl-irc/example/cliki.lisp:1.33 --- cl-irc/example/cliki.lisp:1.32 Thu Sep 1 21:05:30 2005 +++ cl-irc/example/cliki.lisp Thu Oct 13 20:22:38 2005 @@ -1,4 +1,4 @@ -;;;; $Id: cliki.lisp,v 1.32 2005/09/01 19:05:30 lisppaste Exp $ +;;;; $Id: cliki.lisp,v 1.33 2005/10/13 18:22:38 lisppaste Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/example/cliki.lisp,v $ ;;;; cliki.lisp - CLiki as an infobot; only works on SBCL. @@ -675,6 +675,13 @@ (let ((str (nth-value 1 (scan-to-strings "^(?i)advice\\W+(\\d+)$" first-pass)))) (and str (lookup-advice (elt str 0)))) + (let ((str (nth-value 1 (scan-to-strings "^(?i)what\\s+does\\s+([a-zA-Z]+)\\s+(mean|stand\\s+for)$" first-pass)))) + (and str + (let ((letters (elt str 0))) + (if (and (> (length letters) 2) + (string-equal (subseq letters (- (length letters) 2)) "cl")) + (steel-bazooka:steel-whatever :letters (string-downcase (subseq letters 0 (- (length letters) 2)))) + (steel-bazooka:steel-whatever :letters (string-downcase letters) :suffix nil))))) (let ((str (nth-value 1 (scan-to-strings "^(?i)shorten\\s+(\\w+://.+\\S)\\s*$" term-with-question)))) (and str (shorten (elt str 0))))

1 0

[Cl-irc-cvs] CVS update: cl-irc/utility.lisp
by afuchs＠common-lisp.net 03 Oct '05

03 Oct '05

Update of /project/cl-irc/cvsroot/cl-irc In directory common-lisp.net:/tmp/cvs-serv31157 Modified Files: utility.lisp Log Message: fix parsing of mode args that contain #\+ or #\-, e.g. -o+b. Date: Mon Oct 3 16:11:03 2005 Author: afuchs Index: cl-irc/utility.lisp diff -u cl-irc/utility.lisp:1.7 cl-irc/utility.lisp:1.8 --- cl-irc/utility.lisp:1.7 Sun Apr 17 21:45:42 2005 +++ cl-irc/utility.lisp Mon Oct 3 16:11:02 2005 @@ -1,4 +1,4 @@ -;;;; $Id: utility.lisp,v 1.7 2005/04/17 19:45:42 ehuelsmann Exp $ +;;;; $Id: utility.lisp,v 1.8 2005/10/03 14:11:02 afuchs Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/utility.lisp,v $ ;;;; See the LICENSE file for licensing information. @@ -319,18 +319,21 @@ (unless (position this-op "+-") (throw 'illegal-mode-spec nil)) (dotimes (i (length modes)) - (let* ((mode-rec - (mode-description connection target - (mode-name-from-char connection target - (char modes i)))) - (param-p (funcall param-req mode-rec))) - (when (and param-p - (= 0 (length arguments))) - (throw 'illegal-mode-spec nil)) - (push (list this-op - (mode-desc-symbol mode-rec) - (when param-p - (if (mode-desc-nick-param-p mode-rec) - (find-user connection (pop arguments)) - (pop arguments)))) ops))))))))) + (case (char modes i) + ((#\+ #\-) (setf this-op (char modes i))) + (t + (let* ((mode-rec + (mode-description connection target + (mode-name-from-char connection target + (char modes i)))) + (param-p (funcall param-req mode-rec))) + (when (and param-p + (= 0 (length arguments))) + (throw 'illegal-mode-spec nil)) + (push (list this-op + (mode-desc-symbol mode-rec) + (when param-p + (if (mode-desc-nick-param-p mode-rec) + (find-user connection (pop arguments)) + (pop arguments)))) ops)))))))))))

1 0

[Cl-irc-cvs] CVS update: cl-irc/command.lisp cl-irc/event.lisp cl-irc/protocol.lisp
by bmastenbrook＠common-lisp.net 25 Sep '05

25 Sep '05

Update of /project/cl-irc/cvsroot/cl-irc In directory common-lisp.net:/tmp/cvs-serv2975 Modified Files: command.lisp event.lisp protocol.lisp Log Message: Three patches from Mr. Fuchs: * the way to handle all IRC messages is by defining your own subclass of connection; use this * fix a usage of an undefined function * find-or-make-user should use username, hostmask and realname values as soon as they're available Date: Sun Sep 25 16:55:03 2005 Author: bmastenbrook Index: cl-irc/command.lisp diff -u cl-irc/command.lisp:1.11 cl-irc/command.lisp:1.12 --- cl-irc/command.lisp:1.11 Sun Sep 18 16:24:45 2005 +++ cl-irc/command.lisp Sun Sep 25 16:55:02 2005 @@ -1,4 +1,4 @@ -;;;; $Id: command.lisp,v 1.11 2005/09/18 14:24:45 bmastenbrook Exp $ +;;;; $Id: command.lisp,v 1.12 2005/09/25 14:55:02 bmastenbrook Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/command.lisp,v $ ;;;; See LICENSE for licensing information. @@ -245,10 +245,12 @@ (mode 0) (server *default-irc-server*) (port *default-irc-server-port*) + (connection-type 'connection) (logging-stream t)) "Connect to server and return a connection object." (let* ((stream (socket-connect server port)) - (connection (make-connection :server-stream stream + (connection (make-connection :connection-type connection-type + :server-stream stream :client-stream logging-stream :server-name server)) (user (make-user connection Index: cl-irc/event.lisp diff -u cl-irc/event.lisp:1.10 cl-irc/event.lisp:1.11 --- cl-irc/event.lisp:1.10 Tue Sep 13 22:34:41 2005 +++ cl-irc/event.lisp Sun Sep 25 16:55:02 2005 @@ -1,4 +1,4 @@ -;;;; $Id: event.lisp,v 1.10 2005/09/13 20:34:41 ehuelsmann Exp $ +;;;; $Id: event.lisp,v 1.11 2005/09/25 14:55:02 bmastenbrook Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/event.lisp,v $ ;;;; See LICENSE for licensing information. @@ -229,7 +229,9 @@ (defmethod default-hook ((message irc-nick-message)) (let* ((con (connection message)) - (user (find-or-create-user con (source message)))) + (user (find-or-make-user con (source message) + :hostname (host message) + :username (user message)))) (change-nickname con user (trailing-argument message)))) (defmethod default-hook ((message irc-kick-message)) Index: cl-irc/protocol.lisp diff -u cl-irc/protocol.lisp:1.24 cl-irc/protocol.lisp:1.25 --- cl-irc/protocol.lisp:1.24 Sun Apr 17 23:14:30 2005 +++ cl-irc/protocol.lisp Sun Sep 25 16:55:02 2005 @@ -1,4 +1,4 @@ -;;;; $Id: protocol.lisp,v 1.24 2005/04/17 21:14:30 ehuelsmann Exp $ +;;;; $Id: protocol.lisp,v 1.25 2005/09/25 14:55:02 bmastenbrook Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/protocol.lisp,v $ ;;;; See LICENSE for licensing information. @@ -185,12 +185,13 @@ (defgeneric case-map-name (connection)) (defgeneric re-apply-case-mapping (connection)) -(defun make-connection (&key (user nil) +(defun make-connection (&key (connection-type 'connection) + (user nil) (server-name "") (server-stream nil) (client-stream t) (hooks nil)) - (let ((connection (make-instance 'connection + (let ((connection (make-instance connection-type :user user :server-name server-name :server-stream server-stream @@ -772,12 +773,21 @@ (defmethod find-or-make-user ((connection connection) nickname &key (username "") (hostname "") (realname "")) - (or (find-user connection nickname) - (make-user connection - :nickname nickname - :username username - :hostname hostname - :realname realname))) + (let ((user (find-user connection nickname))) + (unless user + (setf user + (make-user connection + :nickname nickname + :username username + :hostname hostname + :realname realname))) + (labels ((update-slot-if-known (slotname value) + (when (string= (slot-value user slotname) "") + (setf (slot-value user slotname) value)))) + (update-slot-if-known 'username username) + (update-slot-if-known 'hostname hostname) + (update-slot-if-known 'realname realname)) + user)) (defmethod change-nickname ((connection connection) (user user) new-nickname) (let ((new-user user)

1 0

[Cl-irc-cvs] CVS update: cl-irc/command.lisp
by bmastenbrook＠common-lisp.net 18 Sep '05

18 Sep '05

Update of /project/cl-irc/cvsroot/cl-irc In directory common-lisp.net:/tmp/cvs-serv5595 Modified Files: command.lisp Log Message: Add antifuchs' pass-on-connect support Date: Sun Sep 18 16:24:50 2005 Author: bmastenbrook Index: cl-irc/command.lisp diff -u cl-irc/command.lisp:1.10 cl-irc/command.lisp:1.11 --- cl-irc/command.lisp:1.10 Sun Apr 17 21:45:42 2005 +++ cl-irc/command.lisp Sun Sep 18 16:24:45 2005 @@ -1,4 +1,4 @@ -;;;; $Id: command.lisp,v 1.10 2005/04/17 19:45:42 ehuelsmann Exp $ +;;;; $Id: command.lisp,v 1.11 2005/09/18 14:24:45 bmastenbrook Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/command.lisp,v $ ;;;; See LICENSE for licensing information. @@ -241,6 +241,7 @@ (defun connect (&key (nickname *default-nickname*) (username nil) (realname nil) + (password nil) (mode 0) (server *default-irc-server*) (port *default-irc-server-port*) @@ -255,6 +256,8 @@ :username username :realname realname))) (setf (user connection) user) + (unless (null password) + (pass connection password)) (nick connection nickname) (user- connection (or username nickname) mode (or realname nickname)) (add-default-hooks connection)

1 0

[Cl-irc-cvs] CVS update: cl-irc/event.lisp
by ehuelsmann＠common-lisp.net 13 Sep '05

13 Sep '05

Update of /project/cl-irc/cvsroot/cl-irc In directory common-lisp.net:/tmp/cvs-serv12600 Modified Files: event.lisp Log Message: Prevent the bot from crashing when it got out-of-sync. * event.lisp (default-hook irc-nick-message): If we can't find the old user object, create a new one to set the nick on. Date: Tue Sep 13 22:34:41 2005 Author: ehuelsmann Index: cl-irc/event.lisp diff -u cl-irc/event.lisp:1.9 cl-irc/event.lisp:1.10 --- cl-irc/event.lisp:1.9 Sun Mar 27 23:40:30 2005 +++ cl-irc/event.lisp Tue Sep 13 22:34:41 2005 @@ -1,4 +1,4 @@ -;;;; $Id: event.lisp,v 1.9 2005/03/27 21:40:30 ehuelsmann Exp $ +;;;; $Id: event.lisp,v 1.10 2005/09/13 20:34:41 ehuelsmann Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/event.lisp,v $ ;;;; See LICENSE for licensing information. @@ -163,11 +163,10 @@ (channel (or (find-channel connection (trailing-argument message)) (make-channel connection :name (trailing-argument message))))) - (if (self-message-p message) - (add-channel connection channel) - (progn - (add-user connection user) - (add-user channel user))))) + (when (self-message-p message) + (add-channel connection channel)) + (add-user connection user) + (add-user channel user))) (defmethod default-hook ((message irc-topic-message)) (setf (topic (find-channel (connection message) @@ -229,9 +228,9 @@ target mode-name value)))))) (defmethod default-hook ((message irc-nick-message)) - (let ((con (connection message))) - (change-nickname con (find-user con (source message)) - (trailing-argument message)))) + (let* ((con (connection message)) + (user (find-or-create-user con (source message)))) + (change-nickname con user (trailing-argument message)))) (defmethod default-hook ((message irc-kick-message)) (let* ((connection (connection message))

1 0

[Cl-irc-cvs] CVS update: cl-irc/example/cliki.lisp
by lisppaste＠common-lisp.net 01 Sep '05

01 Sep '05

Update of /project/cl-irc/cvsroot/cl-irc/example In directory common-lisp.net:/home/lisppaste/cl-irc/example Modified Files: cliki.lisp Log Message: (for bmastenbrook): add a socket-error catch from trivial-sockets; fix a bad regexp which prevented adding terms with quotes in them (like "Bob") Date: Thu Sep 1 21:05:30 2005 Author: lisppaste Index: cl-irc/example/cliki.lisp diff -u cl-irc/example/cliki.lisp:1.31 cl-irc/example/cliki.lisp:1.32 --- cl-irc/example/cliki.lisp:1.31 Tue Aug 9 03:26:14 2005 +++ cl-irc/example/cliki.lisp Thu Sep 1 21:05:30 2005 @@ -1,4 +1,4 @@ -;;;; $Id: cliki.lisp,v 1.31 2005/08/09 01:26:14 lisppaste Exp $ +;;;; $Id: cliki.lisp,v 1.32 2005/09/01 19:05:30 lisppaste Exp $ ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/example/cliki.lisp,v $ ;;;; cliki.lisp - CLiki as an infobot; only works on SBCL. @@ -332,6 +332,9 @@ (sb-ext:timeout (c) (return-from cliki-return (progn (signal 'lookup-failure) "I can't be expected to work when CLiki doesn't respond to me, can I?"))) + (trivial-sockets:socket-error (c) + (return-from cliki-return (progn (signal 'lookup-failure) + "I can't be expected to work when CLiki doesn't respond to me, can I?"))) (serious-condition (c &rest whatever) (return-from cliki-return (progn (signal 'lookup-failure) (regex-replace-all "\\n" (format nil "An error was encountered in lookup: ~A." c) " ")))))) )) @@ -508,7 +511,7 @@ (should-send-cant-find t)) (setf first-pass (regex-replace-all "\\s\\s+" first-pass " ")) (setf first-pass (regex-replace-all "\\s*$" first-pass "")) - (let ((scanned (or (nth-value 1 (scan-to-strings "^add\\s+\"([^\"]+)\"\\s+as:*\\s+(.+)$" first-pass)) + (let ((scanned (or (nth-value 1 (scan-to-strings "^add\\s+\"(.+)\"\\s+as:*\\s+(.+)$" first-pass)) (nth-value 1 (scan-to-strings "^add\\s+(.+)\\s+as:*\\s+(.+)$" first-pass))))) (if scanned (let ((term (elt scanned 0))

1 0