X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FSearch%2FKinoSearch.pm;h=30cc073f0a2f698ad2699f34979fa40bbd4a38bf;hp=91f488dcdf160aec78fda7760951e34dd2bfe13b;hb=b1b55044d630994cad30be60f7ea90a3d602deaf;hpb=8a3a60361ad74b408acac5f041977f0fad1abe1c

diff --git a/lib/BackupPC/Search/KinoSearch.pm b/lib/BackupPC/Search/KinoSearch.pm
index 91f488d..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 ) = @_;
 
@@ -148,9 +164,36 @@ sub search {
 
 	my $split = $q;
 	$split =~ s/(.)/$1 /g; # _file_path_split
-	$split = qq{"$split"}; # exact ordering
+	my $split_query = KinoSearch::Search::TermQuery->new( field => '_file_path_split', term => $split );
+#warn "XXX ",dump($split_query);
+
+
+	my $query_parser = KinoSearch::Search::QueryParser->new(
+		schema => $self->searcher->get_schema,
+	        fields => ['_file_path_split'],
+	);
+	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 => $split,
+		query => m/:/ ? $q : $query,
 		offset => $offset,
 		num_wanted => $on_page,
 		sort_spec => $sort_spec,