Renamed Aggregate::Count to Aggregate::Frequencies
diff --git a/lib/Krawfish/Koral/Meta.pm b/lib/Krawfish/Koral/Meta.pm
index dc1f61b..6f73b47 100644
--- a/lib/Krawfish/Koral/Meta.pm
+++ b/lib/Krawfish/Koral/Meta.pm
@@ -6,7 +6,7 @@
use Krawfish::Result::Limit;
use Krawfish::Result::Segment::Aggregate;
use Krawfish::Result::Segment::Aggregate::Facets;
-use Krawfish::Result::Segment::Aggregate::Count;
+use Krawfish::Result::Segment::Aggregate::Frequencies;
use Krawfish::Result::Segment::Aggregate::Length;
use Krawfish::Result::Segment::Aggregate::Values;
use strict;
@@ -177,7 +177,7 @@
# This may be obsolete in some cases, because other aggregations already
# count frequencies.
if ($self->{count}) {
- push @aggr, Krawfish::Result::Segment::Aggregate::Count->new;
+ push @aggr, Krawfish::Result::Segment::Aggregate::Frequencies->new;
};
if ($self->{length}) {
diff --git a/lib/Krawfish/Result/Segment/Aggregate/Base.pm b/lib/Krawfish/Result/Segment/Aggregate/Base.pm
index f8e43da..37e546f 100644
--- a/lib/Krawfish/Result/Segment/Aggregate/Base.pm
+++ b/lib/Krawfish/Result/Segment/Aggregate/Base.pm
@@ -2,17 +2,22 @@
use strict;
use warnings;
+# Does not need anything in the object
sub new {
my $class = shift;
bless \(my $self = ''), $class;
};
+# Per default do nothing
sub each_doc {};
+# Per default do nothing
sub each_match {};
+# Per default do nothing
sub on_finish {};
+# Not implemented on base
sub to_string {
...
};
diff --git a/lib/Krawfish/Result/Segment/Aggregate/Count.pm b/lib/Krawfish/Result/Segment/Aggregate/Frequencies.pm
similarity index 62%
rename from lib/Krawfish/Result/Segment/Aggregate/Count.pm
rename to lib/Krawfish/Result/Segment/Aggregate/Frequencies.pm
index 04c1c29..f6fcf0a 100644
--- a/lib/Krawfish/Result/Segment/Aggregate/Count.pm
+++ b/lib/Krawfish/Result/Segment/Aggregate/Frequencies.pm
@@ -1,13 +1,14 @@
-package Krawfish::Result::Segment::Aggregate::Count;
+package Krawfish::Result::Segment::Aggregate::Frequencies;
use parent 'Krawfish::Result::Segment::Aggregate::Base';
use Krawfish::Log;
use strict;
use warnings;
-# TODO: Rename to frequencies
-# TODO: Support virtual corpus classes
+# Count the frequencies of all matches of the query
+# per doc and per match
-use constant DEBUG => 0;
+# TODO:
+# Support virtual corpus classes
# Add to totalResources immediately
sub each_doc {
@@ -23,7 +24,8 @@
# Stringification
sub to_string {
- 'count'
+ 'freq'
};
1;
+
diff --git a/t/result/segment/aggregate_count.t b/t/result/segment/aggregate_freq.t
similarity index 72%
rename from t/result/segment/aggregate_count.t
rename to t/result/segment/aggregate_freq.t
index 445181b..a61e097 100644
--- a/t/result/segment/aggregate_count.t
+++ b/t/result/segment/aggregate_freq.t
@@ -6,7 +6,7 @@
use_ok('Krawfish::Index');
use_ok('Krawfish::Koral::Query::Builder');
use_ok('Krawfish::Result::Segment::Aggregate');
-use_ok('Krawfish::Result::Segment::Aggregate::Count');
+use_ok('Krawfish::Result::Segment::Aggregate::Frequencies');
my $index = Krawfish::Index->new;
@@ -25,13 +25,14 @@
my $query = $kq->token('bb');
-my $count = Krawfish::Result::Segment::Aggregate::Count->new;
+my $freq = Krawfish::Result::Segment::Aggregate::Frequencies->new;
+is($freq->to_string, 'freq');
-# Get count object
+# Get freq object
ok(my $aggr = Krawfish::Result::Segment::Aggregate->new(
$query->normalize->finalize->optimize($index),
- [$count]
-), 'Create count object');
+ [$freq]
+), 'Create freq object');
ok($aggr->next, 'Next');
ok($aggr->next, 'Next');
@@ -41,22 +42,22 @@
is($aggr->result->{totalResources}, 2, 'Document frequency');
is($aggr->result->{totalResults}, 2, 'Occurrence frequency');
-is($aggr->to_string, "aggregate([count]:'bb')", 'Get counts');
+is($aggr->to_string, "aggregate([freq]:'bb')", 'Get freqs');
$query = $kq->token('cc');
-$count = Krawfish::Result::Segment::Aggregate::Count->new;
+$freq = Krawfish::Result::Segment::Aggregate::Frequencies->new;
-# Get count object
+# Get freq object
ok($aggr = Krawfish::Result::Segment::Aggregate->new(
$query->normalize->finalize->optimize($index),
- [$count]
-), 'Create count object');
+ [$freq]
+), 'Create freq object');
# Search till the end
ok($aggr->finalize, 'Finish');
# Stringify
-is($aggr->to_string, "aggregate([count]:'cc')", 'Get counts');
+is($aggr->to_string, "aggregate([freq]:'cc')", 'Get freqs');
is($aggr->result->{totalResources}, 1, 'Document frequency');
is($aggr->result->{totalResults}, 2, 'Occurrence frequency');