tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove all further references to `getClassNameFromIndex()`

This commit is contained in:
jovenden 2018-03-09 09:42:33 +13:00
parent 9153365313
commit 0fbff7ca6a
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Solr/SolrIndex.php
View File

@ -124,29 +124,6 @@ abstract class SolrIndex extends SearchIndex
return implode($indexParts);
}
/**
* Helper for returning the indexer class name from an index name, encoded via {@link getIndexName()}
*
* @param string $indexName
* @return string
*/
public static function getClassNameFromIndex($indexName)
{
if (($indexPrefix = Environment::getEnv('SS_SOLR_INDEX_PREFIX'))
&& (substr($indexName, 0, strlen($indexPrefix)) === $indexPrefix)
) {
$indexName = substr($indexName, strlen($indexPrefix));
}
if (($indexSuffix = Environment::getEnv('SS_SOLR_INDEX_SUFFIX'))
&& (substr($indexName, -strlen($indexSuffix)) === $indexSuffix)
) {
$indexName = substr($indexName, 0, -strlen($indexSuffix));
}
return str_replace('-', '\\', $indexName);
}
public function getTypes()
{
return $this->renderWith($this->getTemplatesPath() . '/types.ss');

2
tests/SolrIndexTest.php
View File

@ -386,7 +386,7 @@ class SolrIndexTest extends SapphireTest
Environment::putEnv('SS_SOLR_INDEX_PREFIX="foo_"');
Environment::putEnv('SS_SOLR_INDEX_SUFFIX="_bar"');
$this->assertSame($expected, SolrIndex::getClassNameFromIndex($indexName));
$this->assertSame($expected, $indexName);
}
/**