Update of /project/lisppaste/cvsroot/lisppaste2 In directory common-lisp.net:/home/bmastenbrook/lisppaste2 Modified Files: irc-log-link.lisp web-server.lisp Log Message: Small bug fix; log links for annotations Date: Wed Feb 4 08:07:27 2004 Author: bmastenbrook Index: lisppaste2/irc-log-link.lisp diff -u lisppaste2/irc-log-link.lisp:1.2 lisppaste2/irc-log-link.lisp:1.3 --- lisppaste2/irc-log-link.lisp:1.2 Tue Feb 3 21:43:57 2004 +++ lisppaste2/irc-log-link.lisp Wed Feb 4 08:07:27 2004 @@ -60,5 +60,5 @@ (defun irc-log-link (channel) (let ((link (fetch-irc-log-link (string-left-trim "#" channel)))) (if (stringp link) - (araneida:merge-url (araneida:make-url :scheme "http" :host *meme-host*) link) + (araneida:urlstring (araneida:merge-url (araneida:make-url :scheme "http" :host *meme-host*) link)) ""))) Index: lisppaste2/web-server.lisp diff -u lisppaste2/web-server.lisp:1.25 lisppaste2/web-server.lisp:1.26 --- lisppaste2/web-server.lisp:1.25 Tue Feb 3 22:26:03 2004 +++ lisppaste2/web-server.lisp Wed Feb 4 08:07:27 2004 @@ -1,4 +1,4 @@ -;;;; $Id: web-server.lisp,v 1.25 2004/02/04 03:26:03 bmastenbrook Exp $ +;;;; $Id: web-server.lisp,v 1.26 2004/02/04 13:07:27 bmastenbrook Exp $ ;;;; $Source: /project/lisppaste/cvsroot/lisppaste2/web-server.lisp,v $ ;;;; See the LICENSE file for licensing information. @@ -184,7 +184,7 @@ (let* ((paste-number (if annotate (parse-integer annotate :junk-allowed t) (incf *paste-counter*))) (paste-to-annotate (if annotate (find paste-number *pastes* :key #'paste-number))) (annotation-number (if annotate (incf (paste-annotation-counter paste-to-annotate)))) - (log-link (araneida:urlstring (irc-log-link channel)))) + (log-link (irc-log-link channel))) (let ((url (araneida:urlstring (araneida:merge-url *display-paste-url* (if annotate @@ -259,7 +259,10 @@ `((tr (td (p)) (td)) (tr (td ((a :name ,(prin1-to-string (paste-number a))) "Title:")) - ((td :align "left") ,(encode-for-pre (paste-title a)))) + ((td :align "left") ,(encode-for-pre (paste-title a)) + ,@(if (not (string= (paste-log-link a) "")) + `(" | " + ((a :href ,(paste-log-link a)) "Context in IRC logs"))))) (tr (td "By:") ((td :align "left") ,(encode-for-pre (paste-user a))))