[Date Prev][Date Next][Thread Prev][][Date Index][Thread Index]

sb-heise.el update.



*** ChangeLog.~1.130.~	2008-06-29 00:52:35.000000000 +0200
--- ChangeLog	2008-07-07 08:03:56.000000000 +0200
***************
*** 1,6 ****
  2008-06-27  David Engster  <dengste@xxxxxx>
  
! 	* sb-heise.el: (shimbun-heise-content-start)
  	(shimbun-heise-content-end): Updated regexps.
  
  2008-06-25  Katsumi Yamaoka  <yamaoka@xxxxxxx>
--- 1,12 ----
+ 2008-07-07 David Hansen <david.hansen@xxxxxxx>
+ 
+ 	*sb-heise.el (shimbun-heise-content-start)
+ 	(shimbun-heise-content-end): Updated regexp.
+ 	(shimbun-heise-wash-newsticker-article): Update ad filtering.
+ 
  2008-06-27  David Engster  <dengste@xxxxxx>
  
! 	* sb-heise.el (shimbun-heise-content-start)
  	(shimbun-heise-content-end): Updated regexps.
  
  2008-06-25  Katsumi Yamaoka  <yamaoka@xxxxxxx>
Index: sb-heise.el
===================================================================
RCS file: /storage/cvsroot/emacs-w3m/shimbun/sb-heise.el,v
retrieving revision 1.20
diff -c -r1.20 sb-heise.el
*** sb-heise.el	27 Jun 2008 10:28:23 -0000	1.20
--- sb-heise.el	7 Jul 2008 06:04:16 -0000
***************
*** 38,46 ****
  
  
  (defvar shimbun-heise-content-start
!   "\\(<!-- Meldung -->\\|<!-- INHALT -->\\|<!-- HEISETEXT -->\\)")
  (defvar shimbun-heise-content-end
!   "\\(<!-- untere News-Navigation -->\\|<!-- INHALT -->\\|<!-- /HEISETEXT -->\\)")
  
  (defvar shimbun-heise-x-face-alist
    '(("default" . "X-Face: #RVD(kjrS;RY\"2yH]w.1U,ZC_DbR,9{tQnhyYe|,\\J)\"\
--- 38,47 ----
  
  
  (defvar shimbun-heise-content-start
!   "\\(<!-- Meldung -->\\|<!-- INHALT -->\\|<[^>]*HEISETEXT[^>]*>\\)")
  (defvar shimbun-heise-content-end
!   "\\(<!-- untere News-Navigation -->\\|<!-- INHALT -->\
! \\|<[^>]*/HEISETEXT[^>]*>\\)")
  
  (defvar shimbun-heise-x-face-alist
    '(("default" . "X-Face: #RVD(kjrS;RY\"2yH]w.1U,ZC_DbR,9{tQnhyYe|,\\J)\"\
***************
*** 117,124 ****
                              (string-to-number month)
                              (string-to-number day)
                              "00:00"
!                             ;; FIXME: timezone is always wrong, slightly better than
!                             ;; the default "+0900"
                              "+0000")
                             mid "" 0 0 url) headers)))))))))
      headers))
--- 118,125 ----
                              (string-to-number month)
                              (string-to-number day)
                              "00:00"
!                             ;; FIXME: timezone is always wrong, slightly better
!                             ;; than the default "+0900"
                              "+0000")
                             mid "" 0 0 url) headers)))))))))
      headers))
***************
*** 149,155 ****
  	      (string-to-number (match-string 3)) ; year
  	      (string-to-number (match-string 2)) ; month
  	      (string-to-number (match-string 1)) ; day
! 	      (match-string 4)		; time
  	      ;; FIXME: timezone is always wrong, slightly better than the
  	      ;; default "+0900"
  	      "+0000"))))))
--- 150,156 ----
  	      (string-to-number (match-string 3)) ; year
  	      (string-to-number (match-string 2)) ; month
  	      (string-to-number (match-string 1)) ; day
! 	      (match-string 4)                    ; time
  	      ;; FIXME: timezone is always wrong, slightly better than the
  	      ;; default "+0900"
  	      "+0000"))))))
***************
*** 175,192 ****
  
      ;; strip ads
      (goto-char (point-min))
!     (let ((regexp-ad-begin "<!-- Meldung -->\\|<HEISETEXT>")
! 	  (regexp-ad-end "<!-- untere News-Navigation -->")
! 	  (regexp-ad "<!--OAS AD=\"Middle[0-9]*\"-->")
! 	  (bound-min) (bound-max))
!       (when (setq bound-min (re-search-forward regexp-ad-begin nil t nil))
! 	(when (setq bound-max (re-search-forward regexp-ad-end nil t nil))
! 	  (goto-char bound-min)
! 	  (while (re-search-forward regexp-ad bound-max t nil)
! 	    (let ((begin-region (re-search-backward "<table" bound-min t nil))
! 		  (end-region (re-search-forward "</table>" bound-max t nil)))
! 	      (when (and begin-region end-region)
! 		(delete-region begin-region end-region)))))))))
  
  
  (defun shimbun-heise-wash-telepolis-article (header)
--- 176,185 ----
  
      ;; strip ads
      (goto-char (point-min))
!     (let (beg end)
!       (while (and (setq beg (re-search-forward "<!-- b?cadv -->" nil t))
!                   (setq end (re-search-forward "<!-- /b?cadv -->" nil t)))
!         (delete-region beg end)))))
  
  
  (defun shimbun-heise-wash-telepolis-article (header)