[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-95-g7c30b08

[Ian Beckwith]

The following commit has been merged in the master branch:
commit 6afd13a5aeb69547b92ca102a1e64afc03271300
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Tue Mar 2 02:54:30 2010 +0000

    cnn: fix URL. cnn.test: disable, needs javascript

diff --git a/ChangeLog b/ChangeLog
index 58e35c3..f49e298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
 	  autoreconf -vi
 	* Add autotools-generated files to .gitignore
 	* Bump version to 2.2.7
+	* cnn: fix URL.
+	* cnn.test: Disable. Bloody CNN now needs javascript for search,
+	  so should be tested manually.
 	* W, yahoo: fix tests.
 	* Update AUTHORS.
 	* Add a note to appendix 1 of HACKING about updating AUTHORS.
diff --git a/elvi/cnn b/elvi/cnn
index 1faeb69..1c316ce 100755
--- a/elvi/cnn
+++ b/elvi/cnn
@@ -21,5 +21,5 @@ if test -z "$w3_args"; then
     w3_browse_url "http://cnn.com/"
 else
     escaped_args=`w3_url_of_arg $w3_args`
-    w3_browse_url "http://search.cnn.com/search?query=${escaped_args}&type=news&sortBy=date"
+    w3_browse_url "http://www.cnn.com/search/?query=${escaped_args}&x=0&y=0&primaryType=mixed"
 fi
diff --git a/test/cnn.test b/test/cnn.test
index 2e6df86..fe4cec2 100644
--- a/test/cnn.test
+++ b/test/cnn.test
@@ -1,3 +1,2 @@
-cnn president
-Results <b><label id="resultStartLabel">1</label>-<label id="resultEndLabel">10</label>
+SKIP Needs javascript <sigh>
 

-- 
surfraw -  a fast unix command line interface to WWW