MDL-15096 removed some obsoleted installation code

diff --git a/search/indexer.php b/search/indexer.php
index a8a6a2ae2b9080f2efe65b2448856ff9dcb42652..33658319507a5231ba5239b1c2ab16fd0c0141f9 100644 (file)
--- a/search/indexer.php
+++ b/search/indexer.php
@@ -104,13 +104,6 @@ $separator = (array_key_exists('WINDIR', $_SERVER)) ? ';' : ':' ;
     Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8());
     $index = new Zend_Search_Lucene($index_path, true);
     
-    /*
-    OBSOLETE REGENERATION - DB installs with search block by now
-    if (!$dbcontrol->checkDB()) {
-        search_pexit("Database error. Please check settings/files.");
-    }
-    */
-
 /// New regeneration
 
     mtrace('Deleting old index entries.');

diff --git a/search/indexlib.php b/search/indexlib.php
index 44168750af6a33c4f8aff5c3427ebb9d08dbf49b..be771b8b4ab0fdd367378afb5977bb8b889d4926 100644 (file)
--- a/search/indexlib.php
+++ b/search/indexlib.php
@@ -193,29 +193,6 @@ class IndexDBControl {
         }
     } //checkTableExists
 
-    /**
-    * is our database setup valid?
-    * @uses db, CFG
-    * @deprecated Database is installed at install and should not be dropped out
-    */
-    public function checkDB() {
-        global $CFG, $DB;
-        
-        $sqlfile = "{$CFG->dirroot}/search/db/$CFG->dbtype.sql";
-        $ret = false;
-        if ($this->checkTableExists()) {
-            execute_sql('drop table '.$CFG->prefix.SEARCH_DATABASE_TABLE, false);
-        }
-
-        //turn output buffering on - to hide modify_database() output
-        ob_start(); 
-        $ret = modify_database($sqlfile, '', false);
-
-        //chuck the buffer and resume normal operation
-        ob_end_clean(); 
-        return $ret;
-    } //checkDB
-
     /**
     * add a document record to the table
     * @param document must be a Lucene SearchDocument instance