[MediaWiki-commits] [Gerrit] Consolidate Title normalization code in SearchUpdate - change (mediawiki/core)

2015-12-03 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Consolidate Title normalization code in SearchUpdate
..


Consolidate Title normalization code in SearchUpdate

and rename the private method to be more clear

Change-Id: Iec7b934babddd102402cfa7616accd91fd3422ff
---
M includes/deferred/SearchUpdate.php
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/deferred/SearchUpdate.php 
b/includes/deferred/SearchUpdate.php
index 867fc61..f6c80f4 100644
--- a/includes/deferred/SearchUpdate.php
+++ b/includes/deferred/SearchUpdate.php
@@ -86,8 +86,7 @@
continue;
}
 
-   $indexTitle = $this->indexTitle( $search );
-   $normalTitle = $search->normalizeText( $indexTitle );
+   $normalTitle = $this->getNormalizedTitle( $search );
 
if ( $page === null ) {
$search->delete( $this->id, $normalTitle );
@@ -174,13 +173,13 @@
}
 
/**
-* Get a string representation of a title suitable for
+* Get a normalized string representation of a title suitable for
 * including in a search index
 *
 * @param SearchEngine $search
 * @return string A stripped-down title string ready for the search 
index
 */
-   private function indexTitle( SearchEngine $search ) {
+   private function getNormalizedTitle( SearchEngine $search ) {
global $wgContLang;
 
$ns = $this->title->getNamespace();
@@ -200,6 +199,7 @@
if ( $ns == NS_FILE ) {
$t = preg_replace( "/ (png|gif|jpg|jpeg|ogg)$/", "", $t 
);
}
-   return trim( $t );
+
+   return $search->normalizeText( trim( $t ) );
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/256426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec7b934babddd102402cfa7616accd91fd3422ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Consolidate Title normalization code in SearchUpdate - change (mediawiki/core)

2015-12-02 Thread Aude (Code Review) 
Aude has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/256426

Change subject: Consolidate Title normalization code in SearchUpdate
..

Consolidate Title normalization code in SearchUpdate

and rename the private method to be more clear

Change-Id: Iec7b934babddd102402cfa7616accd91fd3422ff
---
M includes/deferred/SearchUpdate.php
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/26/256426/1

diff --git a/includes/deferred/SearchUpdate.php 
b/includes/deferred/SearchUpdate.php
index 867fc61..f6c80f4 100644
--- a/includes/deferred/SearchUpdate.php
+++ b/includes/deferred/SearchUpdate.php
@@ -86,8 +86,7 @@
continue;
}
 
-   $indexTitle = $this->indexTitle( $search );
-   $normalTitle = $search->normalizeText( $indexTitle );
+   $normalTitle = $this->getNormalizedTitle( $search );
 
if ( $page === null ) {
$search->delete( $this->id, $normalTitle );
@@ -174,13 +173,13 @@
}
 
/**
-* Get a string representation of a title suitable for
+* Get a normalized string representation of a title suitable for
 * including in a search index
 *
 * @param SearchEngine $search
 * @return string A stripped-down title string ready for the search 
index
 */
-   private function indexTitle( SearchEngine $search ) {
+   private function getNormalizedTitle( SearchEngine $search ) {
global $wgContLang;
 
$ns = $this->title->getNamespace();
@@ -200,6 +199,7 @@
if ( $ns == NS_FILE ) {
$t = preg_replace( "/ (png|gif|jpg|jpeg|ogg)$/", "", $t 
);
}
-   return trim( $t );
+
+   return $search->normalizeText( trim( $t ) );
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/256426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec7b934babddd102402cfa7616accd91fd3422ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits