remove reference to freshmeat_search.pl

[claws.git] / tools / multiwebsearch.pl

diff --git a/tools/multiwebsearch.pl b/tools/multiwebsearch.pl
old mode 100644 (file)
new mode 100755 (executable)
index 1785ca5..f5398c2
--- a/tools/multiwebsearch.pl
+++ b/tools/multiwebsearch.pl
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 
-#  * Copyright © 2003 Paul Mangan <claws@thewildbeast.co.uk>
+#  * Copyright 2003-2007 Paul Mangan <paul@claws-mail.org>
 #  *
 #  * This file is free software; you can redistribute it and/or modify it
 #  * under the terms of the GNU General Public License as published by
-#  * the Free Software Foundation; either version 2 of the License, or
+#  * the Free Software Foundation; either version 3 of the License, or
 #  * (at your option) any later version.
 #  *
 #  * This program is distributed in the hope that it will be useful, but
@@ -17,7 +17,15 @@
 #  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #  *
 
+# Changes:
+#      Feb 2007: add support for non ISO-8859-1 compatible locales
+#                by Alex Gorbachenko <agent_007@immo.ru>
+#
+
 use Getopt::Long;
+use URI::Escape;
+use POSIX qw(locale_h);
+use Text::Iconv;
 
 my $where = '';
 my $what  = '';
@@ -25,13 +33,18 @@ my $what  = '';
 GetOptions("where=s"   => \$where,
           "what=s"     => \$what);
 
-$what =~ s/\s/%20/g;
+$locale = setlocale(LC_CTYPE);
+$locale =~ s/\S+\.//;
+
+$converter = Text::Iconv->new("$locale", "UTF-8");
+$safe=uri_escape($converter->convert("$what"));
+$what=$safe;
 
-chdir($ENV{HOME} . "/.sylpheed-claws") 
-       || die("Can't find your ~/.sylpheed-claws directory\n");
+chdir($ENV{HOME} . "/.claws-mail") 
+       || die("Can't find your ~/.claws-mail directory\n");
 
 open (CONF, "<multiwebsearch.conf") 
-       || die("Can't open ~/.sylpheed-claws/multiwebsearch.conf\n");
+       || die("Can't open ~/.claws-mail/multiwebsearch.conf\n");
        @conflines = <CONF>;
 close CONF;
 
@@ -50,8 +63,8 @@ if (!$url) {
        die("No url found with the alias \"$where\"\n");
 } 
 
-open (SYLRC, "<sylpheedrc") 
-       || die("Can't open ~/.sylpheed-claws/sylpheedrc\n");
+open (SYLRC, "<clawsrc") 
+       || die("Can't open ~/.claws-mail/clawsrc\n");
        @rclines = <SYLRC>;
 close SYLRC;