X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mixi-atom.el;h=3c955e927f52ba8c04b2955943544600591c396a;hb=6c5715573f3f081d5840f74474c9e124346656a3;hp=add935bf7de11b3352b0229ecd39b0b933addabe;hpb=1cb706d7fc9dfca40b5c795178cf25a201b0153e;p=elisp%2Fmixi.git

diff --git a/mixi-atom.el b/mixi-atom.el
index add935b..3c955e9 100644
--- a/mixi-atom.el
+++ b/mixi-atom.el
@@ -49,6 +49,11 @@
   :type 'string
   :group 'mixi)
 
+(defcustom mixi-atom-file "~/atom.xml"
+  "*File name for `mixi-make-atom-file'."
+  :group 'mixi
+  :type 'string)
+
 (defcustom mixi-atom-syndication-list
   '((mixi-get-diaries . 10))
   "*A list of atom syndication definition.
@@ -103,18 +108,17 @@ RANGE is the range for getting articles.  If RANGE is nil, get all articles."
 		    (concat entries (mixi-make-atom-entry object)))
 	      (when (mixi-parent-p object)
 		(let ((comments (mixi-get-comments object range)))
-		  (mapc (lambda (comment)
-			  (setq entries
-				(concat entries
-					(mixi-make-atom-entry comment))))
-			comments))))
-	  objects)
+		  (while comments
+		    (setq entries
+			  (concat entries
+				  (mixi-make-atom-entry (car comments))))
+		    (setq comments (cdr comments))))))
+	    objects)
     entries))
 
-;;;###autoload
 (defun mixi-make-atom ()
   "Make Atom Syndication Format"
-  (insert "<?xml version=\"1.0\" encoding=\""
+  (concat "<?xml version=\"1.0\" encoding=\""
 	  (symbol-name mixi-atom-coding-system) "\"?>\n"
 	  "<feed xmlns=\"" mixi-atom-namespace "\">\n"
 	  "\n"
@@ -141,11 +145,19 @@ RANGE is the range for getting articles.  If RANGE is nil, get all articles."
 	  "</feed>\n"))
 
 ;;;###autoload
-(defun mixi-atom-write-file (file)
+(defun mixi-atom-cgi ()
+  (princ (concat "Content-Type: application/atom+xml; charset="
+		 (symbol-name mixi-atom-coding-system) "\n"
+		 "\n"
+		 (encode-coding-string (mixi-make-atom)
+				       mixi-atom-coding-system))))
+
+;;;###autoload
+(defun mixi-atom-file ()
   (with-temp-buffer
-    (mixi-make-atom)
+    (insert (mixi-make-atom))
     (let ((coding-system-for-write mixi-atom-coding-system)
-	  (file (expand-file-name file)))
+	  (file (expand-file-name mixi-atom-file)))
       (write-region (point-min) (point-max) file))))
 
 (provide 'mixi-atom)