[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, 2.2.9_release_candidate, updated. surfraw_2-2-5_1-247-g7b76034

[Ian Beckwith]

The following commit has been merged in the 2.2.9_release_candidate branch:
commit 7b76034afabc8ef26ca84525e4c03a25a43e764a
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Tue Oct 23 01:00:46 2012 +0100

    fix elvi: cisco, slinuxdoc; fix tests: acronym, bbcnews, bugzilla, cisco, cite, currency, discogs, excite, gcache, imdb, scholar

diff --git a/ChangeLog b/ChangeLog
index 3151abe..83403ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 2012-10-22  Ian Beckwith  <ianb at erislabs.net>
 
-	* slashdot: fixed elvi
-	* Removed elvi: scroogle (site gone).
-	* fixed tests: leodict, lastfm, openbsd[2], ixquick,
-	  fsfdir, github.
-	* test/Makefile.am: Added missing tests to EXTRA_DIST
+        * Fixed elvi: slashdot, slinuxdoc.
+        * Removed elvi: scroogle (site gone).
+        * Fixed tests: acronym, bbcnews, bugzilla, cisco, cite[1],
+	  discogs, excite, fsfdir, gcache, github, imdb, ixquick,
+	  lastfm, leodict, openbsd[2], scholar.
+        * test/Makefile.am: Added missing tests to EXTRA_DIST
 
 2012-06-28  Manolo Martínez  <manolo at austrohungaro.com>
 
diff --git a/elvi/cisco b/elvi/cisco
index 17d03fa..886db02 100755
--- a/elvi/cisco
+++ b/elvi/cisco
@@ -20,5 +20,5 @@ if test -z "$w3_args"; then
     w3_browse_url "http://tools.cisco.com/"
 else
     escaped_args=`w3_url_of_arg $w3_args`
-    w3_browse_url "http://tools.cisco.com/search/JSP/search-results.get?isFormSubmit=true&strQueryText=${escaped_args}"
+    w3_browse_url "http://tools.cisco.com/search/JSP/search-results.get?strQueryText=${escaped_args}&Search+All+cisco.com=cisco.com"
 fi
diff --git a/elvi/slinuxdoc b/elvi/slinuxdoc
index 39a4ed6..51a12f0 100755
--- a/elvi/slinuxdoc
+++ b/elvi/slinuxdoc
@@ -20,5 +20,5 @@ if test -z "$w3_args"; then
     w3_browse_url "http://www.tldp.org/"
 else
     escaped_args=`w3_url_of_arg $w3_args`
-    w3_browse_url "http://www.google.com/cse?cx=017644269519104757279%3Agm62gtzaoky&q=${escaped_args}&sa=go"
+    w3_browse_url "http://www.google.com/search?q=${escaped_args}+site:tldp.org"
 fi
diff --git a/test/acronym.test b/test/acronym.test
index dde1960..3607af8 100644
--- a/test/acronym.test
+++ b/test/acronym.test
@@ -1,7 +1,7 @@
 acronym -e NASA
 National Aeronautics and Space Administration \(USA\)
 acronym -u NASA
-National Association for the Advancement
+Azerbaijan
 acronym surfraw
 What does SURFRAW stand for\?
 acronym -f
diff --git a/test/bbcnews.test b/test/bbcnews.test
index 806fa20..86aea09 100644
--- a/test/bbcnews.test
+++ b/test/bbcnews.test
@@ -1,4 +1,4 @@
 bbcnews minister
-All Results <span>[(]\d+[)]
+\d+ results
 
 
diff --git a/test/bugzilla.test b/test/bugzilla.test
index 33cd491..cb43f01 100644
--- a/test/bugzilla.test
+++ b/test/bugzilla.test
@@ -10,11 +10,11 @@ bugzilla -s=apache ipv6
 bugs found
 bugzilla -s=freedesktop ipv6
 bugs found
-bugzilla -s=eclipse delete
+bugzilla -s=eclipse SQLIntegrityConstraintViolationException
 bugs found
 bugzilla -s=mandriva ipv6
 bugs found
-bugzilla -s=gentoo ipv6
+bugzilla -s=gentoo net-wireless/wimax
 bugs found
 bugzilla -s=novell ipv6
 bugs found
diff --git a/test/cisco.test b/test/cisco.test
index 2a23863..aee6e49 100644
--- a/test/cisco.test
+++ b/test/cisco.test
@@ -1,2 +1,2 @@
 cisco netflow
-Cisco IOS NetFlow
+Cisco IOS.*NetFlow
diff --git a/test/cite.test b/test/cite.test
index e5def9f..24b5d23 100644
--- a/test/cite.test
+++ b/test/cite.test
@@ -1,4 +1,5 @@
 cite functional
-\d+ documents found
+Results.*1 - 10
 cite -auth knuth
-\d+ documents found
+Results.*1 - 10
+
diff --git a/test/currency.test b/test/currency.test
index e07f141..2eba931 100644
--- a/test/currency.test
+++ b/test/currency.test
@@ -1,2 +1,2 @@
 currency -from=USD -to=GBP 1
-1 USD = \d+\.\d+ GBP
+1.*USD.*=.*\d+\.\d+.*GBP
diff --git a/test/discogs.test b/test/discogs.test
index 0c7aa15..7b4bc5b 100644
--- a/test/discogs.test
+++ b/test/discogs.test
@@ -1,2 +1,2 @@
 discogs radiohead
-\(\d+ results\)
+1 - 20
diff --git a/test/excite.test b/test/excite.test
index 2b39821..260105d 100644
--- a/test/excite.test
+++ b/test/excite.test
@@ -1,2 +1,2 @@
 excite foo
-search results 1\s*-\s*\d+\s+of
+Bunny Foo Foo
diff --git a/test/gcache.test b/test/gcache.test
index 8b8dd75..20d80be 100644
--- a/test/gcache.test
+++ b/test/gcache.test
@@ -1,4 +1,4 @@
 gcache www.mozilla.org
-http://www.google.com/intl/[A-Za-z]+/help/features_list.html#cached
+This is Google.*s cache of
 gcache -i www.openoffice.org
 cache:www.openoffice.org&hl=.*&strip=1
diff --git a/test/imdb.test b/test/imdb.test
index 1cbd3cf..37e91e1 100644
--- a/test/imdb.test
+++ b/test/imdb.test
@@ -3,6 +3,6 @@ Horror of Frankenstein
 imdb -category=Titles As Good as It Gets
 As Good as It Gets.*1997
 imdb -category=People Jet Li
-Beijing, China
+Lianjie
 imdb -category=Characters Ralph Wiggum
 son of Clancy and Sarah Wiggum
diff --git a/test/scholar.test b/test/scholar.test
index 6897da9..606accd 100644
--- a/test/scholar.test
+++ b/test/scholar.test
@@ -1,2 +1,2 @@
 scholar cosmology
-Results <b>\d+</b> - <b>\d+</b> of about
+About \d+.*results

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