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

[Ian Beckwith]

The following commit has been merged in the master branch:
commit f03582d023a96906998b68a070d2c3abfba2b126
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Tue Oct 27 02:10:22 2009 +0000

    fixed cia elvis

diff --git a/ChangeLog b/ChangeLog
index 2f5ce2b..6c3f556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	* test/Makefile.am: add debvcsbrowse.test to EXTRA_DIST
 	* Makefile.am: install-data-hook: remove execute flag
 	  from generated files surfraw.conf, elvi.1sr & surfraw.1.
+	* Fixed elvi: cia.
 	* Fixed tests: aur, debpts, lastfm.
 
 2009-10-20  Ian Beckwith  <ianb at erislabs.net>
diff --git a/elvi/cia b/elvi/cia
index 982e119..a974250 100755
--- a/elvi/cia
+++ b/elvi/cia
@@ -23,5 +23,5 @@ if test -z "$w3_args"; then
     w3_browse_url "https://www.cia.gov/"
 else
     escaped_args=`w3_url_of_arg $w3_args`
-    w3_browse_url "https://www.cia.gov/search?NS-collection=Everything&NS-search-page=results&NS-query=${escaped_args}"
+    w3_browse_url "https://www.cia.gov/search?q=${escaped_args}&site=&client=CIA&proxystylesheet=CIA&output=xml_no_dtd&myAction=%2Fsearch&submitMethod=get"
 fi
diff --git a/test/cia.test b/test/cia.test
index cae149d..5c9aecd 100644
--- a/test/cia.test
+++ b/test/cia.test
@@ -1,2 +1,2 @@
 cia england
-Search found [1-9]\d+ documents from \d+ searched
+<b>1 - 10</b>

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