diff --git a/src/protocol/rewrite/rewrite.c b/src/protocol/rewrite/rewrite.c index 4ed81830..7e8c4c51 100644 --- a/src/protocol/rewrite/rewrite.c +++ b/src/protocol/rewrite/rewrite.c @@ -118,8 +118,7 @@ static union option_info uri_rewrite_options[] = { INIT_OPT_DUMB_PREFIX("bug", ELINKS_BUGS_URL), INIT_OPT_DUMB_PREFIX("arc", "http://web.archive.org/web/*/%c"), - INIT_OPT_DUMB_PREFIX("cia", "http://cia.navi.cx/"), - INIT_OPT_DUMB_PREFIX("b", "http://babelfish.altavista.com/babelfish/tr"), + INIT_OPT_DUMB_PREFIX("cia", "http://cia.vc/"), INIT_OPT_DUMB_PREFIX("d", "http://www.dict.org"), INIT_OPT_DUMB_PREFIX("ddg", "http://duckduckgo.com/?t=elinks"), INIT_OPT_DUMB_PREFIX("g", "http://www.google.com/"), @@ -131,11 +130,10 @@ static union option_info uri_rewrite_options[] = { INIT_OPT_DUMB_PREFIX("dpkg", "http://packages.debian.org/"), /* Hm, is this Debian-centric? -- Miciah */ /* Well, does anyone but Debian use lua40 naming convention? --pasky */ - INIT_OPT_DUMB_PREFIX("lua", "file:///usr/share/doc/lua40-doc/manual/idx.html"), + /* lua5.1 may be a more standard format. --KON */ + INIT_OPT_DUMB_PREFIX("lua", "file:///usr/share/doc/lua5.1-doc/doc/contents.html#index"), INIT_OPT_DUMB_PREFIX("pycur", "http://www.python.org/doc/current/"), INIT_OPT_DUMB_PREFIX("pydev", "http://www.python.org/dev/doc/devel/"), - INIT_OPT_DUMB_PREFIX("pyhelp", "http://starship.python.net/crew/theller/pyhelp.cgi"), - INIT_OPT_DUMB_PREFIX("pyvault", "http://www.vex.net/parnassus/"), INIT_OPT_DUMB_PREFIX("e2", "http://www.everything2.org/"), INIT_OPT_DUMB_PREFIX("sd", "http://slashdot.org/"), INIT_OPT_DUMB_PREFIX("vhtml", "http://validator.w3.org/check?uri=%c"), @@ -153,17 +151,13 @@ static union option_info uri_rewrite_options[] = { #endif INIT_OPT_SMART_PREFIX("arc", "http://web.archive.org/web/*/%s"), - INIT_OPT_SMART_PREFIX("bb", "http://babelfish.altavista.com/babelfish/tr?urltext=%s"), - INIT_OPT_SMART_PREFIX("bb_fr_en", "http://babelfish.altavista.com/babelfish/tr?lp=fr_en&submit=1&urltext=%s"), - INIT_OPT_SMART_PREFIX("bb_en_fr", "http://babelfish.altavista.com/babelfish/tr?lp=en_fr&submit=1&urltext=%s"), INIT_OPT_SMART_PREFIX("cambridge", "http://dictionary.cambridge.org/results.asp?searchword=%s"), - INIT_OPT_SMART_PREFIX("cliki", "http://www.cliki.net/admin/search?words=%s"), + INIT_OPT_SMART_PREFIX("cliki", "http://www.cliki.net/site/search?words=%s"), INIT_OPT_SMART_PREFIX("d", "http://www.dict.org/bin/Dict?Query=%s&Form=Dict1&Strategy=*&Database=*&submit=Submit+query"), INIT_OPT_SMART_PREFIX("ddg", "http://duckduckgo.com/?q=%s&t=elinks"), INIT_OPT_SMART_PREFIX("dmoz", "http://search.dmoz.org/cgi-bin/search?search=%s"), - INIT_OPT_SMART_PREFIX("foldoc", "http://wombat.doc.ic.ac.uk/foldoc/foldoc.cgi?%s"), + INIT_OPT_SMART_PREFIX("foldoc", "http://foldoc.org/?%s"), INIT_OPT_SMART_PREFIX("g", "http://www.google.com/search?q=%s&btnG=Google+Search"), - INIT_OPT_SMART_PREFIX("gd", "http://www.google.com/search?q=%s&cat=gwd/Top"), /* Whose idea was it to use 'gg' for websearches? -- Miciah */ /* INIT_OPT_SMART_PREFIX("gg", "http://groups.google.com/groups?q=%s"), */ INIT_OPT_SMART_PREFIX("gg", "http://www.google.com/search?q=%s&btnG=Google+Search"), @@ -172,51 +166,37 @@ static union option_info uri_rewrite_options[] = { INIT_OPT_SMART_PREFIX("go", "http://www.google.com/search?q=%s&btnG=Google+Search"), INIT_OPT_SMART_PREFIX("gr", "http://groups.google.com/groups?q=%s"), INIT_OPT_SMART_PREFIX("google", "http://www.google.com/search?q=%s"), - INIT_OPT_SMART_PREFIX("gwho", "http://www.googlism.com/?ism=%s&name=1"), - INIT_OPT_SMART_PREFIX("gwhat", "http://www.googlism.com/?ism=%s&name=2"), - INIT_OPT_SMART_PREFIX("gwhere", "http://www.googlism.com/?ism=%s&name=3"), - INIT_OPT_SMART_PREFIX("gwhen", "http://www.googlism.com/?ism=%s&name=4"), + INIT_OPT_SMART_PREFIX("gwho", "http://www.googlism.com/search/?ism=%s&type=1"), + INIT_OPT_SMART_PREFIX("gwhat", "http://www.googlism.com/search/?ism=%s&type=2"), + INIT_OPT_SMART_PREFIX("gwhere", "http://www.googlism.com/search/?ism=%s&type=3"), + INIT_OPT_SMART_PREFIX("gwhen", "http://www.googlism.com/search/?ism=%s&type=4"), INIT_OPT_SMART_PREFIX("fm", "http://freshmeat.net/search/?q=%s"), INIT_OPT_SMART_PREFIX("savannah", "http://savannah.nongnu.org/search/?words=%s&type_of_search=soft&exact=1"), INIT_OPT_SMART_PREFIX("sf", "http://sourceforge.net/search/?q=%s"), INIT_OPT_SMART_PREFIX("sfp", "http://sourceforge.net/projects/%s"), - INIT_OPT_SMART_PREFIX("sd", "http://slashdot.org/search.pl?query=%s"), - INIT_OPT_SMART_PREFIX("sdc", "http://slashdot.org/search.pl?query=%s&op=comments"), - INIT_OPT_SMART_PREFIX("sdu", "http://slashdot.org/search.pl?query=%s&op=users"), - INIT_OPT_SMART_PREFIX("sdp", "http://slashdot.org/search.pl?query=%s&op=polls"), - INIT_OPT_SMART_PREFIX("sdj", "http://slashdot.org/search.pl?query=%s&op=journals"), INIT_OPT_SMART_PREFIX("dbug", "http://bugs.debian.org/%s"), INIT_OPT_SMART_PREFIX("dpkg", "http://packages.debian.org/%s"), INIT_OPT_SMART_PREFIX("emacs", "http://www.emacswiki.org/cgi-bin/wiki.pl?search=%s"), - INIT_OPT_SMART_PREFIX("lyrics", "http://music.lycos.com/lyrics/results.asp?QT=L&QW=%s"), INIT_OPT_SMART_PREFIX("lxr", "http://lxr.linux.no/ident?i=%s"), INIT_OPT_SMART_PREFIX("onelook", "http://onelook.com/?w=%s&ls=a"), - INIT_OPT_SMART_PREFIX("py", "http://starship.python.net/crew/theller/pyhelp.cgi?keyword=%s&version=current"), - INIT_OPT_SMART_PREFIX("pydev", "http://starship.python.net/crew/theller/pyhelp.cgi?keyword=%s&version=devel"), - INIT_OPT_SMART_PREFIX("pyvault", "http://py.vaults.ca/apyllo.py?find=%s"), INIT_OPT_SMART_PREFIX("e2", "http://www.everything2.org/?node=%s"), INIT_OPT_SMART_PREFIX("encz", "http://www.slovnik.cz/bin/ecd?ecd_il=1&ecd_vcb=%s&ecd_trn=translate&ecd_trn_dir=0&ecd_lines=15&ecd_hptxt=0"), INIT_OPT_SMART_PREFIX("czen", "http://www.slovnik.cz/bin/ecd?ecd_il=1&ecd_vcb=%s&ecd_trn=translate&ecd_trn_dir=1&ecd_lines=15&ecd_hptxt=0"), INIT_OPT_SMART_PREFIX("dict", "http://dictionary.reference.com/search?q=%s"), INIT_OPT_SMART_PREFIX("thes", "http://thesaurus.reference.com/search?q=%s"), - INIT_OPT_SMART_PREFIX("a", "http://acronymfinder.com/af-query.asp?String=exact&Acronym=%s"), - INIT_OPT_SMART_PREFIX("imdb", "http://imdb.com/Find?%s"), + INIT_OPT_SMART_PREFIX("a", "http://www.acronymfinder.com/af-query.asp?String=exact&Acronym=%s"), + INIT_OPT_SMART_PREFIX("imdb", "http://www.imdb.com/find?q=%s"), INIT_OPT_SMART_PREFIX("mw", "http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=%s"), INIT_OPT_SMART_PREFIX("mwt", "http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=%s"), - INIT_OPT_SMART_PREFIX("whatis", "http://uptime.netcraft.com/up/graph/?host=%s"), INIT_OPT_SMART_PREFIX("wiki", "http://en.wikipedia.org/w/wiki.phtml?search=%s"), - INIT_OPT_SMART_PREFIX("wn", "http://www.cogsci.princeton.edu/cgi-bin/webwn1.7.1?stage=1&word=%s"), + INIT_OPT_SMART_PREFIX("wn", "http://wordnetweb.princeton.edu/perl/webwn?s=%s"), /* Search the Free Software Directory */ - INIT_OPT_SMART_PREFIX("fsd", "http://directory.fsf.org/search/fsd-search.py?q=%s"), + INIT_OPT_SMART_PREFIX("fsd", "http://directory.fsf.org/wiki?title=Special%3ASearch&search=%s"), /* rfc by number */ INIT_OPT_SMART_PREFIX("rfc", "http://www.rfc-editor.org/rfc/rfc%s.txt"), /* rfc search */ - INIT_OPT_SMART_PREFIX("rfcs", "http://www.rfc-editor.org/cgi-bin/rfcsearch.pl?searchwords=%s&format=http&abstract=abson&keywords=keyon&num=25"), - INIT_OPT_SMART_PREFIX("cr", "http://www.rfc-editor.org/cgi-bin/rfcsearch.pl?searchwords=%s&format=http&abstract=abson&keywords=keyon&num=25"), - /* Internet Draft search */ - INIT_OPT_SMART_PREFIX("rfcid", "http://www.rfc-editor.org/cgi-bin/idsearch.pl?searchwords=%s&format=http&abstract=abson&keywords=keyon&num=25"), - INIT_OPT_SMART_PREFIX("id", "http://www.rfc-editor.org/cgi-bin/idsearch.pl?searchwords=%s&format=http&abstract=abson&keywords=keyon&num=25"), - INIT_OPT_SMART_PREFIX("draft", "http://www.rfc-editor.org/cgi-bin/idsearch.pl?searchwords=%s&format=http&abstract=abson&keywords=keyon&num=25"), + INIT_OPT_SMART_PREFIX("rfcs", "http://www.rfc-editor.org/cgi-bin/rfcsearch.pl?searchwords=%s&filefmt=txt&format=http&abstract=abson&keywords=keyon&num=25"), + INIT_OPT_SMART_PREFIX("cr", "http://www.rfc-editor.org/cgi-bin/rfcsearch.pl?searchwords=%s&filefmt=txt&format=http&abstract=abson&keywords=keyon&num=25"), NULL_OPTION_INFO, };