[Surfraw-commits] [surfraw] 01/02: google: change -g to -G; cisco: fix

[Ian Beckwith]

This is an automated email from the git hooks/post-receive script.

ianb pushed a commit to branch 2.2.9_release_candidate
in repository surfraw.

commit 3e8d0c58b2f5e81b60dca3a8ce76e3518e22021b
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Sat Oct 5 19:28:24 2013 +0100

    google: change -g to -G; cisco: fix
---
 ChangeLog       |    6 ++++++
 elvi/cisco      |    2 +-
 elvi/google     |    4 ++--
 test/cisco.test |    2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25f6d5b..f6ff7d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-05  Ian Beckwith  <ianb at erislabs.net>
+
+	* google: -g for groups clashed with -g for graphical browser.
+	  Invoke groups with -G, -gr, -groups or -search=groups.
+	* cisco: fix elvi & test.
+
 2013-09-30  Ian Beckwith  <ianb at erislabs.net>
 
 	* new elvi: mdn, mysqldoc, pgdoc, phpdoc
diff --git a/elvi/cisco b/elvi/cisco
index 10994dc..c33867e 100755
--- a/elvi/cisco
+++ b/elvi/cisco
@@ -21,5 +21,5 @@ if test -z "$w3_args"; then
 else
     escaped_args=`w3_url_of_arg $w3_args`
 #    w3_browse_url "http://tools.cisco.com/search/JSP/search-results.get?strQueryText=${escaped_args}&Search+All+cisco.com=cisco.com"
-	w3_browse_url "http://tools.cisco.com/search/results/en/us/get#q=${escaped_args}"
+	w3_browse_url "http://tools.cisco.com/search/results/en/us/get?q=${escaped_args}&js=0"
 fi
diff --git a/elvi/google b/elvi/google
index a10f917..df180c3 100755
--- a/elvi/google
+++ b/elvi/google
@@ -40,7 +40,7 @@ Local options:
   -v, -videos                   Video Search (same as -search=videos)
   -m, -maps                     Map Search (same as -search=maps)
   -n, -news                     News Search (same as -search=news)
-  -g, -groups                   Groups Search (same as -search=groups)
+  -G, -groups                   Groups Search (same as -search=groups)
   -safe=                        Safe Search level
         default         |       Default: $SURFRAW_google_safe
 	off             |       Environment: SURFRAW_google_safe
@@ -63,7 +63,7 @@ w3_parse_option_hook () {
     -v*)        setopt   SURFRAW_google_search  videos    ;;
     -m*)        setopt   SURFRAW_google_search  maps      ;;
     -n|-news)   setopt   SURFRAW_google_search  news      ;;
-    -g|-groups) setopt   SURFRAW_google_search  groups    ;;
+    -G|-gr|-groups) setopt   SURFRAW_google_search  groups    ;;
     *) return 1 ;;
     esac
     return 0
diff --git a/test/cisco.test b/test/cisco.test
index df74e11..aee6e49 100644
--- a/test/cisco.test
+++ b/test/cisco.test
@@ -1,2 +1,2 @@
 cisco netflow
-Cisco IOS*NetFlow
+Cisco IOS.*NetFlow

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/surfraw/surfraw.git