Joal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232177
Change subject: Correct bug in pageview definition
......................................................................
Correct bug in pageview definition
prevent outreach.wikimedia.org and donate.wikipedia.org to be classified as
pageviews.
Bug: T109256
Change-Id: Ic1b13da3befdb266dbbb75166023dee6a894030d
---
M
refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
M refinery-core/src/test/resources/pageview_test_data.csv
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source
refs/changes/77/232177/1
diff --git
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
index e45edcd..b065550 100644
---
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
+++
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
@@ -48,13 +48,13 @@
* Now back to the good part.
*/
private final Pattern uriHostWikimediaDomainPattern = Pattern.compile(
- "(commons|meta|incubator|species|outreach)\\." // any of these
domain names
+ "(commons|meta|incubator|species)\\." // any of these
domain names
+ "((m|mobile|wap|zero)\\.)?" // followed by an
optional mobile or zero qualifier
+ "wikimedia\\.org$" // ending with
wikimedia.org
);
private final Pattern uriHostProjectDomainPattern = Pattern.compile(
- "^((?!www)(?!test)([a-zA-Z0-9-_]+)\\.)*" // not starting
with "www." or "test"
+ "^((?!www)(?!test)(?!donate)([a-zA-Z0-9-_]+)\\.)*" // not
starting with "www." or "test"
+ "(wik(ibooks|" // match project domains ending in
.org
+ "inews|ipedia|iquote|isource|tionary|iversity|ivoyage))\\.org$"
);
diff --git a/refinery-core/src/test/resources/pageview_test_data.csv
b/refinery-core/src/test/resources/pageview_test_data.csv
index c8d6800..9565be4 100644
--- a/refinery-core/src/test/resources/pageview_test_data.csv
+++ b/refinery-core/src/test/resources/pageview_test_data.csv
@@ -30,4 +30,6 @@
"Is Pageview - Desktop -
wikimediafoundation",wikimediafoundation,default,Horseshoe_crab,true,false,false,174.62.175.82,-,wikimediafoundation.org,/wiki/Horseshoe_crab,-,200,text/html,turnip
Is Not Pageview -
Desktop,test2.wikipedia,default,Horseshoe_crab,false,true,false,174.62.175.82,-,test2.wikipedia.org,
/wiki/Horseshoe_crab,-,200,text/html, turnip
Is Not Pageview -
Desktop,test.wikimediafoundation,default,Horseshoe_crab,false,true,false,174.62.175.82,-,test.wikimediafoundation.org,
/wiki/Horseshoe_crab,-,200,text/html, turnip
-Is Not Pageview -
Desktop,wrongwikipedia,default,Horseshoe_crab,false,false,false,174.62.175.82,-,wrongwikipedia.org,
/wiki/Horseshoe_crab,-,200,text/html, turnip
\ No newline at end of file
+Is Not Pageview - Desktop - wrong
host,wrongwikipedia,default,Horseshoe_crab,false,false,false,174.62.175.82,-,wrongwikipedia.org,
/wiki/Horseshoe_crab,-,200,text/html, turnip
+Is Not Pageview - Desktop - wrong
host,outreach.wikimedia,default,Horseshoe_crab,false,true,false,174.62.175.82,-,outreach.wikimedia.org,
/wiki/Horseshoe_crab,-,200,text/html, turnip
+Is Not Pageview - Desktop - wrong
host,donate.wikipedia,default,Horseshoe_crab,false,true,false,174.62.175.82,-,donate.wikipedia.org,
/wiki/Horseshoe_crab,-,200,text/html, turnip
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/232177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1b13da3befdb266dbbb75166023dee6a894030d
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Joal <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
