DCausse has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345863 )
Change subject: [cirrus] Distinguish morelike vs fulltext api search requests
......................................................................
[cirrus] Distinguish morelike vs fulltext api search requests
Since mobile has enabled the RelatedArticle feature on 90%
of the taffic on enwiki it's hard to have an idea of the real
fulltext api usage.
NOTE: this is just a suggestion and will require a followup patch
in our dashboards to take into account this new search api type.
Change-Id: I7cc701bdc985323fc1fb0a74cc72c67fcdc65b10
---
M
refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/SearchRequest.java
M
refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestSearchRequest.java
2 files changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source
refs/changes/63/345863/1
diff --git
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/SearchRequest.java
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/SearchRequest.java
index e71a82a..f605857 100644
---
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/SearchRequest.java
+++
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/SearchRequest.java
@@ -53,6 +53,8 @@
private final Pattern prefixSearch =
Pattern.compile("(list|generator)=prefixsearch");
+ private final Pattern moreLikeSearch =
Pattern.compile("(gsr|sr)search=morelike");
+
private final Pattern search = Pattern.compile("(list|generator)=search");
private final Pattern geoSearch =
Pattern.compile("(list|generator)=geosearch");
@@ -85,7 +87,14 @@
}
else if(Utilities.patternIsFound(search, uriQuery))
{
- output = "cirrus";
+ if ( Utilities.patternIsFound(moreLikeSearch, uriQuery))
+ {
+ output = "cirrusMoreLike";
+ }
+ else
+ {
+ output = "cirrus";
+ }
}
else if(Utilities.patternIsFound(geoSearch, uriQuery))
{
diff --git
a/refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestSearchRequest.java
b/refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestSearchRequest.java
index 58fe357..ddd411b 100644
---
a/refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestSearchRequest.java
+++
b/refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestSearchRequest.java
@@ -48,7 +48,9 @@
{"normal page", "/wiki/Foobarbaz", "", "", false},
{"random api", "w/api.php",
"maxlag=5&format=json&meta=userinfo&action=query", "", false},
{"search api via list", "w/api.php",
"action=query&list=search&srsearch=hosted desktop&srprop=snippet", "cirrus",
true},
+ {"morelike api via list", "w/api.php",
"action=query&list=search&srsearch=morelike:Hello+World&srprop=snippet",
"cirrusMoreLike", true},
{"search api via generator", "/w/api.php",
"?action=query&format=json&prop=pageterms%7Cpageimages&wbptterms=description&generator=search&gsrsearch=blah+blah&gsrnamespace=0&gsrwhat=text&gsrinfo=&gsrprop=redirecttitle&gsrlimit=12&piprop=thumbnail&pithumbsize=96&pilimit=12&continue=",
"cirrus", true},
+ {"morelike api via generator", "/w/api.php",
"?action=query&format=json&prop=pageterms%7Cpageimages&wbptterms=description&generator=search&gsrsearch=morelike:Hello+World&gsrnamespace=0&gsrwhat=text&gsrinfo=&gsrprop=redirecttitle&gsrlimit=12&piprop=thumbnail&pithumbsize=96&pilimit=12&continue=",
"cirrusMoreLike", true},
{"opensearch api", "/w/api.php",
"action=opensearch&format=json&search=d1&namespace=0&limit=10", "open", true},
{"language search",
"w/api.php","action=languagesearch&search=espa", "language", true},
{"geosearch via list",
"w/api.php","action=query&list=geosearch&gsradius=10000&gscoord=13.99861|100.53008",
"geo", true},
--
To view, visit https://gerrit.wikimedia.org/r/345863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cc701bdc985323fc1fb0a74cc72c67fcdc65b10
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: DCausse <dcau...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
