[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 c03e25f60958fdb0672d0b9921c1a28ea801f2db
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Mon Oct 25 01:49:17 2010 +0100

    new elvi: scitopia, worldwidescience

diff --git a/AUTHORS b/AUTHORS
index 82532aa..c91d0e2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,7 +13,8 @@ Ian Beckwith <ianb at erislabs.net>
               opensearch, scholar, ctan, fsfdir, gutenberg, wayback,
               dmoz, w3html, w3link, w3css, w3rdf, debpts, rfc,
               sunonesearch, lsm, finkpkg, rpmsearch, macports,
-              debpkghome, debvcsbrowse, scroogle, duckduckgo
+              debpkghome, debvcsbrowse, scroogle, duckduckgo,
+	      scirus, scitopia, worldwidescience
         plus various tweaks/bugfixes/features.
 
 Moritz Muehlenhoff <jmm at informatik.uni-bremen.de>
diff --git a/ChangeLog b/ChangeLog
index e5f6b57..63d79fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2010-10-25  Ian Beckwith  <ianb at erislabs.net>
 
-	* new elvi: scirus.
+	* new elvi: scirus, scitopia, worldwidescience.
 	* 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/scholar b/elvi/scitopia
similarity index 54%
copy from elvi/scholar
copy to elvi/scitopia
index 877da95..a74a692 100755
--- a/elvi/scholar
+++ b/elvi/scitopia
@@ -1,24 +1,23 @@
 #!/bin/sh
-# $Id$
-# elvis: scholar		-- Search Google Scholar (scholar.google.com)
+# elvis: scitopia		-- Search for science with scitopia.org
 . surfraw || exit 1
 
 w3_usage_hook () {
     cat <<EOF
 Usage: $w3_argv0 [options] [search words]...
 Description:
-  Surfraw search Google Scholar (scholar.google.com)
+  Surfraw search for science with scitopia.org
 EOF
     w3_global_usage
 }
 
-
 w3_config
 w3_parse_args "$@"
 # w3_args now contains a list of arguments
+
 if test -z "$w3_args"; then
-    w3_browse_url "http://scholar.google.com/"
+    w3_browse_url "http://www.scitopia.org/scitopia/"
 else
     escaped_args=`w3_url_of_arg $w3_args`
-	w3_browse_url "http://scholar.google.com/scholar?q=${escaped_args}"
+    w3_browse_url "http://wwwscitopia.org/scitopia/result-list/fullRecord:${escaped_args}"
 fi
diff --git a/elvi/scirus b/elvi/worldwidescience
similarity index 52%
copy from elvi/scirus
copy to elvi/worldwidescience
index cf93ba9..c4ff6b8 100755
--- a/elvi/scirus
+++ b/elvi/worldwidescience
@@ -1,12 +1,12 @@
 #!/bin/sh
-# elvis: scirus		-- Search for science using Scirus (scirus.com)
+# elvis: worldwidescience		-- Search for science with www.worldwidescience.org
 . surfraw || exit 1
 
 w3_usage_hook () {
     cat <<EOF
 Usage: $w3_argv0 [options] [search words]...
 Description:
-  Surfraw search for science using Scirus (scirus.com)
+  Surfraw search for science with worldwidescience.org
 EOF
     w3_global_usage
 }
@@ -16,8 +16,8 @@ w3_parse_args "$@"
 # w3_args now contains a list of arguments
 
 if test -z "$w3_args"; then
-    w3_browse_url "http://www.scirus.com/"
+    w3_browse_url "http://worldwidescience.org/"
 else
     escaped_args=`w3_url_of_arg $w3_args`
-    w3_browse_url "http://scirus.com/srsapp/search?q=${escaped_args}&t=all&sort=0&g=s"
+    w3_browse_url "http://worldwidescience.org/wws/resultList/fullRecord:${escaped_args}"
 fi
diff --git a/test/scicom.test b/test/scitopia.test
similarity index 100%
copy from test/scicom.test
copy to test/scitopia.test
diff --git a/test/scicom.test b/test/worldwidescience.test
similarity index 100%
copy from test/scicom.test
copy to test/worldwidescience.test

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