From e76fa6f02495d4b0b5d1e4632033712232bab532 Mon Sep 17 00:00:00 2001
From: SvenDowideit <SvenDowideit@0b4bb1d4-4e5a-0410-9cc4-b2b747904278>
Date: Fri, 17 Jun 2011 07:49:27 +0000
Subject: [PATCH] Item10461: begin to remove the SearchAlgo class, infavour of
 a single Algo API - which is what we already had in a way 	   refactor
 the 3 core Algo::query to use iterator style, and put most of the reusable
 'default' code into the common Interface            if only search algo's
 were an object so we could use OO rather than hardcoding entire classnames
 into the code and so duplicating it.

git-svn-id: http://svn.foswiki.org/trunk/MongoDBPlugin@11946 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
---
 lib/Foswiki/Plugins/MongoDBPlugin.pm          | 17 -----------------
 lib/Foswiki/Store/QueryAlgorithms/MongoDB.pm  |  5 ++---
 lib/Foswiki/Store/SearchAlgorithms/MongoDB.pm |  5 ++---
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/lib/Foswiki/Plugins/MongoDBPlugin.pm b/lib/Foswiki/Plugins/MongoDBPlugin.pm
index b92f74e..11bdc6e 100644
--- a/lib/Foswiki/Plugins/MongoDBPlugin.pm
+++ b/lib/Foswiki/Plugins/MongoDBPlugin.pm
@@ -477,23 +477,6 @@ sub _MONGODB {
     );
 }
 
-# getListOfWebs was moved after 1.1, see Item9814. Should it use Foswiki::Func?
-sub _getListOfWebs {
-    my ( $webNames, $recurse, $searchAllFlag ) = @_;
-
-    if ( defined &Foswiki::Search::InfoCache::_getListOfWebs ) {
-
-        # Foswiki 1.1
-        return Foswiki::Search::InfoCache::_getListOfWebs( $webNames, $recurse,
-            $searchAllFlag );
-    }
-    else {
-        require Foswiki::Store::Interfaces::SearchAlgorithm;
-        return Foswiki::Store::Interfaces::SearchAlgorithm::getListOfWebs(
-            $webNames, $recurse, $searchAllFlag );
-    }
-}
-
 1;
 __END__
 This copyright information applies to the MongoDBPlugin:
diff --git a/lib/Foswiki/Store/QueryAlgorithms/MongoDB.pm b/lib/Foswiki/Store/QueryAlgorithms/MongoDB.pm
index dbdb396..15bde9a 100644
--- a/lib/Foswiki/Store/QueryAlgorithms/MongoDB.pm
+++ b/lib/Foswiki/Store/QueryAlgorithms/MongoDB.pm
@@ -63,9 +63,8 @@ sub query {
     my $isAdmin  = $session->{users}->isAdmin( $session->{user} );
 
     my $searchAllFlag = ( $webNames =~ /(^|[\,\s])(all|on)([\,\s]|$)/i );
-    my @webs =
-      Foswiki::Plugins::MongoDBPlugin::_getListOfWebs( $webNames, $recurse,
-        $searchAllFlag );
+    my @webs = Foswiki::Store::Interfaces::QueryAlgorithm::getListOfWebs(
+        $webNames, $recurse, $searchAllFlag );
 
     my @resultCacheList;
     foreach my $web (@webs) {
diff --git a/lib/Foswiki/Store/SearchAlgorithms/MongoDB.pm b/lib/Foswiki/Store/SearchAlgorithms/MongoDB.pm
index a5030f8..771a349 100644
--- a/lib/Foswiki/Store/SearchAlgorithms/MongoDB.pm
+++ b/lib/Foswiki/Store/SearchAlgorithms/MongoDB.pm
@@ -107,9 +107,8 @@ sub query {
     my $isAdmin  = $session->{users}->isAdmin( $session->{user} );
 
     my $searchAllFlag = ( $webNames =~ /(^|[\,\s])(all|on)([\,\s]|$)/i );
-    my @webs =
-      Foswiki::Plugins::MongoDBPlugin::_getListOfWebs( $webNames, $recurse,
-        $searchAllFlag );
+    my @webs = Foswiki::Store::Interfaces::QueryAlgorithm::getListOfWebs(
+        $webNames, $recurse, $searchAllFlag );
 
     my @resultCacheList;
     foreach my $web (@webs) {