Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/69944
Change subject: Fix prefix searching to respect namespaces, plus proper output
......................................................................
Fix prefix searching to respect namespaces, plus proper output
Change-Id: I7fe24babf86bc7c983c02c290eb1863830ad7247
---
M CirrusSearch.body.php
M config/SchemaBuilder.php
2 files changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/44/69944/1
diff --git a/CirrusSearch.body.php b/CirrusSearch.body.php
index ac736bd..8e3a748 100644
--- a/CirrusSearch.body.php
+++ b/CirrusSearch.body.php
@@ -64,12 +64,17 @@
public static function prefixSearch( $ns, $search, $limit, &$results ) {
// Boilerplate
+ $nsNames =
RequestContext::getMain()->getLanguage()->getNamespaces();
$client = self::getClient();
$query = $client->createSelect();
// Query params
$query->setRows( $limit );
wfDebugLog( 'CirrusSearch', "Prefix searching: $search" );
+ if( count( $ns ) ) {
+ $query->createFilterQuery( 'namespace' )
+ ->setQuery( 'namespace:' . implode( ' OR ', $ns
) );
+ }
$query->setQuery( 'titlePrefix:%T1%', array( $search ) );
// Perform the search
@@ -82,7 +87,7 @@
// We only care about title results
foreach( $res as $r ) {
- $results[] = $r->title;
+ $results[] = Title::makeTitle( $r->namespace, $r->title
)->getPrefixedText();
}
return false;
diff --git a/config/SchemaBuilder.php b/config/SchemaBuilder.php
index fb1b3a4..99fce23 100644
--- a/config/SchemaBuilder.php
+++ b/config/SchemaBuilder.php
@@ -33,7 +33,7 @@
<fields>
<field name="_version_" type="long" indexed="true"
stored="true" required="true" /> <!-- Required for Solr Cloud -->
<field name="id" type="id" indexed="true" stored="true"
required="true" />
- <field name="namespace" type="integer" indexed="true"
stored="false" required="true" />
+ <field name="namespace" type="integer" indexed="true"
stored="true" required="true" />
<field name="title" type="text_splitting" indexed="true"
stored="true" required="true" />
<field name="text" type="text_splitting" indexed="true"
stored="true" />
<field name="textLen" type="long" indexed="true" stored="false"
/>
--
To view, visit https://gerrit.wikimedia.org/r/69944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fe24babf86bc7c983c02c290eb1863830ad7247
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Demon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
