Mailing List Archive

Author: creamyg
Date: 2008-07-27 17:47:14 -0700 (Sun, 27 Jul 2008)
New Revision: 3648

Modified:
trunk/perl/lib/KinoSearch.pm
trunk/perl/lib/KinoSearch/QueryParser.pm
trunk/perl/lib/KinoSearch/Search/ANDQuery.pm
trunk/perl/lib/KinoSearch/Search/ANDScorer.pm
trunk/perl/lib/KinoSearch/Search/Compiler.pm
trunk/perl/lib/KinoSearch/Search/FieldDoc.pm
trunk/perl/lib/KinoSearch/Search/FieldDocCollator.pm
trunk/perl/lib/KinoSearch/Search/HitCollector.pm
trunk/perl/lib/KinoSearch/Search/HitQueue.pm
trunk/perl/lib/KinoSearch/Search/Hits.pm
trunk/perl/lib/KinoSearch/Search/LeafQuery.pm
trunk/perl/lib/KinoSearch/Search/MatchAllQuery.pm
trunk/perl/lib/KinoSearch/Search/MatchAllScorer.pm
trunk/perl/lib/KinoSearch/Search/MultiSearcher.pm
trunk/perl/lib/KinoSearch/Search/NOTQuery.pm
trunk/perl/lib/KinoSearch/Search/NOTScorer.pm
trunk/perl/lib/KinoSearch/Search/NoMatchQuery.pm
trunk/perl/lib/KinoSearch/Search/NoMatchScorer.pm
trunk/perl/lib/KinoSearch/Search/ORQuery.pm
trunk/perl/lib/KinoSearch/Search/ORScorer.pm
trunk/perl/lib/KinoSearch/Search/PhraseQuery.pm
trunk/perl/lib/KinoSearch/Search/PhraseScorer.pm
trunk/perl/lib/KinoSearch/Search/PolyCompiler.pm
trunk/perl/lib/KinoSearch/Search/PolyQuery.pm
trunk/perl/lib/KinoSearch/Search/Query.pm
trunk/perl/lib/KinoSearch/Search/RangeQuery.pm
trunk/perl/lib/KinoSearch/Search/RangeScorer.pm
trunk/perl/lib/KinoSearch/Search/RemoteFieldDoc.pm
trunk/perl/lib/KinoSearch/Search/RequiredOptionalQuery.pm
trunk/perl/lib/KinoSearch/Search/RequiredOptionalScorer.pm
trunk/perl/lib/KinoSearch/Search/ScoreDoc.pm
trunk/perl/lib/KinoSearch/Search/Scorer.pm
trunk/perl/lib/KinoSearch/Search/Searchable.pm
trunk/perl/lib/KinoSearch/Search/Similarity.pm
trunk/perl/lib/KinoSearch/Search/SortCollector.pm
trunk/perl/lib/KinoSearch/Search/SortSpec.pm
trunk/perl/lib/KinoSearch/Search/SortedHitQueue.pm
trunk/perl/lib/KinoSearch/Search/Tally.pm
trunk/perl/lib/KinoSearch/Search/TermQuery.pm
trunk/perl/lib/KinoSearch/Search/TermScorer.pm
trunk/perl/lib/KinoSearch/Search/TopDocCollector.pm
trunk/perl/lib/KinoSearch/Search/TopDocs.pm
Log:
Migrate Perl code from KinoSearch::Search::* and KinoSearch::QueryParser into
KinoSearch.pm.


Modified: trunk/perl/lib/KinoSearch/QueryParser.pm
===================================================================
--- trunk/perl/lib/KinoSearch/QueryParser.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/QueryParser.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,28 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::QueryParser;
-use KinoSearch::Util::ToolSet qw( to_kino );
-use KinoSearch::base qw( KinoSearch::Obj );
-
-use KinoSearch::Analysis::TokenBatch;
-use KinoSearch::Analysis::Tokenizer;
-use KinoSearch::Search::PhraseQuery;
-use KinoSearch::Search::TermQuery;
-use KinoSearch::Search::ANDQuery;
-use KinoSearch::Search::ORQuery;
-use KinoSearch::Search::NOTQuery;
-use KinoSearch::Search::RequiredOptionalQuery;
-use KinoSearch::Search::MatchAllQuery;
-use KinoSearch::Search::NoMatchQuery;
-use KinoSearch::Search::LeafQuery;
-
-sub new {
- my ( $either, %args ) = @_;
- $args{fields} = to_kino( $args{fields} ) if defined $args{fields};
- return $either->do_new(%args);
-}
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/ANDQuery.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/ANDQuery.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/ANDQuery.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,14 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::ANDQuery;
-use KinoSearch::base qw( KinoSearch::Search::PolyQuery );
-
-package KinoSearch::Search::ANDCompiler;
-use KinoSearch::base qw( KinoSearch::Search::PolyCompiler );
-
-use KinoSearch::Search::ANDScorer;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/ANDScorer.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/ANDScorer.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/ANDScorer.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::ANDScorer;
-use KinoSearch::base qw( KinoSearch::Search::Scorer );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/Compiler.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/Compiler.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/Compiler.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,25 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::Compiler;
-use KinoSearch::Util::ToolSet qw( a_isa_b confess );
-use KinoSearch::base qw( KinoSearch::Obj );
-
-sub new {
- my ( $either, %args ) = @_;
- if ( !defined $args{boost} ) {
- confess("'parent' is not a Query")
- unless a_isa_b( $args{parent}, "KinoSearch::Search::Query" );
- $args{boost} = $args{parent}->get_boost;
- }
- return $either->do_new(%args);
-}
-
-sub highlight_spans {
- my $self = shift;
- return @{ $self->_highlight_spans(@_)->to_perl };
-}
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/FieldDoc.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/FieldDoc.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/FieldDoc.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::FieldDoc;
-use KinoSearch::base qw( KinoSearch::Search::ScoreDoc );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/FieldDocCollator.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/FieldDocCollator.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/FieldDocCollator.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::FieldDocCollator;
-use KinoSearch::base qw( KinoSearch::Obj );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/HitCollector.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/HitCollector.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/HitCollector.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::HitCollector;
-use KinoSearch::base qw( KinoSearch::Obj );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/HitQueue.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/HitQueue.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/HitQueue.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,11 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::HitQueue;
-use KinoSearch::base qw( KinoSearch::Util::PriorityQueue );
-
-use KinoSearch::Search::ScoreDoc;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/Hits.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/Hits.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/Hits.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::Hits;
-use KinoSearch::base qw( KinoSearch::Obj );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/LeafQuery.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/LeafQuery.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/LeafQuery.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::LeafQuery;
-use KinoSearch::base qw( KinoSearch::Search::Query );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/MatchAllQuery.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/MatchAllQuery.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/MatchAllQuery.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,14 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::MatchAllQuery;
-use KinoSearch::base qw( KinoSearch::Search::Query );
-
-package KinoSearch::Search::MatchAllCompiler;
-use KinoSearch::base qw( KinoSearch::Search::Compiler );
-
-use KinoSearch::Search::MatchAllScorer;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/MatchAllScorer.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/MatchAllScorer.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/MatchAllScorer.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::MatchAllScorer;
-use KinoSearch::base qw( KinoSearch::Search::Scorer );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/MultiSearcher.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/MultiSearcher.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/MultiSearcher.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,18 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::MultiSearcher;
-use KinoSearch::Util::ToolSet qw( to_kino );
-use KinoSearch::base qw( KinoSearch::Search::Searchable );
-
-use KinoSearch::Search::HitCollector;
-
-sub new {
- my ( $either, %args ) = @_;
- $args{searchables} = to_kino( $args{searchables} );
- return $either->_new(%args);
-}
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/NOTQuery.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/NOTQuery.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/NOTQuery.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,14 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::NOTQuery;
-use KinoSearch::base qw( KinoSearch::Search::PolyQuery );
-
-package KinoSearch::Search::NOTCompiler;
-use KinoSearch::base qw( KinoSearch::Search::PolyCompiler );
-
-use KinoSearch::Search::NOTScorer;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/NOTScorer.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/NOTScorer.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/NOTScorer.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::NOTScorer;
-use KinoSearch::base qw( KinoSearch::Search::Scorer );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/NoMatchQuery.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/NoMatchQuery.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/NoMatchQuery.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,14 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::NoMatchQuery;
-use KinoSearch::base qw( KinoSearch::Search::Query );
-
-package KinoSearch::Search::NoMatchCompiler;
-use KinoSearch::base qw( KinoSearch::Search::Compiler );
-
-use KinoSearch::Search::NoMatchScorer;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/NoMatchScorer.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/NoMatchScorer.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/NoMatchScorer.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::NoMatchScorer;
-use KinoSearch::base qw( KinoSearch::Search::Scorer );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/ORQuery.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/ORQuery.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/ORQuery.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,14 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::ORQuery;
-use KinoSearch::base qw( KinoSearch::Search::PolyQuery );
-
-package KinoSearch::Search::ORCompiler;
-use KinoSearch::base qw( KinoSearch::Search::PolyCompiler );
-
-use KinoSearch::Search::ORScorer;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/ORScorer.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/ORScorer.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/ORScorer.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,13 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::ORScorer;
-use KinoSearch::base qw( KinoSearch::Search::Scorer );
-
-# Inner class. Not a subclass of PriorityQueue.
-package KinoSearch::Search::ScorerDocQueue;
-use KinoSearch::base qw( KinoSearch::Obj );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/PhraseQuery.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/PhraseQuery.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/PhraseQuery.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,25 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::PhraseQuery;
-use KinoSearch::Util::ToolSet qw( to_kino );
-use KinoSearch::base qw( KinoSearch::Search::Query );
-
-use KinoSearch::Search::TermQuery;
-
-sub new {
- my ( $either, %args ) = @_;
- if ( defined $args{terms} ) {
- $args{terms} = to_kino( $args{terms} );
- }
- return $either->_new(%args);
-}
-
-sub get_terms { shift->_get_terms->to_perl }
-
-package KinoSearch::Search::PhraseCompiler;
-use KinoSearch::base qw( KinoSearch::Search::Compiler );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/PhraseScorer.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/PhraseScorer.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/PhraseScorer.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::PhraseScorer;
-use KinoSearch::base qw( KinoSearch::Search::Scorer );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/PolyCompiler.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/PolyCompiler.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/PolyCompiler.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::PolyCompiler;
-use KinoSearch::base qw( KinoSearch::Search::Compiler );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/PolyQuery.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/PolyQuery.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/PolyQuery.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,11 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::PolyQuery;
-use KinoSearch::base qw( KinoSearch::Search::Query );
-
-use KinoSearch::Search::PolyCompiler;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/Query.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/Query.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/Query.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,23 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::Query;
-use KinoSearch::Util::ToolSet qw( confess kerror verify_args );
-use KinoSearch::base qw( KinoSearch::Obj );
-
-our %make_compiler_PARAMS = (
- searchable => undef,
- boost => undef,
-);
-
-sub make_compiler {
- my $self = shift;
- confess kerror() unless verify_args( \%make_compiler_PARAMS, @_ );
- my %args = @_;
- $args{boost} = $self->get_boost unless defined $args{boost};
- return $self->_make_compiler( $args{searchable}, $args{boost} );
-}
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/RangeQuery.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/RangeQuery.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/RangeQuery.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,14 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::RangeQuery;
-use KinoSearch::base qw( KinoSearch::Search::Query );
-
-package KinoSearch::Search::RangeCompiler;
-use KinoSearch::base qw( KinoSearch::Search::Compiler );
-
-use KinoSearch::Search::RangeScorer;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/RangeScorer.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/RangeScorer.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/RangeScorer.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::RangeScorer;
-use KinoSearch::base qw( KinoSearch::Search::Scorer );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/RemoteFieldDoc.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/RemoteFieldDoc.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/RemoteFieldDoc.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::RemoteFieldDoc;
-use KinoSearch::base qw( KinoSearch::Search::ScoreDoc ); # note: not FieldDoc
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/RequiredOptionalQuery.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/RequiredOptionalQuery.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/RequiredOptionalQuery.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,14 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::RequiredOptionalQuery;
-use KinoSearch::base qw( KinoSearch::Search::PolyQuery );
-
-package KinoSearch::Search::RequiredOptionalCompiler;
-use KinoSearch::base qw( KinoSearch::Search::PolyCompiler );
-
-use KinoSearch::Search::RequiredOptionalScorer;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/RequiredOptionalScorer.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/RequiredOptionalScorer.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/RequiredOptionalScorer.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::RequiredOptionalScorer;
-use KinoSearch::base qw( KinoSearch::Search::Scorer );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/ScoreDoc.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/ScoreDoc.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/ScoreDoc.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::ScoreDoc;
-use KinoSearch::base qw( KinoSearch::Obj );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/Scorer.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/Scorer.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/Scorer.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,11 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::Scorer;
-use KinoSearch::base qw( KinoSearch::Obj );
-
-use KinoSearch::Search::Tally;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/Searchable.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/Searchable.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/Searchable.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,13 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::Searchable;
-use KinoSearch::base qw( KinoSearch::Obj );
-
-use KinoSearch::Search::Hits;
-use KinoSearch::QueryParser;
-use KinoSearch::Search::SortSpec;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/Similarity.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/Similarity.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/Similarity.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::Similarity;
-use KinoSearch::base qw( KinoSearch::Obj );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/SortCollector.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/SortCollector.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/SortCollector.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,11 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::SortCollector;
-use KinoSearch::base qw( KinoSearch::Search::TopDocCollector );
-
-use KinoSearch::Search::SortedHitQueue;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/SortSpec.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/SortSpec.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/SortSpec.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,14 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::SortRule;
-use KinoSearch::base qw( KinoSearch::Obj );
-
-package KinoSearch::Search::SortSpec;
-use KinoSearch::base qw( KinoSearch::Obj );
-
-use KinoSearch::Search::FieldDocCollator;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/SortedHitQueue.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/SortedHitQueue.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/SortedHitQueue.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,11 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::SortedHitQueue;
-use KinoSearch::base qw( KinoSearch::Search::HitQueue );
-
-use KinoSearch::Search::FieldDoc;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/Tally.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/Tally.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/Tally.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::Tally;
-use KinoSearch::base qw( KinoSearch::Obj );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/TermQuery.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/TermQuery.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/TermQuery.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,14 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::TermQuery;
-use KinoSearch::base qw( KinoSearch::Search::Query );
-
-package KinoSearch::Search::TermCompiler;
-use KinoSearch::base qw( KinoSearch::Search::Compiler );
-
-use KinoSearch::Search::TermScorer;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/TermScorer.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/TermScorer.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/TermScorer.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::TermScorer;
-use KinoSearch::base qw( KinoSearch::Search::Scorer );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/TopDocCollector.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/TopDocCollector.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/TopDocCollector.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,11 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::TopDocCollector;
-use KinoSearch::base qw( KinoSearch::Search::HitCollector );
-
-use KinoSearch::Search::HitQueue;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Search/TopDocs.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Search/TopDocs.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch/Search/TopDocs.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -1,21 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Search::TopDocs;
-use KinoSearch::base qw( KinoSearch::Obj );
-
-use KinoSearch::Util::VArray;
-use KinoSearch::Search::RemoteFieldDoc;
-
-sub new {
- my ( $either, %args ) = @_;
- $args{score_docs} = to_kino( $args{score_docs} );
- return $either->_new(%args);
-}
-
-sub set_score_docs { $_[0]->_set_score_docs( to_kino( $_[1] ) ) }
-sub get_score_docs { to_perl( shift->_get_score_docs ) }
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch.pm
===================================================================
--- trunk/perl/lib/KinoSearch.pm 2008-07-28 00:26:37 UTC (rev 3647)
+++ trunk/perl/lib/KinoSearch.pm 2008-07-28 00:47:14 UTC (rev 3648)
@@ -429,6 +429,103 @@
}

{
+ package KinoSearch::QueryParser;
+ use KinoSearch::Util::ToolSet qw( to_kino );
+ use KinoSearch::base qw( KinoSearch::Obj );
+
+ sub new {
+ my ( $either, %args ) = @_;
+ $args{fields} = to_kino( $args{fields} ) if defined $args{fields};
+ return $either->do_new(%args);
+ }
+}
+
+{
+ package KinoSearch::Search::Compiler;
+ use KinoSearch::Util::ToolSet qw( a_isa_b confess );
+ use KinoSearch::base qw( KinoSearch::Obj );
+
+ sub new {
+ my ( $either, %args ) = @_;
+ if ( !defined $args{boost} ) {
+ confess("'parent' is not a Query")
+ unless a_isa_b( $args{parent}, "KinoSearch::Search::Query" );
+ $args{boost} = $args{parent}->get_boost;
+ }
+ return $either->do_new(%args);
+ }
+
+ sub highlight_spans {
+ my $self = shift;
+ return @{ $self->_highlight_spans(@_)->to_perl };
+ }
+}
+
+{
+ package KinoSearch::Search::MultiSearcher;
+ use KinoSearch::Util::ToolSet qw( to_kino );
+ use KinoSearch::base qw( KinoSearch::Search::Searchable );
+
+ sub new {
+ my ( $either, %args ) = @_;
+ $args{searchables} = to_kino( $args{searchables} );
+ return $either->_new(%args);
+ }
+}
+
+{
+ package KinoSearch::Search::PhraseQuery;
+ use KinoSearch::Util::ToolSet qw( to_kino );
+ use KinoSearch::base qw( KinoSearch::Search::Query );
+
+ sub new {
+ my ( $either, %args ) = @_;
+ if ( defined $args{terms} ) {
+ $args{terms} = to_kino( $args{terms} );
+ }
+ return $either->_new(%args);
+ }
+
+ sub get_terms { shift->_get_terms->to_perl }
+}
+
+{
+ package KinoSearch::Search::Query;
+ use KinoSearch::Util::ToolSet qw( confess kerror verify_args );
+ use KinoSearch::base qw( KinoSearch::Obj );
+
+ our %make_compiler_PARAMS = (
+ searchable => undef,
+ boost => undef,
+ );
+
+ sub make_compiler {
+ my $self = shift;
+ confess kerror() unless verify_args( \%make_compiler_PARAMS, @_ );
+ my %args = @_;
+ $args{boost} = $self->get_boost unless defined $args{boost};
+ return $self->_make_compiler( $args{searchable}, $args{boost} );
+ }
+}
+
+{
+ package KinoSearch::Search::TopDocs;
+ use KinoSearch::base qw( KinoSearch::Obj );
+
+ use KinoSearch::Util::VArray;
+ use KinoSearch::Search::RemoteFieldDoc;
+
+ sub new {
+ my ( $either, %args ) = @_;
+ $args{score_docs} = to_kino( $args{score_docs} );
+ return $either->_new(%args);
+ }
+
+ sub set_score_docs { $_[0]->_set_score_docs( to_kino( $_[1] ) ) }
+ sub get_score_docs { to_perl( shift->_get_score_docs ) }
+}
+
+{
package KinoSearch::Store::Folder;
use KinoSearch::base qw( KinoSearch::Obj );
use File::Spec::Functions qw( rel2abs );


_______________________________________________
kinosearch-commits mailing list
kinosearch-commits@rectangular.com
http://www.rectangular.com/mailman/listinfo/kinosearch-commits