oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

passiveLog entry should land in the first bucket that matches, not all

Browse source 
buckets that match.

Added help info about escaping meta-characters in regexps.
This commit is contained in:
Patrick Donelan 2009-02-01 16:11:47 +11:00
parent bd38691cf0
commit f1968c9d40
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Workflow/Activity/BucketPassiveAnalytics.pm
View file

@ -107,7 +107,11 @@ EOSQL1
my $bucketFound = 0; my $bucketFound = 0;
RULE: foreach my $rule (@rules) { RULE: foreach my $rule (@rules) {
next RULE unless $rule->matchesBucket($entry); next RULE unless $rule->matchesBucket($entry);
# Into the bucket she goes..
$bucketSth->execute([$entry->{userId}, $rule->get('bucketName'), $entry->{delta}, $entry->{stamp}]); $bucketSth->execute([$entry->{userId}, $rule->get('bucketName'), $entry->{delta}, $entry->{stamp}]);
$bucketFound = 1;
last RULE;
} }
if (!$bucketFound) { if (!$bucketFound) {
$bucketSth->execute([$entry->{userId}, 'Other', $entry->{delta}, $entry->{stamp}]); $bucketSth->execute([$entry->{userId}, 'Other', $entry->{delta}, $entry->{stamp}]);

2
lib/WebGUI/i18n/English/PassiveAnalytics.pm
View file

@ -52,6 +52,8 @@ $ = end of url<br />
* = any amount<br /> * = any amount<br />
+ = 1 or more<br /> + = 1 or more<br />
? = 0 or 1<br /> ? = 0 or 1<br />
Meta characters should be backslash-escaped if you want to match them as ordinary text, e.g.<br />
home\?func=match, or<br />
|, |,
lastUpdated => 0, lastUpdated => 0,
context => q|| context => q||