wwwsearch -> W3Search

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@1077 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/files/sample/blootbot.chan b/files/sample/blootbot.chan
index a17ff06edfa777a7563a964858ccb98fae201972..edbfecb200b8c44945902626b69a79e828881f59 100644 (file)
--- a/files/sample/blootbot.chan
+++ b/files/sample/blootbot.chan
@@ -1,4 +1,4 @@
-#v1: blootbot -- infobot -- written Tue Nov 23 06:49:41 2004
+#v1: blootbot -- infobot -- written Tue Nov 23 07:35:36 2004
 
 #botpark
     +RootWarn
@@ -35,6 +35,7 @@ _default
     +Topic
     +Units
     +UserInfo
+    +W3Search
     +Weather
     +allowConv
     +allowDNS
@@ -69,7 +70,6 @@ _default
     +slashdot
     +spell
     +tell
-    +wwwsearch
     +zfi
     +zippy
     +zsi

diff --git a/files/sample/blootbot.config b/files/sample/blootbot.config
index df2d9d8d5eaeed0816f5d1b8989a154dc4e12461..c5fff9e7c0ba683c4ca21f6e6a1ec6e889b4a61a 100644 (file)
--- a/files/sample/blootbot.config
+++ b/files/sample/blootbot.config
@@ -269,7 +269,7 @@ set wingateKick             Please don't use wingate
 
 # [0/1] google search.. simon++. requires libwww-search-perl + 5lines of
 #      modifications.
-set wwwsearch          false
+set W3Search           false
 
 # [0/1] Unit conversion tool.
 set Units              true

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index 7383d1a681b3356b369447943433eecb78420d2d..9d986f5e39415e8d75dc918f008954e4860592f4 100644 (file)
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -297,11 +297,11 @@ sub Modules {
 
     # google searching. Simon++
     if ($message =~ /^(?:search\s+)?($w3search_regex)\s+(?:for\s+)?['"]?(.*?)["']?\s*\?*$/i) {
-       return unless (&hasParam("wwwsearch"));
+       return unless (&hasParam('W3Search'));
 
-       &Forker("wwwsearch", sub { &W3Search::W3Search($1,$2); } );
+       &Forker('W3Search', sub { &W3Search::W3Search($1,$2); } );
 
-       $cmdstats{'WWWSearch'}++;
+       $cmdstats{'W3Search'}++;
        return;
     }
 

diff --git a/src/modules.pl b/src/modules.pl
index e66af51b3bb9ac6dbfcb0cc54a779c55c43cdc4c..286082a51204acb25ea1df4ae262923245382837 100644 (file)
--- a/src/modules.pl
+++ b/src/modules.pl
@@ -54,7 +54,7 @@ if ($@) {
        "Weather"       => "Weather.pl",
        "wikipedia"     => "wikipedia.pl",
        "Wingate"       => "Wingate.pl",
-       "wwwsearch"     => "W3Search.pl",
+       "W3Search"      => "W3Search.pl",
        "zfi"           => "zfi.pl",
        "zippy"         => "Zippy.pl",
        "zsi"           => "zsi.pl",