r3254: *** empty log message ***

diff --git a/debian/changelog b/debian/changelog
index a9ecef411f0d3f488dc72a01dfd5371d84702aa7..759328422be8bf971a904a35c81a2842015e3884 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-pubmed (1.2-2) unstable; urgency=low
+
+  * Fix extraneous colon bug and change in XML tag from 
+  Descriptor to DescriptorName
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 30 Oct 2002 19:01:36 -0700
+
 cl-pubmed (1.1.1-1) unstable; urgency=low
 
   * README: Add prerequisites and installation instructions.

diff --git a/pubmed.lisp b/pubmed.lisp
index 56556cac923aa7380c17345529537507b9e96d3b..6b397a84e4b605656229d5d557f98e64a69711d2 100644 (file)
--- a/pubmed.lisp
+++ b/pubmed.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Jun 2001
 ;;;;
-;;;; $Id: pubmed.lisp,v 1.1 2002/10/26 17:06:07 kevin Exp $
+;;;; $Id: pubmed.lisp,v 1.2 2002/10/31 02:01:07 kevin Exp $
 ;;;;
 ;;;; This file, part of cl-pubmed, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -89,13 +89,13 @@
   "Return a string of publication data for an article"
   (let ((pubdata ""))
     (awhen (pub-date art)
-          (string-append pubdata (format nil "~a; " :it)))
+          (string-append pubdata (format nil "~a; " it)))
     (awhen (volume art)
-          (string-append pubdata :it))
+          (string-append pubdata it))
     (awhen (issue art)
-          (string-append pubdata (format nil "(~a)" :it)))
+          (string-append pubdata (format nil "(~a)" it)))
     (awhen (pages art)
-          (string-append pubdata (format nil ":~a" :it)))
+          (string-append pubdata (format nil ":~a" it)))
     pubdata))
 
 (defmethod disp-articleset ((artset pmarticleset) &key (os *standard-output*) (format :text)
@@ -113,7 +113,7 @@
              (title art)
              (list-to-delimited-string (authors art) ", ")
              (aif (affiliation art)
-                  (format nil "~a~%" :it) "")
+                  (format nil "~a~%" it) "")
              (journal art) (pmarticle-pubdata art)
              (if (abstract art) 
                  (if complete
@@ -262,11 +262,11 @@ XML string of PubMed search results and XML search status"
          (volume article) (xml-tag-contents "Volume" xmlstr ji-start ji-end)
          (issue article) (xml-tag-contents "Issue" xmlstr ji-start ji-end))
       (aif (xml-tag-contents "MedlineDate" xmlstr ji-start ji-end)
-          (setf (pub-date article) :it)
+          (setf (pub-date article) it)
           (setf (pub-date article)
             (concatenate 'string (xml-tag-contents "Year" xmlstr ji-start ji-end)
                          (aif (xml-tag-contents "Month" xmlstr ji-start ji-end)
-                              (format nil " ~a" :it)
+                              (format nil " ~a" it)
                               "")))))
          
     (multiple-value-bind (al-start al-end al-next)
@@ -319,7 +319,7 @@ XML string of PubMed search results and XML search status"
 
 (defun extract-mesh-heading (xmlstr start end)
   "Extract and format mesh headings from XML string"
-  (let ((desc (xml-tag-contents "Descriptor" xmlstr start end))
+  (let ((desc (xml-tag-contents "DescriptorName" xmlstr start end))
        (sh  (xml-tag-contents "SubHeading" xmlstr start end)))
     (if sh
        (format nil "~a(~a)" desc sh)