*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fb3f61..0b01a47 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+1999-11-11 14:32:48  Steinar Bang  <sb@metis.no>
+
+       * nnweb.el (nnweb-type-definition): /=dnc
+
 1999-11-11 10:58:38  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * nnultimate.el (nnultimate-retrieve-headers): Work with american

diff --git a/lisp/nnultimate.el b/lisp/nnultimate.el
index ff30cc9..161f898 100644 (file)
--- a/lisp/nnultimate.el
+++ b/lisp/nnultimate.el
@@ -83,7 +83,7 @@
           headers article subject score from date lines parent point
           contents tinfo fetchers map elem a href garticles topic old-max
           inc datel table string current-page total-contents pages
-          farticles forum-contents parse furl-fetched)
+          farticles forum-contents parse furl-fetched mmap farticle)
       (setq map mapping)
       (while (and (setq article (car articles))
                  map)
@@ -288,7 +288,7 @@
         (furl "forumdisplay.cgi?action=topics&number=%d&DaysPrune=1000")
         (furls (list (concat nnultimate-address (format furl sid))))
         contents forum-contents furl-fetched a subject href
-        garticles topic tinfo old-max inc)
+        garticles topic tinfo old-max inc parse)
     (with-temp-buffer
       (while furls
        (erase-buffer)

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index dddc8bc..611f8cc 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -57,18 +57,18 @@
 Valid types include `dejanews', `dejanewsold', `reference',
 and `altavista'.")
 
-(defvoo nnweb-type-definition
+(defvar nnweb-type-definition
   '((dejanews
      (article . nnweb-dejanews-wash-article)
      (map . nnweb-dejanews-create-mapping)
      (search . nnweb-dejanews-search)
-     (address . "http://x8.dejanews.com/dnquery.xp")
+     (address . "http://www.deja.com/=dnc/qs.xp")
      (identifier . nnweb-dejanews-identity))
     (dejanewsold
      (article . nnweb-dejanews-wash-article)
      (map . nnweb-dejanews-create-mapping)
      (search . nnweb-dejanewsold-search)
-     (address . "http://x8.dejanews.com/dnquery.xp")
+     (address . "http://wwww.deja.com/dnquery.xp")
      (identifier . nnweb-dejanews-identity))
     (reference
      (article . nnweb-reference-wash-article)
@@ -131,11 +131,14 @@ and `altavista'.")
             (not (equal group nnweb-group))
             (not nnweb-ephemeral-p))
     (let ((info (assoc group nnweb-group-alist)))
-      (setq nnweb-group group)
-      (setq nnweb-type (nth 2 info))
-      (setq nnweb-search (nth 3 info))
-      (unless dont-check
-       (nnweb-read-overview group))))
+      (when info
+       (setq nnweb-group group)
+       (setq nnweb-type (nth 2 info))
+       (setq nnweb-search (nth 3 info))
+       (unless dont-check
+         (nnweb-read-overview group)))))
+  (unless dont-check
+    (nnweb-request-scan group))
   (cond
    ((not nnweb-articles)
     (nnheader-report 'nnweb "No matching articles"))
@@ -432,17 +435,24 @@ and `altavista'.")
       (replace-match "" t t))))
 
 (defun nnweb-dejanews-search (search)
-  (nnweb-fetch-form
-   (nnweb-definition 'address)
-   `(("query" . ,search)
-     ("defaultOp" . "AND")
-     ("svcclass" . "dncurrent")
-     ("maxhits" . "100")
-     ("format" . "verbose2")
-     ("threaded" . "0")
-     ("showsort" . "date")
-     ("agesign" . "1")
-     ("ageweight" . "1")))
+  (nnweb-insert
+   (concat
+    (nnweb-definition 'address)
+    "?"
+    (nnweb-encode-www-form-urlencoded
+     `(("ST" . "PS")
+       ("svcclass" . "dnyr")
+       ("QRY" . ,search)
+       ("defaultOp" . "AND")
+       ("DBS" . "1")
+       ("OP" . "dnquery.xp")
+       ("LNG" . "ALL")
+       ("maxhits" . "100")
+       ("threaded" . "0")
+       ("format" . "verbose2")
+       ("showsort" . "date")
+       ("agesign" . "1")
+       ("ageweight" . "1")))))
   t)
 
 (defun nnweb-dejanewsold-search (search)