jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334412 )
Change subject: Add content model indexing
......................................................................
Add content model indexing
Bug: T156371
Change-Id: I1514f9db70870ec05b30153cc56558af0a28b8c9
---
M includes/content/ContentHandler.php
M tests/phpunit/includes/content/ContentHandlerTest.php
2 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
Aude: Looks good to me, but someone else must approve
Jonas Kress (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/content/ContentHandler.php
b/includes/content/ContentHandler.php
index 5862bf1..119144a 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -1104,7 +1104,6 @@
'category',
SearchIndexField::INDEX_TYPE_TEXT
);
-
$fields['category']->setFlag( SearchIndexField::FLAG_CASEFOLD );
$fields['external_link'] = $engine->makeSearchFieldMapping(
@@ -1121,8 +1120,12 @@
'template',
SearchIndexField::INDEX_TYPE_KEYWORD
);
-
$fields['template']->setFlag( SearchIndexField::FLAG_CASEFOLD );
+
+ $fields['content_model'] = $engine->makeSearchFieldMapping(
+ 'content_model',
+ SearchIndexField::INDEX_TYPE_KEYWORD
+ );
return $fields;
}
@@ -1170,6 +1173,7 @@
$fieldData['text'] = $text;
$fieldData['source_text'] = $text;
$fieldData['text_bytes'] = $content->getSize();
+ $fieldData['content_model'] = $content->getModel();
}
Hooks::run( 'SearchDataForIndex', [ &$fieldData, $this, $page,
$output, $engine ] );
diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php
b/tests/phpunit/includes/content/ContentHandlerTest.php
index 91d2297..efd60e5fb 100644
--- a/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -409,6 +409,7 @@
$this->assertArrayHasKey( 'external_link', $fields );
$this->assertArrayHasKey( 'outgoing_link', $fields );
$this->assertArrayHasKey( 'template', $fields );
+ $this->assertArrayHasKey( 'content_model', $fields );
}
private function newSearchEngine() {
@@ -445,6 +446,7 @@
$this->assertArrayHasKey( 'language', $data );
$this->assertArrayHasKey( 'testDataField', $data );
$this->assertEquals( 'test content', $data['testDataField'] );
+ $this->assertEquals( 'wikitext', $data['content_model'] );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/334412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1514f9db70870ec05b30153cc56558af0a28b8c9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
