[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix full-text search.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363925 )
Change subject: Fix full-text search.
..
Fix full-text search.
The newly-Retrofitted full text search client seemed to be unconditionally
using the "morelike:" prefix when performing searches. Whereas, we should
only use morelike when searching for related articles.
Bug: T170017
Change-Id: Ib5aa0ef1674b915875b8a5648f894459274d53d0
---
M app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
3 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
index 3347c26..4cdd80d 100644
---
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
+++
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
@@ -60,7 +60,7 @@
private void getCardForHistoryEntry(@NonNull WikiSite wiki, @NonNull final
HistoryEntry entry,
final FeedClient.Callback cb) {
-request(wiki, entry.getTitle().getDisplayText(), null, null,
SUGGESTION_REQUEST_ITEMS,
+requestMoreLike(wiki, entry.getTitle().getDisplayText(), null, null,
SUGGESTION_REQUEST_ITEMS,
new FullTextSearchClient.Callback() {
@Override public void success(@NonNull Call call,
@NonNull SearchResults results) {
diff --git
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index d3429b2..c663d4f 100644
---
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -326,7 +326,7 @@
return;
}
final long timeMillis = System.currentTimeMillis();
-new FullTextSearchClient().request(entry.getTitle().getWikiSite(),
+new
FullTextSearchClient().requestMoreLike(entry.getTitle().getWikiSite(),
entry.getTitle().getPrefixedText(), null, null,
Constants.MAX_SUGGESTION_RESULTS * 2, new
FullTextSearchClient.Callback() {
@Override
diff --git a/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
b/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
index 392b36c..593f720 100644
--- a/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
+++ b/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
@@ -31,13 +31,19 @@
return request(cachedService.service(wiki), wiki, searchTerm, cont,
gsrOffset, limit, cb);
}
+public Call requestMoreLike(@NonNull WikiSite wiki,
@NonNull String searchTerm,
+ @Nullable String cont,
@Nullable String gsrOffset,
+ int limit, @NonNull Callback
cb) {
+return request(cachedService.service(wiki), wiki,
moreLike(searchTerm), cont, gsrOffset, limit, cb);
+}
+
@VisibleForTesting Call request(@NonNull Service service,
@NonNull final WikiSite
wiki,
@NonNull String
searchTerm,
@Nullable String cont,
@Nullable String
gsrOffset,
int limit, @NonNull final
Callback cb) {
-call = service.request(moreLike(searchTerm), limit, cont, gsrOffset);
+call = service.request(searchTerm, limit, cont, gsrOffset);
call.enqueue(new retrofit2.Callback() {
@Override
public void onResponse(@NonNull Call call,
--
To view, visit https://gerrit.wikimedia.org/r/363925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5aa0ef1674b915875b8a5648f894459274d53d0
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: Niedzielski
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix full-text search.
Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363925 )
Change subject: Fix full-text search.
..
Fix full-text search.
The newly-Retrofitted full text search client seemed to be unconditionally
using the "morelike:" prefix when performing searches. Whereas, we should
only use morelike when searching for related articles.
Bug: T170017
Change-Id: Ib5aa0ef1674b915875b8a5648f894459274d53d0
---
M app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
3 files changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/25/363925/1
diff --git
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
index 3347c26..4cdd80d 100644
---
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
+++
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
@@ -60,7 +60,7 @@
private void getCardForHistoryEntry(@NonNull WikiSite wiki, @NonNull final
HistoryEntry entry,
final FeedClient.Callback cb) {
-request(wiki, entry.getTitle().getDisplayText(), null, null,
SUGGESTION_REQUEST_ITEMS,
+requestMoreLike(wiki, entry.getTitle().getDisplayText(), null, null,
SUGGESTION_REQUEST_ITEMS,
new FullTextSearchClient.Callback() {
@Override public void success(@NonNull Call call,
@NonNull SearchResults results) {
diff --git
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index d3429b2..c663d4f 100644
---
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -326,7 +326,7 @@
return;
}
final long timeMillis = System.currentTimeMillis();
-new FullTextSearchClient().request(entry.getTitle().getWikiSite(),
+new
FullTextSearchClient().requestMoreLike(entry.getTitle().getWikiSite(),
entry.getTitle().getPrefixedText(), null, null,
Constants.MAX_SUGGESTION_RESULTS * 2, new
FullTextSearchClient.Callback() {
@Override
diff --git a/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
b/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
index 392b36c..593f720 100644
--- a/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
+++ b/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
@@ -31,13 +31,19 @@
return request(cachedService.service(wiki), wiki, searchTerm, cont,
gsrOffset, limit, cb);
}
+public Call requestMoreLike(@NonNull WikiSite wiki,
@NonNull String searchTerm,
+ @Nullable String cont,
@Nullable String gsrOffset,
+ int limit, @NonNull Callback
cb) {
+return request(cachedService.service(wiki), wiki,
moreLike(searchTerm), cont, gsrOffset, limit, cb);
+}
+
@VisibleForTesting Call request(@NonNull Service service,
@NonNull final WikiSite
wiki,
@NonNull String
searchTerm,
@Nullable String cont,
@Nullable String
gsrOffset,
int limit, @NonNull final
Callback cb) {
-call = service.request(moreLike(searchTerm), limit, cont, gsrOffset);
+call = service.request(searchTerm, limit, cont, gsrOffset);
call.enqueue(new retrofit2.Callback() {
@Override
public void onResponse(@NonNull Call call,
--
To view, visit https://gerrit.wikimedia.org/r/363925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5aa0ef1674b915875b8a5648f894459274d53d0
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
