commit 0a029a8008522f495f88c1a927f0ec61b90f4964 Author: Karoly Negyesi Date: Mon Feb 1 00:31:02 2016 -0800 WWW-2282 I meant when I said cut to 250 diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module index 68fc3cb..08bf855 100644 --- a/modules/field/modules/text/text.module +++ b/modules/field/modules/text/text.module @@ -385,54 +385,18 @@ function text_summary($text, $format = NULL, $size = NULL) { // The summary may not be longer than maximum length specified. Initial slice. $summary = truncate_utf8($text, $size); - - // Store the actual length of the UTF8 string -- which might not be the same - // as $size. - $max_rpos = strlen($summary); - - // How much to cut off the end of the summary so that it doesn't end in the - // middle of a paragraph, sentence, or word. - // Initialize it to maximum in order to find the minimum. - $min_rpos = $max_rpos; - - // Store the reverse of the summary. We use strpos on the reversed needle and - // haystack for speed and convenience. - $reversed = strrev($summary); - - // Build an array of arrays of break points grouped by preference. - $break_points = array(); - - // A paragraph near the end of sliced summary is most preferable. - $break_points[] = array('

' => 0); - - // If no complete paragraph then treat line breaks as paragraphs. - $line_breaks = array('
' => 6, '
' => 4); + // Now try to find the last delimiter. + $delimiters = '. |! |\? |\x{61F}|\x{3002}|

|| |\t'; // Newline only indicates a line break if line break converter // filter is present. if (isset($filters['filter_autop'])) { - $line_breaks["\n"] = 1; + $delimiters .= "|\n"; } - $break_points[] = $line_breaks; - - // If the first paragraph is too long, split at the end of a sentence. - $break_points[] = array('. ' => 1, '! ' => 1, '? ' => 1, '。' => 0, '؟ ' => 1); - - // Iterate over the groups of break points until a break point is found. - foreach ($break_points as $points) { - // Look for each break point, starting at the end of the summary. - foreach ($points as $point => $offset) { - // The summary is already reversed, but the break point isn't. - $rpos = strpos($reversed, strrev($point)); - if ($rpos !== FALSE) { - $min_rpos = min($rpos + $offset, $min_rpos); - } - } - - // If a break point was found in this group, slice and stop searching. - if ($min_rpos !== $max_rpos) { - // Don't slice with length 0. Length must be <0 to slice from RHS. - $summary = ($min_rpos === 0) ? $summary : substr($summary, 0, 0 - $min_rpos); - break; + if (preg_match('#^(.*)(' . $delimiters . ')#us', $summary, $matches)) { + $summary = $matches[1]; + // HTML tag. + if ($matches[2][0] == '<') { + $summary .= $matches[2]; } } diff --git a/modules/field/modules/text/text.test b/modules/field/modules/text/text.test index 2f14738..5904cb4 100644 --- a/modules/field/modules/text/text.test +++ b/modules/field/modules/text/text.test @@ -237,174 +237,6 @@ class TextFieldTestCase extends DrupalWebTestCase { } } -class TextSummaryTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Text summary', - 'description' => 'Test text_summary() with different strings and lengths.', - 'group' => 'Field types', - ); - } - - function setUp() { - parent::setUp(); - $this->article_creator = $this->drupalCreateUser(array('create article content', 'edit own article content')); - } - - /** - * Tests an edge case where the first sentence is a question and - * subsequent sentences are not. This edge case is documented at - * http://drupal.org/node/180425. - */ - function testFirstSentenceQuestion() { - $text = 'A question? A sentence. Another sentence.'; - $expected = 'A question? A sentence.'; - $this->callTextSummary($text, $expected, NULL, 30); - } - - /** - * Test summary with long example. - */ - function testLongSentence() { - $text = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ' . // 125 - 'Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ' . // 108 - 'Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. ' . // 103 - 'Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'; // 110 - $expected = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ' . - 'Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ' . - 'Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.'; - // First three sentences add up to: 336, so add one for space and then 3 to get half-way into next word. - $this->callTextSummary($text, $expected, NULL, 340); - } - - /** - * Test various summary length edge cases. - */ - function testLength() { - // This string tests a number of edge cases. - $text = "

\nHi\n

\n

\nfolks\n
\n!\n

"; - - // The summaries we expect text_summary() to return when $size is the index - // of each array item. - // Using no text format: - $expected = array( - "

\nHi\n

\n

\nfolks\n
\n!\n

", - "<", - "", - "

\n", - "

\nH", - "

\nHi", - "

\nHi\n", - "

\nHi\n<", - "

\nHi\n\nHi\n\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

\n

\nfolks\n
\n!\n

", - "

\nHi\n

\n

\nfolks\n
\n!\n

", - "

\nHi\n

\n

\nfolks\n
\n!\n

", - ); - - // And using a text format WITH the line-break and htmlcorrector filters. - $expected_lb = array( - "

\nHi\n

\n

\nfolks\n
\n!\n

", - "", - "

", - "

", - "

", - "

", - "

", - "

\nHi

", - "

\nHi

", - "

\nHi

", - "

\nHi

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

", - "

\nHi\n

\n

\nfolks\n
\n!\n

", - "

\nHi\n

\n

\nfolks\n
\n!\n

", - "

\nHi\n

\n

\nfolks\n
\n!\n

", - ); - - // Test text_summary() for different sizes. - for ($i = 0; $i <= 37; $i++) { - $this->callTextSummary($text, $expected[$i], NULL, $i); - $this->callTextSummary($text, $expected_lb[$i], 'plain_text', $i); - $this->callTextSummary($text, $expected_lb[$i], 'filtered_html', $i); - } - } - - /** - * Calls text_summary() and asserts that the expected teaser is returned. - */ - function callTextSummary($text, $expected, $format = NULL, $size = NULL) { - $summary = text_summary($text, $format, $size); - $this->assertIdentical($summary, $expected, format_string('Generated summary "@summary" matches expected "@expected".', array('@summary' => $summary, '@expected' => $expected))); - } - - /** - * Test sending only summary. - */ - function testOnlyTextSummary() { - // Login as article creator. - $this->drupalLogin($this->article_creator); - // Create article with summary but empty body. - $summary = $this->randomName(); - $edit = array( - "title" => $this->randomName(), - "body[und][0][summary]" => $summary, - ); - $this->drupalPost('node/add/article', $edit, t('Save')); - $node = $this->drupalGetNodeByTitle($edit['title']); - - $this->assertIdentical($node->body['und'][0]['summary'], $summary, 'Article with with summary and no body has been submitted.'); - } -} - class TextTranslationTestCase extends DrupalWebTestCase { public static function getInfo() { return array(