Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 95B15200C07 for ; Sun, 8 Jan 2017 00:55:38 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 94545160B4A; Sat, 7 Jan 2017 23:55:38 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DC30B160B3C for ; Sun, 8 Jan 2017 00:55:37 +0100 (CET) Received: (qmail 31588 invoked by uid 500); 7 Jan 2017 23:55:37 -0000 Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ponymail.incubator.apache.org Delivered-To: mailing list commits@ponymail.incubator.apache.org Received: (qmail 31578 invoked by uid 99); 7 Jan 2017 23:55:37 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jan 2017 23:55:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 7BD9C1A059F for ; Sat, 7 Jan 2017 23:55:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id DTldthlSeZOJ for ; Sat, 7 Jan 2017 23:55:35 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 188725F1BA for ; Sat, 7 Jan 2017 23:55:33 +0000 (UTC) Received: (qmail 31563 invoked by uid 99); 7 Jan 2017 23:55:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jan 2017 23:55:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 07DE5DF9FD; Sat, 7 Jan 2017 23:55:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sebb@apache.org To: commits@ponymail.incubator.apache.org Message-Id: <1cc6b29c9e4e4cb7afa932a9f25a12e3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ponymail git commit: 'hot topics' feature should use terms, not significant_terms Date: Sat, 7 Jan 2017 23:55:32 +0000 (UTC) archived-at: Sat, 07 Jan 2017 23:55:38 -0000 Repository: incubator-ponymail Updated Branches: refs/heads/master e153c4abc -> 2ebf5e7a7 'hot topics' feature should use terms, not significant_terms This fixes #329 Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/2ebf5e7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/2ebf5e7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/2ebf5e7a Branch: refs/heads/master Commit: 2ebf5e7a735f54042c6c59d80a932bb4bc6a96cd Parents: e153c4a Author: Sebb Authored: Sat Jan 7 23:55:21 2017 +0000 Committer: Sebb Committed: Sat Jan 7 23:55:21 2017 +0000 ---------------------------------------------------------------------- CHANGELOG.md | 1 + site/api/stats.lua | 6 ++++-- tools/setup.py | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/2ebf5e7a/CHANGELOG.md ---------------------------------------------------------------------- diff --git a/CHANGELOG.md b/CHANGELOG.md index b440207..14e9c30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -109,6 +109,7 @@ - absolute URLs must be prefixed with URLBase in JS files (#327) - cannot use absolute URLs in HTML pages (#328) - setup.py now prompts for shard and replica counts when creating the index (#313) +- 'hot topics' feature should use terms, not significant_terms (#329) ## CHANGES in 0.9b: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/2ebf5e7a/site/api/stats.lua ---------------------------------------------------------------------- diff --git a/site/api/stats.lua b/site/api/stats.lua index a8f11ec..62da9f1 100644 --- a/site/api/stats.lua +++ b/site/api/stats.lua @@ -30,6 +30,8 @@ local days = { } local BODY_MAXLEN = config.stats_maxBody or 200 +-- words to exclude from word cloud: +local EXCLUDE = config.stats_wordExclude or ".|..|..." local function sortEmail(thread) if thread.children and type(thread.children) == "table" then @@ -411,10 +413,10 @@ function handle(r) terminate_after = 100, aggs = { cloud = { - significant_terms = { + terms = { field = "subject", size = 10, - chi_square = {} + exclude = EXCLUDE } } }, http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/2ebf5e7a/tools/setup.py ---------------------------------------------------------------------- diff --git a/tools/setup.py b/tools/setup.py index c02116a..19d4bd5 100755 --- a/tools/setup.py +++ b/tools/setup.py @@ -501,6 +501,7 @@ local config = { full_headers = false, maxResults = 5000, -- max emails to return in one go. Might need to be bumped for large lists -- stats_maxBody = 200, -- max size of body snippet returned by stats.lua +-- stats_wordExclude = ".|..|...", -- patterns to exclude from word cloud generated by stats.lua admin_oauth = {}, -- list of domains that may do administrative oauth (private list access) -- add 'www.googleapis.com' to the list for google oauth to decide, for instance. oauth_fields = { -- used for specifying individual oauth handling parameters.