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

[Ian Beckwith]

The following commit has been merged in the master branch:
commit 39bff2264624deee63ecf5b301b92539f44d454d
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Mon Oct 25 02:09:24 2010 +0100

    removed altavista - now just a frontend to yahoo

diff --git a/ChangeLog b/ChangeLog
index 63d79fc..c1ed1d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-10-25  Ian Beckwith  <ianb at erislabs.net>
 
 	* new elvi: scirus, scitopia, worldwidescience.
+	* removed altavista: is now just a front-end to yahoo.
 	* yahoo: reduced query string to just p and n options.
 	* openbsd: support -misc and -tech. Thanks to
 	  Sunil Nimmagadda for the patch.
diff --git a/elvi/altavista b/elvi/altavista
deleted file mode 100755
index 4ecec62..0000000
--- a/elvi/altavista
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-# $Id$
-# elvis: altavista	-- Search the web using Altavista (www.altavista.com)
-. surfraw || exit 1
-
-w3_config_hook () {
-def   SURFRAW_altavista_results $SURFRAW_results
-}
-
-w3_usage_hook () {
-    cat <<EOF
-Usage: $w3_argv0 [options] [search words]...
-Description:
-  Surfraw search the web using Altavista (www.altavista.com)
-Local options:
-  -results=NUM                  Number of search results returned
-                                Default: $SURFRAW_altavista_results
-				Environment: SURFRAW_altavista_results
-EOF
-    w3_global_usage
-}
-
-w3_parse_option_hook () {
-    opt="$1"
-    optarg="$2"
-    case "$opt" in
-	-results=*) setopt   SURFRAW_altavista_results $optarg	;;
-	*) return 1 ;;
-    esac
-    return 0
-}
-
-w3_config
-w3_parse_args "$@"
-# w3_args now contains a list of arguments
-if test -z "$w3_args"; then
-    w3_browse_url "http://www.altavista.com/"
-else
-    escaped_args=`w3_url_of_arg $w3_args`
-    w3_browse_url "http://www.altavista.com/web/results?nbq=${SURFRAW_altavista_results}&pg=aq&aqmode=s&aqo=${escaped_args}"
-fi
diff --git a/test/altavista.test b/test/altavista.test
deleted file mode 100644
index c9c4ebb..0000000
--- a/test/altavista.test
+++ /dev/null
@@ -1,2 +0,0 @@
-altavista foo
-Result Pages\:

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