From 719644292735f1a4568ce9a3319fe082cf1c7477 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Thu, 30 Jul 2009 22:45:38 +0000 Subject: [PATCH] Move search related includes to includes/search/ --- includes/AutoLoader.php | 39 ++++++++++++------------ includes/{ => search}/SearchEngine.php | 0 includes/{ => search}/SearchIBM_DB2.php | 0 includes/{ => search}/SearchMySQL.php | 0 includes/{ => search}/SearchMySQL4.php | 0 includes/{ => search}/SearchOracle.php | 0 includes/{ => search}/SearchPostgres.php | 0 includes/{ => search}/SearchUpdate.php | 0 8 files changed, 20 insertions(+), 19 deletions(-) rename includes/{ => search}/SearchEngine.php (100%) rename includes/{ => search}/SearchIBM_DB2.php (100%) rename includes/{ => search}/SearchMySQL.php (100%) rename includes/{ => search}/SearchMySQL4.php (100%) rename includes/{ => search}/SearchOracle.php (100%) rename includes/{ => search}/SearchPostgres.php (100%) rename includes/{ => search}/SearchUpdate.php (100%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index a5f067fca3..141125dbc5 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -151,10 +151,8 @@ $wgAutoloadLocalClasses = array( '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', @@ -164,8 +162,6 @@ $wgAutoloadLocalClasses = array( 'PatrolLog' => 'includes/PatrolLog.php', 'PoolCounter' => 'includes/PoolCounter.php', 'PoolCounter_Stub' => 'includes/PoolCounter.php', - 'PostgresSearchResult' => 'includes/SearchPostgres.php', - 'PostgresSearchResultSet' => 'includes/SearchPostgres.php', 'Preferences' => 'includes/Preferences.php', 'PrefixSearch' => 'includes/PrefixSearch.php', 'Profiler' => 'includes/Profiler.php', @@ -188,18 +184,6 @@ $wgAutoloadLocalClasses = array( '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', @@ -364,11 +348,8 @@ $wgAutoloadLocalClasses = array( 'PostgresField' => 'includes/db/DatabasePostgres.php', 'ResultWrapper' => 'includes/db/Database.php', 'SQLiteField' => 'includes/db/DatabaseSqlite.php', - 'DatabaseIbm_db2' => 'includes/db/DatabaseIbm_db2.php', 'IBM_DB2Field' => 'includes/db/DatabaseIbm_db2.php', - 'IBM_DB2SearchResultSet' => 'includes/SearchIBM_DB2.php', - 'SearchIBM_DB2' => 'includes/SearchIBM_DB2.php', # includes/diff 'AncestorComparator' => 'includes/diff/HTMLDiff.php', @@ -482,6 +463,26 @@ $wgAutoloadLocalClasses = array( 'StripState' => 'includes/parser/Parser.php', 'MWTidy' => 'includes/parser/Tidy.php', + # includes/search + 'IBM_DB2SearchResultSet' => 'includes/search/SearchIBM_DB2.php', + 'MySQLSearchResultSet' => 'includes/search/SearchMySQL.php', + 'OracleSearchResultSet' => 'includes/search/SearchOracle.php', + 'PostgresSearchResult' => 'includes/search/SearchPostgres.php', + 'PostgresSearchResultSet' => 'includes/search/SearchPostgres.php', + 'SearchEngineDummy' => 'includes/search/SearchEngine.php', + 'SearchEngine' => 'includes/search/SearchEngine.php', + 'SearchHighlighter' => 'includes/search/SearchEngine.php', + 'SearchIBM_DB2' => 'includes/search/SearchIBM_DB2.php', + 'SearchMySQL4' => 'includes/search/SearchMySQL4.php', + 'SearchMySQL' => 'includes/search/SearchMySQL.php', + 'SearchOracle' => 'includes/search/SearchOracle.php', + 'SearchPostgres' => 'includes/search/SearchPostgres.php', + 'SearchResult' => 'includes/search/SearchEngine.php', + 'SearchResultSet' => 'includes/search/SearchEngine.php', + 'SearchResultTooMany' => 'includes/search/SearchEngine.php', + 'SearchUpdate' => 'include/searchs/SearchUpdate.php', + 'SearchUpdateMyISAM' => 'includes/search/SearchUpdate.php', + # includes/specials 'SpecialAllmessages' => 'includes/specials/SpecialAllmessages.php', 'AncientPagesPage' => 'includes/specials/SpecialAncientpages.php', diff --git a/includes/SearchEngine.php b/includes/search/SearchEngine.php similarity index 100% rename from includes/SearchEngine.php rename to includes/search/SearchEngine.php diff --git a/includes/SearchIBM_DB2.php b/includes/search/SearchIBM_DB2.php similarity index 100% rename from includes/SearchIBM_DB2.php rename to includes/search/SearchIBM_DB2.php diff --git a/includes/SearchMySQL.php b/includes/search/SearchMySQL.php similarity index 100% rename from includes/SearchMySQL.php rename to includes/search/SearchMySQL.php diff --git a/includes/SearchMySQL4.php b/includes/search/SearchMySQL4.php similarity index 100% rename from includes/SearchMySQL4.php rename to includes/search/SearchMySQL4.php diff --git a/includes/SearchOracle.php b/includes/search/SearchOracle.php similarity index 100% rename from includes/SearchOracle.php rename to includes/search/SearchOracle.php diff --git a/includes/SearchPostgres.php b/includes/search/SearchPostgres.php similarity index 100% rename from includes/SearchPostgres.php rename to includes/search/SearchPostgres.php diff --git a/includes/SearchUpdate.php b/includes/search/SearchUpdate.php similarity index 100% rename from includes/SearchUpdate.php rename to includes/search/SearchUpdate.php -- 2.20.1