[Surfraw-commits] [surfraw] 01/01: new elvi: gmane; fix elvi: openbsd; fix tests: ads, pgdoc, pin, yacy (but test 1 still fails, yacy down hopefully temporarily)
Ian Beckwith
ianb at moszumanska.debian.org
Sun Dec 8 21:40:00 UTC 2013
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 88c5f332d85d099a9d1dc9b7c2cd7329150e0b73
Author: Ian Beckwith <ianb at erislabs.net>
Date: Sun Dec 8 21:39:55 2013 +0000
new elvi: gmane;fix elvi: openbsd; fix tests: ads, pgdoc, pin, yacy (but test 1 still fails, yacy down hopefully temporarily)
---
AUTHORS | 2 +-
ChangeLog | 6 ++++
NEWS | 3 +-
README | 1 +
elvi/Makefile.am | 3 +-
elvi/gmane | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
elvi/openbsd | 2 +-
test/Makefile.am | 32 ++++++++++-----------
test/ads.test | 6 ++--
test/gmane.test | 4 +++
test/pgdoc.test | 2 +-
test/pin.test | 2 +-
test/runtests | 1 +
test/yacy.test | 6 ++--
14 files changed, 126 insertions(+), 29 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index e52c4c3..fa2027c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,7 +16,7 @@ Ian Beckwith <ianb at erislabs.net>
finkpkg, rpmsearch, macports, debpkghome, debvcsbrowse,
scroogle, scirus, scitopia, worldwidescience,
debcodesearch, jquery, mdn, mysqldoc, pgdoc,
- oraclesearch, S, yacy
+ oraclesearch, S, yacy, gmane
plus various tweaks/bugfixes/features.
Moritz Muehlenhoff <jmm at inutil.org>
diff --git a/ChangeLog b/ChangeLog
index 14a0247..10b9002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-08 Ian Beckwith <ianb at erislabs.net>
+
+ * new elvi: gmane
+ * openbsd -mail: use gmane (directly, not via gmane elvi)
+ * fix tests: ads, pgdoc, pin, yacy
+
2013-10-27 Ian Beckwith <ianb at erislabs.net>
* surfraw.IN: w3_custom_search_google: don't give full path to surfraw.
diff --git a/NEWS b/NEWS
index acabe4f..f80dffb 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ Sun Oct 6 02:17:09 BST 2013 - surfraw 2.2.9
+ cisco - search Cisco documentation
+ debcodesearch - search Debian codebase
+ github - search github
+ + gmane - search mailing lists
+ jquery - search jQuery documentation
+ mdn - search Mozilla Developer Network
+ mysqldoc - search MySQL documentation
@@ -40,7 +41,7 @@ Sun Oct 6 02:17:09 BST 2013 - surfraw 2.2.9
* removed -p (clashes with global print option), use -safe instead
* stopped -l[ucky] from clobbering -lh
+ google: changed -g option to -G to avoid clash with -g for graphical view
- * Fixed elvi: ask, ctan, deli, genportage, jamendo, javasun,
+ * Fixed elvi: ask, ctan, deli, genportage, jamendo, javasun, openbsd
musicbrainz, rae, slashdot, slinuxdoc
* Removed elvi for dead sites: happypenguin, scroogle, sunonesearch (replaced by oraclesearch)
* w3_custom_search
diff --git a/README b/README
index 57ec203..d311461 100644
--- a/README
+++ b/README
@@ -230,6 +230,7 @@ gcache -- Search the web using Google cache (www.google.com)
genbugs -- Search the Gentoo bug tracker (bugs.gentoo.org)
genportage -- Search gentoo-portage.com for packages
github -- Search GitHub (https://github.com)
+gmane -- Search mailing list with gmane (gmane.org)
google -- Search the web using Google (www.google.com)
gutenberg -- Search for books on Project Gutenberg (gutenberg.org)
imdb -- Search the Internet Movie Database (www.imdb.com)
diff --git a/elvi/Makefile.am b/elvi/Makefile.am
index e6d2a27..0bb99bb 100644
--- a/elvi/Makefile.am
+++ b/elvi/Makefile.am
@@ -60,8 +60,9 @@ dist_elvi_SCRIPTS = \
genbugs \
genportage \
github \
- gutenberg \
+ gmane \
google \
+ gutenberg \
imdb \
ixquick \
jamendo \
diff --git a/elvi/gmane b/elvi/gmane
new file mode 100755
index 0000000..23dc35e
--- /dev/null
+++ b/elvi/gmane
@@ -0,0 +1,85 @@
+#!/bin/sh
+# elvis: gmane -- Search mailing list with gmane (gmane.org)
+. surfraw || exit 1
+
+w3_config_hook () {
+ defyn SURFRAW_gmane_or 0
+ defyn SURFRAW_gmane_listsearch 0
+ def SURFRAW_gmane_list ""
+ def SURFRAW_gmane_author ""
+ def SURFRAW_gmane_sort "relevance"
+}
+
+w3_usage_hook () {
+ cat <<EOF
+Usage: $w3_argv0 [options] [search words]...
+Description:
+ Surfraw search mailing lists with gmane (gmane.org)
+Local options:
+ -list=LIST Search list(s)
+ eg -l=gmane.os.openbsd.vax or -l="gmane.os.openbsd.*"
+ -L Search by list name instead of contents
+ -author=NAME Limit search to posts by NAME
+ Default: $SURFRAW_gmane_results
+ Environment: SURFRAW_gmane_results
+ -sort= Sort by:
+ relevance Relevance
+ date Newest first
+ revdate Oldest first
+ -or OR search results instead of ANDing.
+EOF
+ w3_global_usage
+}
+
+w3_parse_option_hook () {
+ opt="$1"
+ optarg="$2"
+ case "$opt" in
+ -li*=*) setopt SURFRAW_gmane_group "$optarg" ;;
+ -au*=*) setopt SURFRAW_gmane_author "$optarg" ;;
+ -so*=*) setopt SURFRAW_gmane_sort "$optarg" ;;
+ -L) setoptyn SURFRAW_gmane_listsearch 1 ;;
+ -or) setoptyn SURFRAW_gmane_or 1 ;;
+ *) return 1 ;;
+ esac
+ return 0
+}
+
+w3_config
+w3_parse_args "$@"
+
+if test -z "$w3_args"
+then
+ if ifyes SURFRAW_gmane_listsearch
+ then
+ url=http://gmane.org/find.php
+ else
+ url=http://search.gmane.org/
+ fi
+else
+ escaped_args=`w3_url_of_arg $w3_args`
+ if ifyes SURFRAW_gmane_listsearch
+ then
+ url="http://dir.gmane.org/search.php?match=${escaped_args}"
+ else
+ url="http://search.gmane.org/?query=${escaped_args}&sort=${SURFRAW_gmane_sort}"
+ if [ "$SURFRAW_gmane_author" != "" ]
+ then
+ url="${url}&author=${SURFRAW_gmane_author}"
+ fi
+ if ifyes SURFRAW_gmane_or
+ then
+ url="${url}&DEFAULTOP=or"
+ else
+ url="${url}&DEFAULTOP=and"
+ fi
+ if [ "${SURFRAW_gmane_group}" != "" ]
+ then
+ url="${url}&group=${SURFRAW_gmane_group}"
+ fi
+ fi
+fi
+
+w3_browse_url "$url"
+
+
diff --git a/elvi/openbsd b/elvi/openbsd
index e2ac3dc..53ef839 100755
--- a/elvi/openbsd
+++ b/elvi/openbsd
@@ -74,7 +74,7 @@ if ok SURFRAW_openbsd_mail; then
if test -z "$escaped_args"; then
w3_browse_url "http://www.openbsd.org/mail.html"
else
- w3_browse_url "http://groups.google.com/groups?q=group%3Amailing.openbsd.*+${escaped_args}&hl=en"
+ w3_browse_url "http://search.gmane.org/?query=${escaped_args}&sort=relevance&DEFAULTOP=and&group=gmane.os.openbsd.*"
fi
exit $?
fi
diff --git a/test/Makefile.am b/test/Makefile.am
index 8cb74a9..86e8c73 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,22 +11,22 @@ EXTRA_DIST = runtests elviwithouttests README COOKIES W.test S.test \
duckduckgo.test ebay.test etym.test excite.test f5.test \
finkpkg.test foldoc.test freebsd.test freedb.test \
freshmeat.test fsfdir.test gcache.test genbugs.test \
- genportage.test github.test google.test gutenberg.test \
- imdb.test ixquick.test jamendo.test javasun.test jquery.test \
- lastfm.test leodict.test l1sp.test lsm.test macports.test \
- mathworld.test mdn.test mininova.test musicbrainz.test \
- mysqldoc.test netbsd.test ntrs.test openbsd.test \
- openports.test opensearch.test oraclesearch.test pasearch.test \
- pgdoc.test phpdoc.test pin.test piratebay.test pgpkeys.test \
- priberam.test pubmed.test rae.test rfc.test rhyme.test \
- rpmsearch.test scholar.test scicom.test scitopia.test \
- scirus.test scpan.test slashdot.test slinuxdoc.test \
- sourceforge.test springer.test stack.test stockquote.test \
- thesaurus.test translate.test urban.test w3css.test \
- w3html.test w3link.test w3rdf.test wayback.test webster.test \
- wetandwild.test wikipedia.test wolfram.test woffle.test \
- worldwidescience.test yacy.test yahoo.test yandex.test \
- youtube.test yubnub.test
+ genportage.test github.test gmane.test google.test \
+ gutenberg.test imdb.test ixquick.test jamendo.test \
+ javasun.test jquery.test lastfm.test leodict.test l1sp.test \
+ lsm.test macports.test mathworld.test mdn.test mininova.test \
+ musicbrainz.test mysqldoc.test netbsd.test ntrs.test \
+ openbsd.test openports.test opensearch.test oraclesearch.test \
+ pasearch.test pgdoc.test phpdoc.test pin.test piratebay.test \
+ pgpkeys.test priberam.test pubmed.test rae.test rfc.test \
+ rhyme.test rpmsearch.test scholar.test scicom.test \
+ scitopia.test scirus.test scpan.test slashdot.test \
+ slinuxdoc.test sourceforge.test springer.test stack.test \
+ stockquote.test thesaurus.test translate.test urban.test \
+ w3css.test w3html.test w3link.test w3rdf.test wayback.test \
+ webster.test wetandwild.test wikipedia.test wolfram.test \
+ woffle.test worldwidescience.test yacy.test yahoo.test \
+ yandex.test youtube.test yubnub.test
test:
./runtests
diff --git a/test/ads.test b/test/ads.test
index 36c3291..109c045 100644
--- a/test/ads.test
+++ b/test/ads.test
@@ -1,4 +1,2 @@
-ads lightcurve
-The asteroid lightcurve database
-ads keplerian elements
-Equations for the Keplerian Elements: Hidden Symmetry
+ads rawlings adamson whittet
+extinction properties
diff --git a/test/gmane.test b/test/gmane.test
new file mode 100644
index 0000000..d7b468f
--- /dev/null
+++ b/test/gmane.test
@@ -0,0 +1,4 @@
+gmane -l="gmane.os.openbsd.*" Raadt
+Theo
+gmane -L openbsd
+gmane.os.openbsd
diff --git a/test/pgdoc.test b/test/pgdoc.test
index d0f0bbd..02e121a 100644
--- a/test/pgdoc.test
+++ b/test/pgdoc.test
@@ -1,4 +1,4 @@
SURFRAW_customsearch_provider=duckduckgo pgdoc select
SELECT.*DISTINCT
SURFRAW_customsearch_provider=duckduckgo pgdoc -v=9.1 select
-Documentation: 9.1
+Documentation:.*9.1
diff --git a/test/pin.test b/test/pin.test
index fd72006..bbdc0b1 100644
--- a/test/pin.test
+++ b/test/pin.test
@@ -1,2 +1,2 @@
pin surfraw
-fast unix command line interface
+Shell Users
diff --git a/test/runtests b/test/runtests
index e5e40ee..15a4568 100755
--- a/test/runtests
+++ b/test/runtests
@@ -186,6 +186,7 @@ sub testelvis
else
{
print "FAIL: No Match";
+# print $content;
push(@results,$FAIL);
}
}
diff --git a/test/yacy.test b/test/yacy.test
index 08d6451..234af52 100644
--- a/test/yacy.test
+++ b/test/yacy.test
@@ -1,4 +1,4 @@
yacy yacy
-by the people, for the people
-yacy -S CERN
-European Organization for Nuclear Research
+yacy
+yacy -S cern
+CERN
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/surfraw/surfraw.git
More information about the Surfraw-commits
mailing list