[BUGFIX] Class SearchFormController_indexer' not found
authorTymoteusz Motylewski <t.motylewski@gmail.com>
Fri, 24 Aug 2012 21:53:28 +0000 (23:53 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 24 Aug 2012 22:14:01 +0000 (00:14 +0200)
This change fixes wrong class name of indexed search indexer.

Change-Id: I45ba6e7c85c3b6da1023507123e062c21402bd4e
Related: #40095
Fixes: #40149
Release: 6.0
Reviewed-on: http://review.typo3.org/14057
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
typo3/sysext/indexed_search/Classes/Controller/ModuleController.php
typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
typo3/sysext/indexed_search/Classes/Hook/CrawlerFilesHook.php

index cf9ed84..252e59b 100644 (file)
@@ -891,7 +891,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
                if (is_array($resultRow)) {
                        if ($resultRow['item_type'] && $resultRow['item_type'] !== '0') {
                                // (Re)-Indexing file on page.
-                               $indexerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_indexer');
+                               $indexerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Indexer');
                                $indexerObj->backend_initIndexer($pageId, 0, 0, '', $this->getUidRootLineForClosestTemplate($pageId));
                                // URL or local file:
                                if ($resultRow['externalUrl']) {
index 5e591c7..afd3f76 100644 (file)
@@ -68,7 +68,7 @@ class ModuleController {
                                'defCol' => array(('<td><img src="' . $this->doc->backPath) . 'clear.gif" width=10 height=1></td><td valign="top" nowrap>', '</td>')
                        )
                );
-               $indexer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_indexer');
+               $indexer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Indexer');
                $indexer->initializeExternalParsers();
        }
 
index dc93387..6e6188f 100644 (file)
@@ -811,7 +811,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
                                 * @var \TYPO3\CMS\IndexedSearch\Indexer
                                 */
                                // Initialize the indexer-class
-                               $indexerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_indexer');
+                               $indexerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Indexer');
                                // Perform metaphone search
                                $res = $this->searchMetaphone($indexerObj->metaphone($sWord, $this->storeMetaphoneInfoAsWords));
                                unset($indexerObj);
index 2d04b2e..6bca543 100644 (file)
@@ -107,7 +107,7 @@ class IndexSearchRepository {
         */
        public function initialize($settings, $searchData, $externalParsers, $searchRootPageIdList) {
                // Initialize the indexer-class - just to use a few function (for making hashes)
-               $this->indexerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_indexer');
+               $this->indexerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Indexer');
                $this->externalParsers = $externalParsers;
                $this->searchRootPageIdList = $searchRootPageIdList;
                $this->frontendUserGroupList = $GLOBALS['TSFE']->gr_list;
@@ -296,7 +296,7 @@ class IndexSearchRepository {
                                 *
                                 * @var \TYPO3\CMS\IndexedSearch\Indexer
                                 */
-                               $indexerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_indexer');
+                               $indexerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Indexer');
                                // Perform metaphone search
                                $storeMetaphoneInfoAsWords = $this->isTableUsed('index_words') ? FALSE : TRUE;
                                $res = $this->searchMetaphone($indexerObj->metaphone($sWord, $storeMetaphoneInfoAsWords));
index ba74bd2..24766bd 100644 (file)
@@ -25,7 +25,7 @@ class CrawlerFilesHook {
                $this->loadIndexerClass();
                if (is_array($params['conf'])) {
                        // Initialize the indexer class:
-                       $indexerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_indexer');
+                       $indexerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Indexer');
                        $indexerObj->conf = $params['conf'];
                        $indexerObj->init();
                        // Index document: