[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update search clients to use converttitles

2017-10-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383595 )

Change subject: Update search clients to use converttitles
..


Update search clients to use converttitles

Also update FullTextSearchClient's params to begin with 'action' because
it messes with my mind when that doesn't come first. :[

Change-Id: I926c93a2f078db3ba435e68d78649d779f865c6d
---
M app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
M app/src/main/java/org/wikipedia/search/PrefixSearchClient.java
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java 
b/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
index 593f720..dc412b4 100644
--- a/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
+++ b/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
@@ -88,7 +88,7 @@
 }
 
 protected interface Service {
-String QUERY_PREFIX = 
"w/api.php?format=json=2=query"
+String QUERY_PREFIX = 
"w/api.php?action=query=json=2="
 + 
"=pageterms|pageimages|pageprops=mainpage|disambiguation"
 + 
"=description=search=0=text"
 + 
"==redirecttitle=thumbnail=any="
diff --git a/app/src/main/java/org/wikipedia/search/PrefixSearchClient.java 
b/app/src/main/java/org/wikipedia/search/PrefixSearchClient.java
index a87fda7..d984cc3 100644
--- a/app/src/main/java/org/wikipedia/search/PrefixSearchClient.java
+++ b/app/src/main/java/org/wikipedia/search/PrefixSearchClient.java
@@ -114,8 +114,8 @@
 String QUERY_PREFIX = 
"w/api.php?action=query=json=2=true"
 + 
"=pageterms|pageimages=description=thumbnail=any"
 + 
"=prefixsearch=0=search=0=text"
-+ "=suggestion==0=1=" 
+ MAX_RESULTS
-+ "=" + Constants.PREFERRED_THUMB_SIZE;
++ 
"=suggestion===0=1="
++ MAX_RESULTS + "=" + 
Constants.PREFERRED_THUMB_SIZE;
 
 @GET(QUERY_PREFIX)
 @NonNull Call request(@Query("gpssearch") String 
title,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I926c93a2f078db3ba435e68d78649d779f865c6d
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Sharvaniharan 
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]: Update search clients to use converttitles

2017-10-11 Thread Mholloway (Code Review) 
Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383595 )

Change subject: Update search clients to use converttitles
..

Update search clients to use converttitles

Change-Id: I926c93a2f078db3ba435e68d78649d779f865c6d
---
M app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
M app/src/main/java/org/wikipedia/search/PrefixSearchClient.java
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/95/383595/1

diff --git a/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java 
b/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
index 593f720..715e3dd 100644
--- a/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
+++ b/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
@@ -88,7 +88,7 @@
 }
 
 protected interface Service {
-String QUERY_PREFIX = 
"w/api.php?format=json=2=query"
+String QUERY_PREFIX = 
"w/api.php?format=json=2=query="
 + 
"=pageterms|pageimages|pageprops=mainpage|disambiguation"
 + 
"=description=search=0=text"
 + 
"==redirecttitle=thumbnail=any="
diff --git a/app/src/main/java/org/wikipedia/search/PrefixSearchClient.java 
b/app/src/main/java/org/wikipedia/search/PrefixSearchClient.java
index a87fda7..d984cc3 100644
--- a/app/src/main/java/org/wikipedia/search/PrefixSearchClient.java
+++ b/app/src/main/java/org/wikipedia/search/PrefixSearchClient.java
@@ -114,8 +114,8 @@
 String QUERY_PREFIX = 
"w/api.php?action=query=json=2=true"
 + 
"=pageterms|pageimages=description=thumbnail=any"
 + 
"=prefixsearch=0=search=0=text"
-+ "=suggestion==0=1=" 
+ MAX_RESULTS
-+ "=" + Constants.PREFERRED_THUMB_SIZE;
++ 
"=suggestion===0=1="
++ MAX_RESULTS + "=" + 
Constants.PREFERRED_THUMB_SIZE;
 
 @GET(QUERY_PREFIX)
 @NonNull Call request(@Query("gpssearch") String 
title,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I926c93a2f078db3ba435e68d78649d779f865c6d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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