From 61b77c1b0bb9114e5f5b51dcba4f1e8de7e40d64 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Tue, 17 Jun 2008 20:58:32 +0000 Subject: [PATCH] More ~/includes cleanup. Moving all the Search*.php files to ~/includes/search. --- includes/AutoLoader.php | 34 ++++++++++--------- .../{SearchEngine.php => search/Engine.php} | 0 .../{SearchMySQL.php => search/MySQL.php} | 0 .../{SearchMySQL4.php => search/MySQL4.php} | 0 .../{SearchOracle.php => search/Oracle.php} | 0 .../Postgres.php} | 0 .../Tsearch2.php} | 0 .../{SearchUpdate.php => search/Update.php} | 0 8 files changed, 18 insertions(+), 16 deletions(-) rename includes/{SearchEngine.php => search/Engine.php} (100%) rename includes/{SearchMySQL.php => search/MySQL.php} (100%) rename includes/{SearchMySQL4.php => search/MySQL4.php} (100%) rename includes/{SearchOracle.php => search/Oracle.php} (100%) rename includes/{SearchPostgres.php => search/Postgres.php} (100%) rename includes/{SearchTsearch2.php => search/Tsearch2.php} (100%) rename includes/{SearchUpdate.php => search/Update.php} (100%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 27ebd521b6..1754a59a0a 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -126,10 +126,8 @@ class AutoLoader { 'MimeMagic' => 'includes/MimeMagic.php', 'MWException' => 'includes/Exception.php', 'MWNamespace' => 'includes/Namespace.php', - 'MySQLSearchResultSet' => 'includes/SearchMySQL.php', 'Namespace' => 'includes/NamespaceCompat.php', // Compat 'OldChangesList' => 'includes/ChangesList.php', - 'OracleSearchResultSet' => 'includes/SearchOracle.php', 'OutputPage' => 'includes/OutputPage.php', 'PageHistory' => 'includes/PageHistory.php', 'PageHistoryPager' => 'includes/PageHistory.php', @@ -137,8 +135,6 @@ class AutoLoader { 'Pager' => 'includes/Pager.php', 'PasswordError' => 'includes/User.php', 'PatrolLog' => 'includes/PatrolLog.php', - 'PostgresSearchResult' => 'includes/SearchPostgres.php', - 'PostgresSearchResultSet' => 'includes/SearchPostgres.php', 'PrefixSearch' => 'includes/PrefixSearch.php', 'Profiler' => 'includes/Profiler.php', 'ProfilerSimple' => 'includes/ProfilerSimple.php', @@ -158,18 +154,6 @@ class AutoLoader { 'Revision' => 'includes/Revision.php', 'RSSFeed' => 'includes/Feed.php', 'Sanitizer' => 'includes/Sanitizer.php', - 'SearchEngineDummy' => 'includes/SearchEngine.php', - 'SearchEngine' => 'includes/SearchEngine.php', - 'SearchHighlighter' => 'includes/SearchEngine.php', - 'SearchMySQL4' => 'includes/SearchMySQL4.php', - 'SearchMySQL' => 'includes/SearchMySQL.php', - 'SearchOracle' => 'includes/SearchOracle.php', - 'SearchPostgres' => 'includes/SearchPostgres.php', - 'SearchResult' => 'includes/SearchEngine.php', - 'SearchResultSet' => 'includes/SearchEngine.php', - 'SearchResultTooMany' => 'includes/SearchEngine.php', - 'SearchUpdate' => 'includes/SearchUpdate.php', - 'SearchUpdateMyISAM' => 'includes/SearchUpdate.php', 'SiteConfiguration' => 'includes/SiteConfiguration.php', 'SiteStats' => 'includes/SiteStats.php', 'SiteStatsUpdate' => 'includes/SiteStats.php', @@ -376,6 +360,24 @@ class AutoLoader { 'Preprocessor_Hash' => 'includes/parser/Preprocessor_Hash.php', 'StripState' => 'includes/parser/Parser.php', + # includes/search + 'OracleSearchResultSet' => 'includes/search/Oracle.php', + 'PostgresSearchResult' => 'includes/search/Postgres.php', + 'PostgresSearchResultSet' => 'includes/search/Postgres.php', + 'MySQLSearchResultSet' => 'includes/Search/MySQL.php', + 'SearchEngineDummy' => 'includes/search/Engine.php', + 'SearchEngine' => 'includes/search/Engine.php', + 'SearchHighlighter' => 'includes/search/Engine.php', + 'SearchMySQL4' => 'includes/search/MySQL4.php', + 'SearchMySQL' => 'includes/search/MySQL.php', + 'SearchOracle' => 'includes/search/Oracle.php', + 'SearchPostgres' => 'includes/search/Postgres.php', + 'SearchResult' => 'includes/search/Engine.php', + 'SearchResultSet' => 'includes/search/Engine.php', + 'SearchResultTooMany' => 'includes/search/Engine.php', + 'SearchUpdate' => 'includes/search/Update.php', + 'SearchUpdateMyISAM' => 'includes/search/Update.php', + # includes/specials 'AncientPagesPage' => 'includes/specials/Ancientpages.php', 'BrokenRedirectsPage' => 'includes/specials/BrokenRedirects.php', diff --git a/includes/SearchEngine.php b/includes/search/Engine.php similarity index 100% rename from includes/SearchEngine.php rename to includes/search/Engine.php diff --git a/includes/SearchMySQL.php b/includes/search/MySQL.php similarity index 100% rename from includes/SearchMySQL.php rename to includes/search/MySQL.php diff --git a/includes/SearchMySQL4.php b/includes/search/MySQL4.php similarity index 100% rename from includes/SearchMySQL4.php rename to includes/search/MySQL4.php diff --git a/includes/SearchOracle.php b/includes/search/Oracle.php similarity index 100% rename from includes/SearchOracle.php rename to includes/search/Oracle.php diff --git a/includes/SearchPostgres.php b/includes/search/Postgres.php similarity index 100% rename from includes/SearchPostgres.php rename to includes/search/Postgres.php diff --git a/includes/SearchTsearch2.php b/includes/search/Tsearch2.php similarity index 100% rename from includes/SearchTsearch2.php rename to includes/search/Tsearch2.php diff --git a/includes/SearchUpdate.php b/includes/search/Update.php similarity index 100% rename from includes/SearchUpdate.php rename to includes/search/Update.php -- 2.20.1