[Surfraw-commits] [surfraw] 01/01: Updates W-Y and associated tests
jason ryan
jasonwryan-guest at moszumanska.debian.org
Thu Mar 9 06:19:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
jasonwryan-guest pushed a commit to branch kyle/https-elvi
in repository surfraw.
commit 830e81afcb4b43a56491dc546317a1654fcfcb57
Author: Jason Ryan <jasonwryan at gmail.com>
Date: Thu Mar 9 19:16:53 2017 +1300
Updates W-Y and associated tests
---
elvi/w3css | 4 +--
elvi/w3html | 6 ++---
elvi/w3link | 4 +--
elvi/w3rdf | 4 +--
elvi/wayback | 4 +--
elvi/webster | 4 +--
elvi/wetandwild | 27 -------------------
elvi/wikipedia | 49 ++++------------------------------
elvi/wolfram | 2 +-
elvi/worldwidescience | 4 +--
elvi/yacy | 73 ---------------------------------------------------
elvi/yahoo | 4 +--
elvi/yandex | 4 +--
elvi/youtube | 4 +--
elvi/yubnub | 26 ------------------
test/w3css.test | 4 +--
test/w3html.test | 2 +-
test/w3link.test | 2 +-
test/wetandwild.test | 3 ---
test/wikipedia.test | 4 ---
test/yubnub.test | 2 --
21 files changed, 31 insertions(+), 205 deletions(-)
diff --git a/elvi/w3css b/elvi/w3css
index 3631884..7e9170d 100755
--- a/elvi/w3css
+++ b/elvi/w3css
@@ -57,10 +57,10 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://jigsaw.w3.org/css-validator/"
+ w3_browse_url "https://jigsaw.w3.org/css-validator/"
else
escaped_args=`w3_url_of_arg $w3_args`
- url="http://jigsaw.w3.org/css-validator/validator?uri=${escaped_args}&warning=${SURFRAW_w3css_warnings}&profile=${SURFRAW_w3css_profile}&usermedium=${SURFRAW_w3css_medium}"
+ url="https://jigsaw.w3.org/css-validator/validator?uri=${escaped_args}&warning=${SURFRAW_w3css_warnings}&profile=${SURFRAW_w3css_profile}&usermedium=${SURFRAW_w3css_medium}"
w3_browse_url "${url}"
fi
diff --git a/elvi/w3html b/elvi/w3html
index 2cddf67..c94b70b 100755
--- a/elvi/w3html
+++ b/elvi/w3html
@@ -74,12 +74,12 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
if [ $SURFRAW_w3html_usage -eq 1 ]; then
- w3_browse_url "http://validator.w3.org/docs/users.html#Options"
+ w3_browse_url "https://validator.w3.org/docs/users.html#Options"
elif test -z "$w3_args"; then
- w3_browse_url "http://validator.w3.org/"
+ w3_browse_url "https://validator.w3.org/"
else
escaped_args=`w3_url_of_arg $w3_args`
- url="http://validator.w3.org/check?uri=${escaped_args}&charset=${SURFRAW_w3html_encoding}&doctype=${SURFRAW_w3html_doctype}"
+ url="https://validator.w3.org/check?uri=${escaped_args}&charset=${SURFRAW_w3html_encoding}&doctype=${SURFRAW_w3html_doctype}"
if [ $SURFRAW_w3html_encodingfallback -eq 1 ]
then
url="${url}&fbc=1"
diff --git a/elvi/w3link b/elvi/w3link
index 40ed1fa..90b2b9a 100755
--- a/elvi/w3link
+++ b/elvi/w3link
@@ -59,10 +59,10 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://validator.w3.org/checklink"
+ w3_browse_url "https://validator.w3.org/checklink"
else
escaped_args=`w3_url_of_arg $w3_args`
- url="http://validator.w3.org/checklink?uri=${escaped_args}&depth=${SURFRAW_w3link_depth}"
+ url="https://validator.w3.org/checklink?uri=${escaped_args}&depth=${SURFRAW_w3link_depth}"
if [ $SURFRAW_w3link_recurse -eq 1 -o $SURFRAW_w3link_depth -ge 0 ]
then
url="${url}&recursive=on"
diff --git a/elvi/w3rdf b/elvi/w3rdf
index 3f065af..2795321 100755
--- a/elvi/w3rdf
+++ b/elvi/w3rdf
@@ -104,10 +104,10 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://www.w3.org/RDF/Validator/"
+ w3_browse_url "https://www.w3.org/RDF/Validator/"
else
escaped_args=`w3_url_of_arg $w3_args`
- url="http://www.w3.org/RDF/Validator/ARPServlet?PARSE=PARSE_URI&URI=${escaped_args}&TRIPLES_AND_GRAPH=${SURFRAW_w3rdf_output}&FORMAT=${SURFRAW_w3rdf_format}&NODE_COLOR=${SURFRAW_w3rdf_node}&NODE_TEXT_COLOR=${SURFRAW_w3rdf_nodetext}&EDGE_COLOR=${SURFRAW_w3rdf_arc}&EDGE_TEXT_COLOR=${SURFRAW_w3rdf_arctext}&FONT_SIZE=${SURFRAW_w3rdf_fontsize}&ORIENTATION=${SURFRAW_w3rdf_orientation}"
+ url="https://www.w3.org/RDF/Validator/ARPServlet?PARSE=PARSE_URI&URI=${escaped_args}&TRIPLES_AND_GRAPH=${SURFRAW_w3rdf_output}&FORMAT=${SURFRAW_w3rdf_format}&NODE_COLOR=${SURFRAW_w3rdf_node}&NODE_TEXT_COLOR=${SURFRAW_w3rdf_nodetext}&EDGE_COLOR=${SURFRAW_w3rdf_arc}&EDGE_TEXT_COLOR=${SURFRAW_w3rdf_arctext}&FONT_SIZE=${SURFRAW_w3rdf_fontsize}&ORIENTATION=${SURFRAW_w3rdf_orientation}"
if [ $SURFRAW_w3rdf_savedot -eq 1 ]
then
url="${url}&SAVE_DOT_FILE=on"
diff --git a/elvi/wayback b/elvi/wayback
index 5058c9b..af0eb30 100755
--- a/elvi/wayback
+++ b/elvi/wayback
@@ -15,9 +15,9 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://www.archive.org/"
+ w3_browse_url "https://www.archive.org/"
else
escaped_args=`w3_url_of_arg $w3_args`
- url="http://www.archive.org/searchresults.php?mediatype=web&Submit=Take+Me+Back"
+ url="https://www.archive.org/searchresults.php?mediatype=web&Submit=Take+Me+Back"
w3_browse_url "${url}&search=${escaped_args}"
fi
diff --git a/elvi/webster b/elvi/webster
index a02627e..c7ed691 100755
--- a/elvi/webster
+++ b/elvi/webster
@@ -35,8 +35,8 @@ SURFRAW_quote_ifs=0
w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://www.merriam-webster.com/dictionary.htm"
+ w3_browse_url "https://www.merriam-webster.com/dictionary.htm"
else
escaped_args=`w3_url_of_arg $w3_args`
- w3_browse_url "http://www.merriam-webster.com/${SURFRAW_webster_book}/${escaped_args}"
+ w3_browse_url "https://www.merriam-webster.com/${SURFRAW_webster_book}/${escaped_args}"
fi
diff --git a/elvi/wetandwild b/elvi/wetandwild
deleted file mode 100755
index a5017ff..0000000
--- a/elvi/wetandwild
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# $Id$
-# elvis: wetandwild -- Real time weather information (many sources)
-. surfraw || exit 1
-
-
-w3_usage_hook () {
- cat <<EOF
-Usage: $w3_argv0 [options] [city[,state][;country]]
-Description:
- Surfraw real time weather information (weather channel)
-Bugs:
- This elvi is named "wetandwild" instead of "weather" due to
- conflicts with a common tcl/expect script of the same name.
-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://www.weather.com/"
-else
- escaped_args=`w3_url_of_arg $w3_args`
- w3_browse_url "http://www.weather.com/search/enhanced?whatprefs=&what=WeatherLocalUndeclared&lswe=&lswa=&from=whatwhere&where=${escaped_args}"
-fi
diff --git a/elvi/wikipedia b/elvi/wikipedia
index 850d7e6..5b2e091 100755
--- a/elvi/wikipedia
+++ b/elvi/wikipedia
@@ -6,8 +6,6 @@
w3_config_hook () {
def SURFRAW_wikipedia_language "$SURFRAW_lang"
-# default to off until we know the ssl site is going to stick around
-defyn SURFRAW_wikipedia_ssl no
defyn SURFRAW_wikipedia_deletionpedia no
def SURFRAW_wikipedia_fallback wikipedia
}
@@ -18,15 +16,9 @@ Usage: $w3_argv0 [options] [search-string]
Description:
Search the Wikipedia online encyclopedia
Local options:
- -s Uses experimental HTTPS secure connection.
- Environment: SURFRAW_wikipedia_ssl
-language=ISOCODE | -l=ISOCODE Two letter language code (resembles ISO country codes)
Default: en
Environment: SURFRAW_wikipedia_language, SURFRAW_lang
- -d If page doesn't exist, also search Deletionpedia
- -f=w|d, -fallback= If page not found in wikipedia OR deletionpedia,
- wikipedia | fallback to searching which site
- deletionpedia Default: wikipedia. Implies -d.
Examples:
$w3_argv0 -language=de Richard Stallman
@@ -38,12 +30,8 @@ w3_parse_option_hook () {
opt="$1"
optarg="$2"
case "$opt" in
- -language=*) setopt SURFRAW_wikipedia_language $optarg ;;
- -l=*) setopt SURFRAW_wikipedia_language $optarg ;;
- -s*) setoptyn SURFRAW_wikipedia_ssl yes ;;
- -d) setoptyn SURFRAW_wikipedia_deletionpedia yes ;;
- -f*=*) setopt SURFRAW_wikipedia_fallback $optarg ; \
- setoptyn SURFRAW_wikipedia_deletionpedia yes ;;
+ -language=*) setopt SURFRAW_wikipedia_language $optarg ;;
+ -l=*) setopt SURFRAW_wikipedia_language $optarg ;;
*) return 1 ;;
esac
return 0
@@ -58,40 +46,13 @@ if [ -z "$SURFRAW_wikipedia_language" ]; then
SURFRAW_wikipedia_language="en"
fi
-prefix="http://${SURFRAW_wikipedia_language}.wikipedia.org/w/wiki.phtml?search="
-prefixs="https://secure.wikimedia.org/wikipedia/${SURFRAW_wikipedia_language}/w/index.php?search="
+prefix="https://${SURFRAW_wikipedia_language}.wikipedia.org/wiki/index.php?search="
suffix="&go=Go"
if null "$w3_args"; then
- if ifyes SURFRAW_wikipedia_ssl ; then
- w3_browse_url "https://secure.wikimedia.org/wikipedia/${SURFRAW_wikipedia_language}/wiki/Main_Page"
- else
- w3_browse_url "http://${SURFRAW_wikipedia_language}.wikipedia.org"
- fi
+ w3_browse_url "https://${SURFRAW_wikipedia_language}.wikipedia.org/wiki/Main_Page"
else
escaped_args=`w3_url_of_arg $w3_args`
-
- if ifyes SURFRAW_wikipedia_deletionpedia
- then
- if [ "$SURFRAW_wikipedia_language" != "en" ]
- then
- err "Deletionpedia only archives from the english (en) wikipedia, other languages are not supported"
- fi
-
- url="http://erislabs.net/ianb/webtools/wpdp/"
- url="${url}?q=${escaped_args}"
- case "$SURFRAW_wikipedia_fallback" in
- w*) url="${url}&f=wp" ;;
- d*) url="${url}&f=dp" ;;
- esac
- w3_browse_url "$url"
- else
-
- if ifyes SURFRAW_wikipedia_ssl ; then
- w3_browse_url "${prefixs}${escaped_args}"
- else
- w3_browse_url "${prefix}${escaped_args}${suffix}"
- fi
- fi
+ w3_browse_url "${prefix}${escaped_args}"
fi
diff --git a/elvi/wolfram b/elvi/wolfram
index 939786a..95960d3 100755
--- a/elvi/wolfram
+++ b/elvi/wolfram
@@ -34,7 +34,7 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
-SURFRAW_wolfram_base_url="http://${SURFRAW_wolfram_base_url}"
+SURFRAW_wolfram_base_url="https://${SURFRAW_wolfram_base_url}"
escaped_args=`w3_url_of_arg $w3_args`
diff --git a/elvi/worldwidescience b/elvi/worldwidescience
index 76a1bf4..487433e 100755
--- a/elvi/worldwidescience
+++ b/elvi/worldwidescience
@@ -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://worldwidescience.org/"
+ w3_browse_url "https://worldwidescience.org/"
else
escaped_args=`w3_url_of_arg $w3_args`
- w3_browse_url "http://worldwidescience.org/wws/result-list/fullRecord:${escaped_args}/"
+ w3_browse_url "https://worldwidescience.org/wws/result-list/fullRecord:${escaped_args}/"
fi
diff --git a/elvi/yacy b/elvi/yacy
deleted file mode 100755
index 6cd91aa..0000000
--- a/elvi/yacy
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-# elvis: yacy -- Search YaCy P2P search, including ScienceNet
-. surfraw || exit 1
-
-w3_config_hook () {
- def SURFRAW_yacy_results "$SURFRAW_results"
- def SURFRAW_yacy_site search.yacy.net
- defyn SURFRAW_yacy_image no
- defyn SURFRAW_yacy_indexonly no
-}
-
-w3_usage_hook () {
- cat <<EOF
-Usage: $w3_argv0 [options] [search words]...
-Description:
- Surfraw search YaCy P2P search, including ScienceNet
-Local options:
- -i, -images Image Search
- -I, -indexonly Constrain search to index pages
- -S search ScienceNet (sciencenet.kit.edu)
- -s=SITE, --site=SITE Search SITE
- Default: $SURFRAW_yacy_site
- Environment: SURFRAW_yacy_site
- -results=NUM Number of search results returned
- Default: $SURFRAW_yacy_results
- Environment: SURFRAW_yacy_results
-EOF
- w3_global_usage
-}
-
-w3_parse_option_hook () {
- opt="$1"
- optarg="$2"
- case "$opt" in
- -i|-ima*) setoptyn SURFRAW_yacy_image yes ;;
- -I|-ind*) setoptyn SURFRAW_yacy_indexonly yes ;;
- -S) setopt SURFRAW_yacy_site sciencenet.kit.edu ;;
- -s=*) setopt SURFRAW_yacy_site "$optarg" ;;
- -r*=*) setopt SURFRAW_yacy_results "$optarg" ;;
- *) return 1 ;;
- esac
- return 0
-}
-
-w3_config
-w3_parse_args "$@"
-
-url="http://${SURFRAW_yacy_site}/"
-
-if test -z "$w3_args" ; then
- w3_browse_url "$url"
-else
- escaped_args=$(w3_url_of_arg $w3_args)
- url="${url}yacysearch.html?query=${escaped_args}&maximumRecords=${SURFRAW_yacy_results}"
-
- searchtype=text
- if ifyes SURFRAW_yacy_image
- then
- searchtype=image
- fi
- url="${url}&contentdom=${searchtype}"
-
- if ifyes SURFRAW_yacy_indexonly
- then
- url="${url}&indexof=on"
- fi
-
- url="${url}&Enter=Suchen&verify=ifexist&contentdom=text&nav=filetype%2Cprotocol%2Chosts%2Cnamespace%2Ctopics&startRecord=0&indexof=off&meanCount=5&resource=global&prefermaskfilter="
-
- w3_browse_url "$url"
-fi
-
-
diff --git a/elvi/yahoo b/elvi/yahoo
index ba62c2f..c9b0943 100755
--- a/elvi/yahoo
+++ b/elvi/yahoo
@@ -34,8 +34,8 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://www.yahoo.com/"
+ w3_browse_url "https://www.yahoo.com/"
else
escaped_args=`w3_url_of_arg $w3_args`
- w3_browse_url "http://search.yahoo.com/search?p=${escaped_args}&n=${SURFRAW_yahoo_results}"
+ w3_browse_url "https://search.yahoo.com/search?p=${escaped_args}&n=${SURFRAW_yahoo_results}"
fi
diff --git a/elvi/yandex b/elvi/yandex
index fb9c014..a131c12 100755
--- a/elvi/yandex
+++ b/elvi/yandex
@@ -43,8 +43,8 @@ w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://${SURFRAW_yandex_domain}yandex.ru/"
+ w3_browse_url "https://${SURFRAW_yandex_domain}yandex.ru/"
else
escaped_args=`w3_url_of_arg $w3_args`
- w3_browse_url "http://${SURFRAW_yandex_domain}yandex.ru/${SURFRAW_yandex_search}=${escaped_args}"
+ w3_browse_url "https://${SURFRAW_yandex_domain}yandex.ru/${SURFRAW_yandex_search}=${escaped_args}"
fi
diff --git a/elvi/youtube b/elvi/youtube
index 49a6e94..b005d92 100755
--- a/elvi/youtube
+++ b/elvi/youtube
@@ -20,8 +20,8 @@ EOF
w3_config
w3_parse_args "$@"
if test -z "$w3_args"; then
- w3_browse_url "http://www.youtube.com/"
+ w3_browse_url "https://www.youtube.com/"
else
escaped_args=`w3_url_of_arg $w3_args`
- w3_browse_url "http://www.youtube.com/results?search_query=${escaped_args}"
+ w3_browse_url "https://www.youtube.com/results?search_query=${escaped_args}"
fi
diff --git a/elvi/yubnub b/elvi/yubnub
deleted file mode 100755
index 47b0b51..0000000
--- a/elvi/yubnub
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# elvis: yubnub -- Use the social command-line for the web (yubnub.org)
-# initial implementation by Iain D Broadfoot, ripped from the freshmeat elvi
-. surfraw || exit 1
-
-w3_usage_hook () {
- cat <<EOF
-Usage: $w3_argv0 [options] [command] [arguments]
-Description:
- Run a yubnub command
-EOF
- w3_global_usage
-}
-
-w3_config
-# disable requoting, yubnub commands often need protecting from
-# the shell with quotes but without those quotes passed on to yubnub
-SURFRAW_quote_ifs=0
-w3_parse_args "$@"
-# w3_args now contains a list of arguments
-if test -z "$w3_args"; then
- w3_browse_url "http://www.yubnub.org/"
-else
- escaped_args=`w3_url_of_arg $w3_args`
- w3_browse_url "http://yubnub.org/parser/parse?command=${escaped_args}"
-fi
diff --git a/test/w3css.test b/test/w3css.test
index 02c40f6..a8c8332 100644
--- a/test/w3css.test
+++ b/test/w3css.test
@@ -1,2 +1,2 @@
-w3css http://erislabs.net/ianb/ianb.css
-This document validates as
+w3css http://www.miromiro.com/index.html
+CSS Validator results for
diff --git a/test/w3html.test b/test/w3html.test
index b41f75a..79ed773 100644
--- a/test/w3html.test
+++ b/test/w3html.test
@@ -1,2 +1,2 @@
w3html http://surfraw.alioth.debian.org/
-The document located at
+Validation Output:
diff --git a/test/w3link.test b/test/w3link.test
index 9f59d92..6f929db 100644
--- a/test/w3link.test
+++ b/test/w3link.test
@@ -1,2 +1,2 @@
-w3link http://erislabs.net/ianb/private/surfraw-test.html
+w3link http://www.miromiro.com/surfraw/index.html
Valid links!
diff --git a/test/wetandwild.test b/test/wetandwild.test
deleted file mode 100644
index 23313ac..0000000
--- a/test/wetandwild.test
+++ /dev/null
@@ -1,3 +0,0 @@
-wetandwild preston kingdom
-Preston, United Kingdom
-
diff --git a/test/wikipedia.test b/test/wikipedia.test
index d068ea6..f8092df 100644
--- a/test/wikipedia.test
+++ b/test/wikipedia.test
@@ -1,6 +1,2 @@
wikipedia surfraw
Julian Assange
-wikipedia -d surfraw
-Julian Assange
-wikipedia -d darktide
-Deletionpedia
diff --git a/test/yubnub.test b/test/yubnub.test
deleted file mode 100644
index d76fc4a..0000000
--- a/test/yubnub.test
+++ /dev/null
@@ -1,2 +0,0 @@
-yubnub wp surfraw
-Julian
--
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