;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Jun 2001
;;;;
-;;;; $Id: pubmed-src.lisp,v 1.1 2003/06/06 22:04:05 kevin Exp $
+;;;; $Id: pubmed-src.lisp,v 1.2 2003/06/12 11:10:38 kevin Exp $
;;;;
;;;; This file, part of cl-pubmed, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
(define-condition pubmed-server-error (error pubmed-condition)
((response :initarg :response
:initform nil
- :reader pubmed-server-error-response))
+ :reader pubmed-condition-response))
(:report (lambda (c stream)
(format stream "A PubMed server error occurred.")
- (awhen (pubmed-server-error-response c)
+ (awhen (pubmed-condition-response c)
(format stream " The server response was:~&~S" it)))))
(define-condition pubmed-query-error (error pubmed-condition)
((response :initarg :response
:initform nil
- :reader pubmed-query-error-response))
+ :reader pubmed-condition-response))
(:report (lambda (c stream)
(format stream "A PubMed server error occurred.")
- (awhen (pubmed-query-error-response c)
+ (awhen (pubmed-condition-response c)
(format stream " The server response was:~&~S" it)))))
;;; Article-Set and Article Classes
(string-append ref (format nil ":~a" it)))
ref))
-(defmethod print-article-set ((artset pm-article-set) &key (os *standard-output*) (format :text)
- (complete nil) (print-link t))
+(defmethod print-article-set ((artset pm-article-set)
+ &key (os *standard-output*) (format :text)
+ (complete nil) (print-link nil))
"Display an article set to specified stream in specified format"
(dotimes (i (articles-count artset))
(print-article (nth i (articles artset)) :os os :format format
artset)
(defmethod print-article ((art pm-article) &key (os *standard-output*)
- (format :text) (complete nil) (print-link t))
+ (format :text) (complete nil) (print-link nil))
"Display an article"
(ecase format
(:text
(:html
(let ((has-link (or (article-abstract art) (article-mesh-headings art))))
(when (and print-link has-link)
- (format os "<a href=\"~a?key=~a\">" (make-url "print-article") (article-pmid art)))
- (format os "<div class=\"article-title\">~a</div>~%" (article-title art))
+ (format os "<a href=\"~A\">" (funcall print-link
+ (article-pmid art))))
+ (format os "<div class=\"article-title\">~a</div>~%"
+ (article-title art))
(when (and print-link has-link)
(format os "</a>"))
(format os "<div class=\"article-authors\">~a</div>~%"