X-Git-Url: https://gitweb.fperrin.net/?p=atom.git;a=blobdiff_plain;f=atom.el;h=d159eed7029a85c69e9e33afe78739b0fb6fa599;hp=69179bff52fdd293367ea69c4e283873f4b3920b;hb=2f1f8729baa9edb46b8b65b101fdfd81e0a8a59e;hpb=f0a48850383ff8bff8977fdad5d88fabffdf6fcf

diff --git a/atom.el b/atom.el
index 69179bf..d159eed 100644
--- a/atom.el
+++ b/atom.el
@@ -66,25 +66,25 @@
 
 (require 'xml)
 
-(defun atom-create (title link &optional author self updated id)
+(defun atom-create (title link &optional self id author updated)
   "Create a new atom structure.
 
 TITLE is the title for the feed, a short, text-only, human
 readable string.
 
-AUTHOR is the author of the feed. See `atom-massage-author' for
-the possible ways to specify it.
-
-SELF is the canonical URL to this feed.
-
 LINK is the URL of a page responible for the content of this
 feed.
 
-UPDATED is the date the feed was last updated. If not given,
-`(current-time)' is used.
+SELF is the canonical URL to this feed.
 
 ID is a unique identifier for this feed. If not given, it
-defaults to LINK."
+defaults to SELF.
+
+AUTHOR is the author of the feed. See `atom-massage-author' for
+the possible ways to specify it.
+
+UPDATED is the date the feed was last updated. If not given,
+`(current-time)' is used."
   (let ((atom-feed (list (list 'title nil title))))
     (atom-modify-entry atom-feed 'link `(((href . ,link))))
     (atom-modify-entry atom-feed 'author (atom-massage-author author))
@@ -92,7 +92,7 @@ defaults to LINK."
 				`(((href . ,self) (rel . "self")
 				   (type . "application/atom+xml")))))
     (atom-modify-entry atom-feed 'updated (atom-format-time updated))
-    (atom-modify-entry atom-feed 'id (or id link))
+    (atom-modify-entry atom-feed 'id (or id self link))
     atom-feed))
 
 (defun atom-push-entry (atom entry)
@@ -148,10 +148,8 @@ when the content of the entry ."
 be a string enconding a valid HTML fragment. See `atom-add-entry'
 for additional details."
   (atom-add-entry atom
-   title link
-   (atom-massage-html content)
-   (and summary (atom-massage-html summary))
-   updated id))
+   title link (atom-massage-html content)
+   updated id (and summary (atom-massage-html summary))))
 
 (defun atom-add-xhtml-entry (atom title link content
 				  &optional updated id summary)
@@ -159,10 +157,8 @@ for additional details."
 given either as a string, or as an XML tree, of a valid XHTML
 fragment. See `atom-add-entry' for additional details."
   (atom-add-entry atom
-   title link
-   (atom-massage-xhtml content)
-   (and summary	(atom-massage-xhtml summary))
-   updated id))
+   title link (atom-massage-xhtml content)
+   updated id (and summary (atom-massage-xhtml summary))))
 
 (defun atom-print (atom)
   "Print the Atom feed ATOM in the current buffer."
@@ -171,6 +167,12 @@ fragment. See `atom-add-entry' for additional details."
   (xml-print atom)
   (insert "\n</feed>"))
 
+(defun atom-write-file (atom filename)
+  "Writes the feed ATOM to FILENAME."
+  (with-temp-buffer
+    (atom-print atom)
+    (write-region (point-min) (point-max) filename)))
+
 
 (defun atom-format-time (&optional time)
   "Format a time according to RFC3339."
@@ -189,17 +191,18 @@ Atom feed. CONTENT must be a string."
 (defun atom-string-to-xml (string)
   "Convert STRING into a Lisp structure as used by `xml.el'."
   (with-temp-buffer
+    (insert "<div xmlns=\"http://www.w3.org/1999/xhtml\">")
     (insert string)
+    (insert "</div>")
     (xml-parse-region (point-min) (point-max))))
 
 (defun atom-massage-xhtml (content)
   "Massage CONTENT so it can be used as an XHTML fragment in an
 Atom feed."
-  (list '((type . "xhtml"))
-	`(div ((xmlns . "http://www.w3.org/1999/xhtml"))
-	      ,@(or (and (stringp content)
-			 (atom-string-to-xml content))
-		    content))))
+  `(((type . "xhtml"))
+    ,@(or (and (stringp content)
+	       (atom-string-to-xml content))
+	  content)))
 
 (defun atom-massage-author (author)
   "Return an XML node representing the author. AUTHOR can be: