From b1b55044d630994cad30be60f7ea90a3d602deaf Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 10 Jan 2011 20:14:46 +0000 Subject: [PATCH 1/1] working shareid query, non working date ranges --- lib/BackupPC/Search/KinoSearch.pm | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/lib/BackupPC/Search/KinoSearch.pm b/lib/BackupPC/Search/KinoSearch.pm index 7d37191..30cc073 100644 --- a/lib/BackupPC/Search/KinoSearch.pm +++ b/lib/BackupPC/Search/KinoSearch.pm @@ -134,6 +134,22 @@ sub commit { warn "# commit index ", dump($self->{stats}); } +sub _field_lower_upper_term { + my ( $field, $l, $u ) = @_; + my $range; + if ( $l ) { + $range->{lower_term} = $l; + $range->{include_lower} = 1; + } + if ( $u ) { + $range->{upper_term} = $u; + $range->{include_upper} = 1; + } + $range->{field} = $field if $range; + warn "# $field $l - $u ",dump($range); + return $range; +} + sub search { my ( $self, $offset, $on_page, $sort, $q, $shareid, $backup_from, $backup_to, $files_from, $files_to ) = @_; @@ -158,6 +174,24 @@ sub search { ); 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 = _field_lower_upper_term( 'backup_date', $backup_from, $backup_to ) ) { + push @and_query, KinoSearch::Search::RangeQuery->new( %$range ); + } + if ( my $range = _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, -- 2.20.1