4 files changed, 2 insertions, 139 deletions
diff --git a/khelpcenter/searchhandlers/CMakeLists.txt b/khelpcenter/searchhandlers/CMakeLists.txt
index 3d18a8008..6c91e7a9c 100644
--- a/khelpcenter/searchhandlers/CMakeLists.txt
+++ b/khelpcenter/searchhandlers/CMakeLists.txt
@@ -37,7 +37,7 @@ install( PROGRAMS
     ${CMAKE_CURRENT_BINARY_DIR}/khc_htdig.pl
     ${CMAKE_CURRENT_BINARY_DIR}/khc_htsearch.pl
     ${CMAKE_CURRENT_BINARY_DIR}/khc_docbookdig.pl
-    khc_beagle_search.pl khc_mansearch.pl  khc_beagle_index.pl
+    khc_mansearch.pl
   DESTINATION ${BIN_INSTALL_DIR} )
 
 install( FILES
diff --git a/khelpcenter/searchhandlers/Makefile.am b/khelpcenter/searchhandlers/Makefile.am
index f2ebd57ff..65f4060b6 100644
--- a/khelpcenter/searchhandlers/Makefile.am
+++ b/khelpcenter/searchhandlers/Makefile.am
@@ -3,7 +3,7 @@ searchhandlers_DATA = htdig.desktop man.desktop docbook.desktop
 searchhandlersdir = $(kde_datadir)/khelpcenter/searchhandlers
 
 kde_bin_SCRIPTS = khc_htdig.pl khc_htsearch.pl khc_mansearch.pl \
-  khc_docbookdig.pl khc_beagle_search.pl khc_beagle_index.pl
+  khc_docbookdig.pl
 
 htdigdata_DATA = htdig_long.html
 
diff --git a/khelpcenter/searchhandlers/khc_beagle_index.pl b/khelpcenter/searchhandlers/khc_beagle_index.pl
deleted file mode 100644
index aaec63607..000000000
--- a/khelpcenter/searchhandlers/khc_beagle_index.pl
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/perl
-# vim:sw=4:et
-
-use warnings;
-
-sub getKDEDocDir() 
-{
-    my $prefix = `tde-config --prefix`;
-    chomp $prefix;
-
-    $prefix = "/opt/kde" if (not defined($prefix));
-    return "$prefix/share/doc";
-}
-
-sub addRoot() 
-{
-    my $kdedocdir = &getKDEDocDir;
-
-    open (IN, "-|") || exec "beagle-config", "indexing", "ListRoots";
-
-    my $kdedoc_found = 0;
-    while(<IN>) {
-        if (/^$kdedocdir/o) {
-            $kdedoc_found = 1;
-            last;
-        }
-    }
-    close(IN);
-
-    if (not $kdedoc_found) {
-        `beagle-config indexing AddRoot $kdedocdir`;
-        `beagle-config indexing AddRoot $kdedocdir-bundle`;
-    }
-}
-
-sub createExistsFile($$)
-{
-    my ($idir, $ident) = @_;
-
-    open(OUT, ">", "$idir/$idir");
-    close(OUT);
-}
-
-my $idir = $ARGV[0];
-my $ident = $ARGV[1];
-
-if (addRoot) {
-    createExistsFile($idir, $ident);
-}
diff --git a/khelpcenter/searchhandlers/khc_beagle_search.pl b/khelpcenter/searchhandlers/khc_beagle_search.pl
deleted file mode 100644
index d7a1f44b8..000000000
--- a/khelpcenter/searchhandlers/khc_beagle_search.pl
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/perl -w
-# vim:sw=4:et
-
-use warnings;
-use strict;
-use Getopt::Long;
-
-sub isBeagleRunning()
-{
-    open(IN, "-|") || exec "beagle-ping";
-    while(<IN>) {
-        if (/^Daemon version:/) {
-            close(IN);
-            return 1;
-        }
-    }
-    close(IN);
-    return 0;
-}
-
-sub formatHTML($$)
-{
-    my ($query, $hits) = @_;
-
-    print "<html>\n<body\n<ul>\n";
-
-    foreach my $hit(@$hits) {
-        print "<li>$hit</li>\n";
-    }
-    print "</ul>\n</body>\n</html>\n";
-}
-
-sub beagleQuery($$$)
-{
-    my ($words, $method, $maxnum) = @_;
-
-    my @hits = ();
-
-    open(IN, "-|") || exec "beagle-query", "--type", "DocbookEntry", "--type", "File", "--max-hits", $maxnum, @$words, "ext:docbook";
-    while(<IN>) {
-        chop;
-        next if (/^Debug:/);
-
-        my $uri = $_;
-        $uri = $1 if ($uri =~ /^file:\/\/(.*)$/);
-
-        print "uri: $uri\n";
-        my $helpLink = &makeHelpLink($uri);
-
-        push(@hits, $helpLink) if (!grep { /^$helpLink$/ } @hits);
-    }
-    close(IN);
-    return @hits;
-}
-
-sub makeHelpLink($)
-{
-    # Try to figure out the name of the application from the path to its index.docbook file
-
-    my ($path) = @_;
-    my @pathcomponents = split '/', $path;
-
-    my $appName = $pathcomponents[-2];
-    my $appName2 = $pathcomponents[-3];
-
-    if ($appName eq $appName2 or $appName2 eq "doc" 
-        or (-d "/usr/share/locale/$appName2")) {
-        return "<a href=\"help:/$appName\">$appName</a>";
-    }
-    return "<a href=\"help:/$appName2/$appName\">$appName ($appName2)</a>";
-}
-
-my $method = "and";
-my $maxnum = 100;
-
-GetOptions("method=s", \$method, "maxnum=i", \$maxnum);
-
-my @hits = ("The Beagle daemon is not running, search is not available");
-
-my @words = @ARGV;
-
-if (isBeagleRunning()) {
-    @hits = beagleQuery(\@words, $method, $maxnum);
-}
-
-@hits = ("There are no search results") if ($#hits < 0);
-
-formatHTML(\@words, \@hits);