my $self = bless {
index => $index_path,
first_time_indexing => ! -d $index_path,
+ numeric_padding => [ qw(
+ backup_date
+ date
+ size
+ ) ],
+
}, $class;
warn "# ",dump($self);
return $self;
return $hits->total_hits;
}
+sub _numeric_padding { sprintf "%011d", $_[0] }
+
sub add_doc {
my ($self,$row) = @_;
$path =~ s/(.)/$1 /g; # XXX our tokenize
$row->{_file_path_split} = $path;
- warn "XXX ",dump($row) if $ENV{DEBUG};
-
$self->{stats}->{add_doc}++;
+ foreach my $col ( @{ $self->{numeric_padding} } ) {
+ $row->{$col} = _numeric_padding $row->{$col};
+ }
+
+ warn "XXX ",dump($row) if $ENV{DEBUG};
+
$self->indexer->add_doc( $row );
}
warn "# commit index ", dump($self->{stats});
}
+sub _field_lower_upper_term {
+ my ( $self, $field, $l, $u ) = @_;
+ my $numeric_padding = grep { /^$field$/ } @{ $self->{numeric_padding} };
+ my $range;
+ if ( $l ) {
+ $range->{lower_term} = $numeric_padding ? _numeric_padding $l : $l;
+ $range->{include_lower} = 1;
+ }
+ if ( $u ) {
+ $range->{upper_term} = $numeric_padding ? _numeric_padding $u : $u;
+ $range->{include_upper} = 1;
+ }
+ if ( $range ) {
+ $range->{field} = $field;
+
+ warn "# $field $l - $u numeric_padding:$numeric_padding ",dump($range);
+ }
+ return $range;
+}
+
sub search {
my ( $self, $offset, $on_page, $sort, $q, $shareid, $backup_from, $backup_to, $files_from, $files_to ) = @_;
);
my $query = $query_parser->parse( '"' . $split . '"' );
+ my @and_query;
+
+ if ( $shareid ) {
+ push @and_query, KinoSearch::Search::TermQuery->new( field => 'shareid', term => $shareid );
+ }
+
+ if ( my $range = $self->_field_lower_upper_term( 'backup_date', $backup_from, $backup_to ) ) {
+ push @and_query, KinoSearch::Search::RangeQuery->new( %$range );
+ }
+ if ( my $range = $self->_field_lower_upper_term( 'date', $files_from, $files_to ) ) {
+ push @and_query, KinoSearch::Search::RangeQuery->new( %$range );
+ }
+
+ if ( @and_query ) {
+ push @and_query, $query;
+ $query = KinoSearch::Search::ANDQuery->new( children => [ @and_query ] );
+ }
+
my $hits = $self->searcher->hits(
query => m/:/ ? $q : $query,
offset => $offset,