Mailing List Archive

Author: creamyg
Date: 2008-08-04 16:04:27 -0700 (Mon, 04 Aug 2008)
New Revision: 3716

Modified:
trunk/perl/lib/KinoSearch.pm
Log:
Kill off some unused PARAMS hashes. Make minor stylistic changes to compact
some code.


Modified: trunk/perl/lib/KinoSearch.pm
===================================================================
--- trunk/perl/lib/KinoSearch.pm 2008-08-04 22:37:01 UTC (rev 3715)
+++ trunk/perl/lib/KinoSearch.pm 2008-08-04 23:04:27 UTC (rev 3716)
@@ -170,12 +170,6 @@
fallback => 1,
'%{}' => \&get_fields;

- our %new_PARAMS = (
- boost => 1.0,
- doc_num => 0,
- fields => undef,
- );
-
sub serialize_fields {
my ( $self, $outstream ) = @_;
my $buf = nfreeze( $self->get_fields );
@@ -190,37 +184,14 @@
}

{
- package KinoSearch::Doc::HitDoc;
-
- our %new_PARAMS = (
- score => undef,
- doc_num => undef,
- boost => undef,
- fields => undef,
- );
-}
-
-{
package KinoSearch::Highlight::HeatMap;
-
- sub flatten_spans {
- my ( $self, $spans ) = @_;
- return $self->_flatten_spans($spans)->to_pobj;
- }
-
- sub generate_proximity_boosts {
- my ( $self, $spans ) = @_;
- return $self->_generate_proximity_boosts($spans)->to_pobj;
- }
+ sub flatten_spans { _flatten_spans(@_)->to_pobj }
+ sub generate_proximity_boosts { _generate_proximity_boosts(@_)->to_pobj }
}

{
package KinoSearch::Highlight::Highlighter;
-
- sub find_sentences {
- my $self = shift;
- return $self->_find_sentences(@_)->to_pobj;
- }
+ sub find_sentences { _find_sentences(@_)->to_pobj }
}

{
@@ -305,7 +276,6 @@

{
package KinoSearch::Index::DocWriter;
-
use KinoSearch::Util::StringHelper qw( utf8_flag_off utf8_flag_on );

my $zlib_loaded = 0;
@@ -465,15 +435,11 @@
return $either->do_new(%args);
}

- sub highlight_spans {
- my $self = shift;
- return $self->_highlight_spans(@_)->to_perl;
- }
+ sub highlight_spans { _highlight_spans(@_)->to_perl }
}

{
package KinoSearch::Search::PhraseQuery;
-
sub get_terms { shift->_get_terms->to_perl }
}

@@ -489,27 +455,23 @@

{
package KinoSearch::Search::TopDocs;
-
sub get_score_docs { to_perl( shift->_get_score_docs ) }
}

{
package KinoSearch::Store::Folder;
-
sub list { shift->_list->to_perl }
sub list_real_files { shift->_list_real_files->to_perl }
- sub slurp_file { $_[0]->_slurp_file( $_[1] )->to_perl }
+ sub slurp_file { _slurp_file(@_)->to_perl }
}

{
package KinoSearch::Store::RAMFileDes;
-
sub contents { shift->_contents->to_perl }
}

{
package KinoSearch::Util::BitVector;
-
sub to_arrayref { shift->to_array->to_arrayref }
}

@@ -687,9 +649,7 @@

{
package KinoSearch::Util::PriorityQueue;
- use KinoSearch::Util::ToolSet qw( to_perl );
-
- sub pop_all { to_perl( shift->_pop_all ) }
+ sub pop_all { shift->_pop_all->to_perl }
}

1;


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