From: Stanislav Malyshev <smalyshev@gmail.com>
Date: Fri, 8 Jul 2016 18:52:55 +0000 (-0700)
Subject: Improve comments on fields and fix opening_text - needs no highlights.
X-Git-Tag: 1.31.0-rc.0~6400^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=dc9e171e9898de24d8e93bce44ef0e2df110f2a1;p=lhc%2Fweb%2Fwiklou.git

Improve comments on fields and fix opening_text - needs no highlights.

Change-Id: Iad6876aae109ad84c5534619f47c72edc900d704
---

diff --git a/includes/content/WikitextContentHandler.php b/includes/content/WikitextContentHandler.php
index 86f0d50574..4e8f0df098 100644
--- a/includes/content/WikitextContentHandler.php
+++ b/includes/content/WikitextContentHandler.php
@@ -127,7 +127,8 @@ class WikitextContentHandler extends TextContentHandler {
 
 		$fields['opening_text'] =
 			$engine->makeSearchFieldMapping( 'opening_text', SearchIndexField::INDEX_TYPE_TEXT );
-		$fields['opening_text']->setFlag( SearchIndexField::FLAG_SCORING );
+		$fields['opening_text']->setFlag( SearchIndexField::FLAG_SCORING |
+		                                  SearchIndexField::FLAG_NO_HIGHLIGHT );
 
 		$fields['outgoing_link'] =
 			$engine->makeSearchFieldMapping( 'outgoing_link', SearchIndexField::INDEX_TYPE_KEYWORD );
diff --git a/includes/search/SearchIndexField.php b/includes/search/SearchIndexField.php
index 2ea255f400..7499853801 100644
--- a/includes/search/SearchIndexField.php
+++ b/includes/search/SearchIndexField.php
@@ -22,7 +22,9 @@ interface SearchIndexField {
 	 */
 	const FLAG_CASEFOLD = 1;
 	/**
-	 * This field is for scoring only.
+	 * This field contains secondary information, which is
+	 * already present in other fields, but can be used for
+	 * scoring.
 	 */
 	const FLAG_SCORING = 2;
 	/**
@@ -30,7 +32,7 @@ interface SearchIndexField {
 	 */
 	const FLAG_NO_HIGHLIGHT = 4;
 	/**
-	 * Do not index this field.
+	 * Do not index this field, just store it.
 	 */
 	const FLAG_NO_INDEX = 8;
 	/**