Changeset 9568

Timestamp:

10/16/10 06:59:30 (3 years ago)

Author:

PaulHarvey

Message:

Item9750: fix for trunk: non-public API _getListOfWebs() moved since 1.1

Location:

trunk/MongoDBPlugin/lib/Foswiki

Files:

• Plugins/MongoDBPlugin.pm (modified) (1 diff)
• Store/QueryAlgorithms/MongoDB.pm (modified) (1 diff)
• Store/SearchAlgorithms/MongoDB.pm (modified) (1 diff)

trunk/MongoDBPlugin/lib/Foswiki/Plugins/MongoDBPlugin.pm

@@ -206 +206 @@
 }
 
+# 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__

trunk/MongoDBPlugin/lib/Foswiki/Store/QueryAlgorithms/MongoDB.pm

@@ -50 +50 @@
 
     my $searchAllFlag = ( $webNames =~ /(^|[\,\s])(all|on)([\,\s]|$)/i );
-    my @webs = Foswiki::Search::InfoCache::_getListOfWebs( $webNames, $recurse,
-        $searchAllFlag );
+    my @webs = Foswiki::Plugins::MongoDBPlugin::_getListOfWebs( $webNames,
+        $recurse, $searchAllFlag );
 
     my @resultCacheList;

trunk/MongoDBPlugin/lib/Foswiki/Store/SearchAlgorithms/MongoDB.pm

@@ -100 +100 @@
 
     my $searchAllFlag = ( $webNames =~ /(^|[\,\s])(all|on)([\,\s]|$)/i );
-    my @webs = Foswiki::Search::InfoCache::_getListOfWebs( $webNames, $recurse,
-        $searchAllFlag );
+    my @webs = Foswiki::Plugins::MongoDBPlugin::_getListOfWebs( $webNames,
+        $recurse, $searchAllFlag );
 
     my @resultCacheList;