[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 fc1af014689fe1a95fc6c74311a218cc7aba2d23
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Mon Oct 25 02:15:02 2010 +0100

    removed cddb: gracenote removed web site search

diff --git a/ChangeLog b/ChangeLog
index c1ed1d3..e6e471d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
 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.
+	* removed altavista: is now just a front-end to yahoo.
+	* removed cddb: gracenote made the "hard decision"
+	  to remove the website search. sigh.
 
 2010-08-22  Jameson Rollins <jrollins at finestructure.net>
 
diff --git a/elvi/cddb b/elvi/cddb
deleted file mode 100755
index 86d42a4..0000000
--- a/elvi/cddb
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# $Id$
-# elvis: cddb		-- Search for cd track listings in CDDB (www.gracenote.com)
-# ianb at erislabs.net 20030124
-
-. surfraw || exit 1
-
-w3_config_hook () {
-	def SURFRAW_cddb_search "artist" 
-}
-
-w3_usage_hook () {
-    cat <<EOF
-Usage: $w3_argv0 [options] [search words]...
-Description:
-  Surfraw search CDDB (www.gracenote.com) for cd track listings
-Local options:
-  -artists                      Search artists (Default)
-  -albums                       Search albums
-  -songs                        Search songs
-EOF
-    w3_global_usage
-}
-
-w3_parse_option_hook () {
-    opt="$1"
-    optarg="$2"
-    case "$opt" in
-	-ar*)  setopt SURFRAW_cddb_search  "artist" ;;
-	-alb*) setopt SURFRAW_cddb_search  "album"  ;;
-	-so*)  setopt SURFRAW_cddb_search  "track"  ;;
-	*) 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.gracenote.com/search/"
-else
-    escaped_args=`w3_url_of_arg $w3_args`
-    w3_browse_url "http://www.gracenote.com/search/?query=${escaped_args}&search_type=${SURFRAW_cddb_search}"
-fi
diff --git a/test/cddb.test b/test/cddb.test
deleted file mode 100644
index 02b3b17..0000000
--- a/test/cddb.test
+++ /dev/null
@@ -1,2 +0,0 @@
-cddb swans
-Displaying results <strong>\d+</strong> - <strong>\d+</strong> of <strong>\d+</strong> results

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