tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Only highlight strings more than 2 characters long. #4949 (from r107423)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112590 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-10-15 03:44:24 +00:00
parent 80eab2a24c
commit bd6e51c87f
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/model/fieldtypes/Text.php
View File

@ -272,6 +272,7 @@ class Text extends StringField {
* @return string * @return string
*/ */
function ContextSummary($characters = 500, $string = false, $striphtml = true, $highlight = true, $prefix = "... ", $suffix = "...") { function ContextSummary($characters = 500, $string = false, $striphtml = true, $highlight = true, $prefix = "... ", $suffix = "...") {
if(!$string) $string = $_REQUEST['Search']; // Use the default "Search" request variable (from SearchForm) if(!$string) $string = $_REQUEST['Search']; // Use the default "Search" request variable (from SearchForm)
// Remove HTML tags so we don't have to deal with matching tags // Remove HTML tags so we don't have to deal with matching tags
@ -294,8 +295,11 @@ class Text extends StringField {
if($highlight) { if($highlight) {
// Add a span around all key words from the search term as well // Add a span around all key words from the search term as well
if($stringPieces) { if($stringPieces) {
foreach($stringPieces as $stringPiece) { foreach($stringPieces as $stringPiece) {
$summary = str_ireplace($stringPiece, "<span class=\"highlight\">$stringPiece</span>", $summary); if(strlen($stringPiece) > 2) {
$summary = str_ireplace($stringPiece, "<span class=\"highlight\">$stringPiece</span>", $summary);
}
} }
} }
} }

21
tests/fieldtypes/TextTest.php
View File

@ -107,8 +107,14 @@ class TextTest extends SapphireTest {
function testContextSummary() { function testContextSummary() {
$testString1 = '<p>This is some text. It is a test</p>'; $testString1 = '<p>This is some text. It is a test</p>';
$testKeywords1 = 'test'; $testKeywords1 = 'test';
$testString2 = '<p>This is some test text. Test test what if you have multiple keywords.</p>'; $testString2 = '<p>This is some test text. Test test what if you have multiple keywords.</p>';
$testKeywords2 = 'some test'; $testKeywords2 = 'some test';
$testString3 = '<p>A dog ate a cat while looking at a Foobar</p>';
$testKeyword3 = 'a';
$testKeyword3a = 'ate';
$textObj = DBField::create('Text', $testString1, 'Text'); $textObj = DBField::create('Text', $testString1, 'Text');
$this->assertEquals( $this->assertEquals(
@ -122,5 +128,20 @@ class TextTest extends SapphireTest {
'This is <span class="highlight">some</span> <span class="highlight">test</span> text. <span class="highlight">test</span> <span class="highlight">test</span> what if you have...', 'This is <span class="highlight">some</span> <span class="highlight">test</span> text. <span class="highlight">test</span> <span class="highlight">test</span> what if you have...',
$textObj->ContextSummary(50, $testKeywords2) $textObj->ContextSummary(50, $testKeywords2)
); );
$textObj->setValue($testString3);
// test that it does not highlight too much (eg every a)
$this->assertEquals(
'A dog ate a cat while looking at a Foobar',
$textObj->ContextSummary(100, $testKeyword3)
);
// it should highlight 3 letters or more.
$this->assertEquals(
'A dog <span class="highlight">ate</span> a cat while looking at a Foobar',
$textObj->ContextSummary(100, $testKeyword3a)
);
} }
} }