From bbc7d0c188864157278106929e47947e7a8ddaa3 Mon Sep 17 00:00:00 2001
From: Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
Date: Wed, 31 May 2006 23:09:05 +0000
Subject: [PATCH] (nnir-retrieve-headers): Revert last change; we might as well
 see message-ids instead of article numbers. (nnir-request-article): Actually
 check for message-ids.

---
 contrib/ChangeLog |  6 ++++++
 contrib/nnir.el   | 42 ++++++++++++++++++++++++++----------------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index ba7f1dacf..ffd1526f1 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-01  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+	* nnir.el (nnir-retrieve-headers): Revert last change; we might as well
+	see message-ids instead of article numbers.
+	(nnir-request-article): Actually check for message-ids.
+
 2006-06-01  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* nnir.el (nnir-run-swish++): Compressed files might not have .gz
diff --git a/contrib/nnir.el b/contrib/nnir.el
index 9c49133b5..f72466913 100644
--- a/contrib/nnir.el
+++ b/contrib/nnir.el
@@ -801,6 +801,11 @@ and show thread that contains this article."
 	  server)
       (while (not (null artlist))
         (setq art (car artlist))
+        (or (numberp art)
+            (nnheader-report
+             'nnir
+             "nnir-retrieve-headers doesn't grok message ids: %s"
+             art))
         (setq artitem (nnir-artlist-article nnir-artlist art))
         (setq artrsv (nnir-artitem-rsv artitem))
         (setq artfullgroup (nnir-artitem-group artitem))
@@ -849,22 +854,27 @@ and show thread that contains this article."
 
 (deffoo nnir-request-article (article
                               &optional group server to-buffer)
-  (save-excursion
-    (let* ((artitem (nnir-artlist-article nnir-artlist
-                                          article))
-           (artfullgroup (nnir-artitem-group artitem))
-           (artno (nnir-artitem-number artitem))
-           ;; Bug?
-           ;; Why must we bind nntp-server-buffer here?  It won't
-           ;; work if `buf' is used, say.  (Of course, the set-buffer
-           ;; line below must then be updated, too.)
-           (nntp-server-buffer (or to-buffer nntp-server-buffer)))
-      (set-buffer nntp-server-buffer)
-      (erase-buffer)
-      (message "Requesting article %d from group %s"
-               artno artfullgroup)
-      (gnus-request-article artno artfullgroup nntp-server-buffer)
-      (cons artfullgroup artno))))
+  (if (stringp article)
+      (nnheader-report
+       'nnir
+       "nnir-retrieve-headers doesn't grok message ids: %s"
+       article)
+    (save-excursion
+      (let* ((artitem (nnir-artlist-article nnir-artlist
+					    article))
+	     (artfullgroup (nnir-artitem-group artitem))
+	     (artno (nnir-artitem-number artitem))
+	     ;; Bug?
+	     ;; Why must we bind nntp-server-buffer here?  It won't
+	     ;; work if `buf' is used, say.  (Of course, the set-buffer
+	     ;; line below must then be updated, too.)
+	     (nntp-server-buffer (or to-buffer nntp-server-buffer)))
+	(set-buffer nntp-server-buffer)
+	(erase-buffer)
+	(message "Requesting article %d from group %s"
+		 artno artfullgroup)
+	(gnus-request-article artno artfullgroup nntp-server-buffer)
+	(cons artfullgroup artno)))))
 
 
 (nnoo-define-skeleton nnir)
-- 
2.34.1