diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-10-07 23:18:55 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-10-07 23:18:55 +0000 |
commit | 9a1fcb367eb404f3dc1206505a614aa8776f4378 (patch) | |
tree | 638679e3edc185bf6f823762d7a5f791061792bb | |
parent | 7c9849933c4aaa6c1fbf39a489b0459447d11d08 (diff) | |
download | ellinika-9a1fcb367eb404f3dc1206505a614aa8776f4378.tar.gz ellinika-9a1fcb367eb404f3dc1206505a614aa8776f4378.tar.bz2 |
Htdig does not support UTF-8, so drop it and use Google search instead.
Hopefully will switch to Swis once it is mature enough.
* graphics/google.png: New file.
* xml/uk/ellinika.xml: Remove htdig pages.
* xml/ru/ellinika.xml: Likewise
* xml/pl/ellinika.xml: Likewise
* xml/lingua.conf.in: (SEARCH): Use Google search.
git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@491 941c8c0f-9102-463b-b60b-cd22ce0e6858
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | graphics/google.png | bin | 0 -> 1536 bytes | |||
-rw-r--r-- | xml/lingua.conf.in | 87 | ||||
-rw-r--r-- | xml/pl/ellinika.xml | 23 | ||||
-rw-r--r-- | xml/ru/ellinika.xml | 6 | ||||
-rw-r--r-- | xml/uk/ellinika.xml | 26 |
6 files changed, 32 insertions, 121 deletions
@@ -1,3 +1,14 @@ +2007-10-08 Sergey Poznyakoff <gray@gnu.org.ua> + + Htdig does not support UTF-8, so drop it and use Google search + instead. Hopefully will switch to Swis once it is mature enough. + + * graphics/google.png: New file. + * xml/uk/ellinika.xml: Remove htdig pages. + * xml/ru/ellinika.xml: Likewise + * xml/pl/ellinika.xml: Likewise + * xml/lingua.conf.in: (SEARCH): Use Google search. + 2007-10-01 Sergey Poznyakoff <gray@gnu.org.ua> Relicense under GPLv3+ diff --git a/graphics/google.png b/graphics/google.png Binary files differnew file mode 100644 index 0000000..bc8ec92 --- /dev/null +++ b/graphics/google.png diff --git a/xml/lingua.conf.in b/xml/lingua.conf.in index 3569f8a..c376f99 100644 --- a/xml/lingua.conf.in +++ b/xml/lingua.conf.in @@ -13,8 +13,19 @@ <![CDATA[ <img src="graphics/audio.png" width="16" height="16" alt="[ sound ]" />]]> </SOUNDREF> - <SEARCH - ADD-INPUTS="config=ellinika.{@LANG},restrict=/{@LANG}/,lang={@LANG}" /> + <SEARCH ARGS="(list (lingua:gettext "Search"))"> + <![CDATA[ + <form method="get" + action="http://www.google.com/custom" + enctype="application/x-www-form-urlencoded"> + ~A <img src="graphics/google.png" alt="[Google]" width="75" height="32" /> + <input type="text" size="30" maxlength="255" name="q" value=""> + <input type="hidden" name="cof" value="L:http://ellinika.gnu.org.ua/graphics/parthenon-gnu.png;LW:180;LH:140;T:black;ALC:#ff3300;LC:#000099;BGC:white;AH:left;VLC:#660066;GL:0;" /> + + <input type="hidden" id="searchEllinika" name="sitesearch" checked="checked" value="ellinika.gnu.org.ua" /> + <input type="hidden" name="domains" value="ellinika.gnu.org.ua" /> + </form>]]> + </SEARCH> <GUILE> <![CDATA[ (use-modules (xmltools xmltrans) @@ -63,78 +74,6 @@ (tag attr text) (list "<div class=\"permanent-article\">" text "</div>")) -(xmltrans:end-tag - "htdig:nomatch" - (tag attr text) - (format #f -"<div class=\"htdig-result-header\"> -~A -</div> - -<div class=\"htdig-result-form\"> -<form method=\"get\" action=\"$(CGI)\"> -<input type=\"hidden\" name=\"exclude\" value=\"$&(EXCLUDE)\"> -~A: $(METHOD) -~A: $(FORMAT) -~A: $(SORT) -<br> -~A: -<input type=\"text\" size=\"30\" name=\"words\" value=\"$&(WORDS)\"> -<input type=\"submit\" value=\"~A\"> -~{~A~} -</form> -</div>" - (lingua:gettext "No matches were found for '$&(LOGICAL_WORDS)'") - (lingua:gettext "Match") - (lingua:gettext "Format") - (lingua:gettext "Sort by") - (lingua:gettext "New search") - (lingua:gettext "Search") - (lingua:expand-additional-inputs - (xmltrans:tag-attributes "LINGUA") - (lingua:attr "SEARCH" "ADD-INPUTS")))) - -(xmltrans:end-tag - "htdig:body" - (tag attr text) - (format #f -"<div class=\"htdig-result-form\"> -<form method=\"get\" action=\"$(CGI)\"> -<input type=\"hidden\" name=\"exclude\" value=\"$&(EXCLUDE)\"> -~A: $(METHOD) -~A: $(FORMAT) -~A: $(SORT) -<br> -~A: -<input type=\"text\" size=\"30\" name=\"words\" value=\"$&(WORDS)\"> -<input type=\"submit\" value=\"~A\"> -~{~A~} -</form> -</div> - -<div class=\"htdig-result-header\"> -~A -~A -</div> - -<div class=\"htdig-result-list\"> -$(HTSEARCH_RESULTS) -$(PAGEHEADER) -$(PREVPAGE) $(PAGELIST) $(NEXTPAGE) -</div>" - (lingua:gettext "Match") - (lingua:gettext "Format") - (lingua:gettext "Sort by") - (lingua:gettext "New search") - (lingua:gettext "Search") - (lingua:expand-additional-inputs - (xmltrans:tag-attributes "LINGUA") - (lingua:attr "SEARCH" "ADD-INPUTS")) - (lingua:gettext "Documents $(FIRSTDISPLAYED) - $(LASTDISPLAYED) of $(MATCHES) matches.") - (format #f - (lingua:gettext "More ~A's indicate a better match.") - "<img src=\"/htdig/star.gif\" alt=\"*\">"))) - (gamlet:set-handler "INFO" (lambda (. args) (display "<ul class=\"menu\">") diff --git a/xml/pl/ellinika.xml b/xml/pl/ellinika.xml index 3ea0e80..024eba1 100644 --- a/xml/pl/ellinika.xml +++ b/xml/pl/ellinika.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2004, 2005, 2006 Sergey Poznyakoff +<!-- Copyright (C) 2004, 2005, 2006, 2007 Sergey Poznyakoff Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 @@ -23,16 +23,6 @@ <MSGSTR ID="Top of the Page">Początek strony</MSGSTR> <MSGSTR ID="This page in other languages">Ta strona w innych językach</MSGSTR> <MSGSTR ID="Search">Szukaj</MSGSTR> - <MSGSTR ID="Match">Dopasowanie</MSGSTR> - <MSGSTR ID="Format">Format</MSGSTR> - <MSGSTR ID="Sort by">Sortuj</MSGSTR> - <MSGSTR ID="New search">Nowy wzorzec</MSGSTR> - <MSGSTR ID="Documents $(FIRSTDISPLAYED) - $(LASTDISPLAYED) of $(MATCHES) matches."> - Wyniki $(FIRSTDISPLAYED) - $(LASTDISPLAYED) z $(MATCHES). - </MSGSTR> - <MSGSTR ID="More ~A's indicate a better match."> - Im więcej gwiazdek (~A), tym lepiej pasuje wzorzec. - </MSGSTR> </LOCALIZATION> <COPYRIGHT> @@ -45,7 +35,7 @@ (lingua:attr "AUTHOR" "CONTACT")) ]]> </GUILE> </PARA> -<PARA>Copyright <![CDATA[©]]> 2004, 2005, 2006 Sergey Poznyakoff</PARA> +<PARA>Copyright <![CDATA[©]]> 2004, 2005, 2006, 2007 Sergey Poznyakoff</PARA> <PARA> Verbatim copying and distribution of this entire article are permitted worldwide, without royalty, in any medium, provided @@ -129,15 +119,6 @@ this notice is preserved.</PARA> <PARA>@@article-date@@</PARA> <news:permanent-article>@@article-text@@</news:permanent-article> </PAGE> - -<PAGE PREFIX="htdig" HIDDEN="1"> -<HEADER>Wyniki wyszukiwania "$&(WORDS)"</HEADER> -<htdig:body /> -</PAGE> -<PAGE PREFIX="nomatch" HIDDEN="1"> -<HEADER>Wyniki wyszukiwania "$&(WORDS)"</HEADER> -<htdig:nomatch /> -</PAGE> </GROUP> </LINGUA> diff --git a/xml/ru/ellinika.xml b/xml/ru/ellinika.xml index dec08b5..c7a3d4f 100644 --- a/xml/ru/ellinika.xml +++ b/xml/ru/ellinika.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2004, 2005, 2006 Sergey Poznyakoff +<!-- Copyright (C) 2004, 2005, 2006, 2007 Sergey Poznyakoff Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 @@ -22,6 +22,7 @@ <MSGSTR ID="Next Page">Следующая страница</MSGSTR> <MSGSTR ID="Top of the Page">В начало страницы</MSGSTR> <MSGSTR ID="This page in other languages">Эта страница на других языках</MSGSTR> + <MSGSTR ID="Search">Поиск</MSGSTR> </LOCALIZATION> <COPYRIGHT> @@ -34,7 +35,7 @@ (lingua:attr "AUTHOR" "CONTACT")) ]]> </GUILE> </PARA> -<PARA>Copyright <![CDATA[©]]> 2004, 2005, 2006 Sergey Poznyakoff</PARA> +<PARA>Copyright <![CDATA[©]]> 2004, 2005, 2006, 2007 Sergey Poznyakoff</PARA> <PARA> Verbatim copying and distribution of this entire article are permitted worldwide, without royalty, in any medium, provided @@ -110,6 +111,7 @@ this notice is preserved.</PARA> <PAGE PREFIX="map" HEADER="Карта сайта"> {SITEMAP} </PAGE> +<ITEM>SEARCH</ITEM> </GROUP> <GROUP TITLE="permalink" HIDDEN="1"> diff --git a/xml/uk/ellinika.xml b/xml/uk/ellinika.xml index b44ca1a..464ea35 100644 --- a/xml/uk/ellinika.xml +++ b/xml/uk/ellinika.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2004, 2005, 2006 Sergey Poznyakoff +<!-- Copyright (C) 2004, 2005, 2006, 2007 Sergey Poznyakoff Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 @@ -23,19 +23,6 @@ <MSGSTR ID="Top of the Page">Початок сторінки</MSGSTR> <MSGSTR ID="This page in other languages">Ця сторінка іншими мовами</MSGSTR> <MSGSTR ID="Search">Пошук</MSGSTR> - <MSGSTR ID="Match">Шукати</MSGSTR> - <MSGSTR ID="Format">Формат</MSGSTR> - <MSGSTR ID="Sort by">Сортировка</MSGSTR> - <MSGSTR ID="New search">Новий пошук</MSGSTR> - <MSGSTR ID="Documents $(FIRSTDISPLAYED) - $(LASTDISPLAYED) of $(MATCHES) matches."> - Сторінки $(FIRSTDISPLAYED) - $(LASTDISPLAYED) з $(MATCHES). - </MSGSTR> - <MSGSTR ID="More ~A's indicate a better match."> - Кількість ~A зірок відповідає ступеню збігу. - </MSGSTR> - <MSGSTR ID="No matches were found for '$&(LOGICAL_WORDS)'"> - - </MSGSTR> </LOCALIZATION> <COPYRIGHT> @@ -48,7 +35,7 @@ (lingua:attr "AUTHOR" "CONTACT")) ]]> </GUILE> </PARA> -<PARA>Copyright <![CDATA[©]]> 2004, 2005, 2006 Sergey Poznyakoff</PARA> +<PARA>Copyright <![CDATA[©]]> 2004, 2005, 2006, 2007 Sergey Poznyakoff</PARA> <PARA> Verbatim copying and distribution of this entire article are permitted worldwide, without royalty, in any medium, provided @@ -132,15 +119,6 @@ this notice is preserved.</PARA> <PARA>@@article-date@@</PARA> <news:permanent-article>@@article-text@@</news:permanent-article> </PAGE> - -<PAGE PREFIX="htdig" HIDDEN="1"> -<HEADER>Результати пошуку "$&(WORDS)"</HEADER> -<htdig:body /> -</PAGE> -<PAGE PREFIX="nomatch" HIDDEN="1"> -<HEADER>Результати пошуку "$&(WORDS)"</HEADER> -<htdig:nomatch /> -</PAGE> </GROUP> </LINGUA> |