X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FSearch%2FKinoSearch.pm;h=e6f7c6a3b3e42a91d18b8118c01cae5cf4376717;hp=7d371914ddd22c86b7cbdd1e796f349321263ac2;hb=ae81c69bf053eed787bac83c224225446ac07449;hpb=635606d4ba5c074c3e9657d7c67b68aa5975ae80

diff --git a/lib/BackupPC/Search/KinoSearch.pm b/lib/BackupPC/Search/KinoSearch.pm
index 7d37191..e6f7c6a 100644
--- a/lib/BackupPC/Search/KinoSearch.pm
+++ b/lib/BackupPC/Search/KinoSearch.pm
@@ -46,6 +46,18 @@ sub indexer {
 	my $num_type = KinoSearch::Plan::Int64Type->new( sortable => 1 );
 	my $sort_type = KinoSearch::Plan::StringType->new( sortable => 1 ); # non-tokenized
 
+=for numeric-no-padding
+		fid
+		shareid
+		type
+		backupnum
+=cut
+	$self->{numeric_padding} = [ qw/
+		backup_date
+		date
+		size
+	/ ];
+
 	# numeric
 	$schema->spec_field( name => $_, type => $string_type ) foreach ( qw/
 		backup_date
@@ -120,10 +132,14 @@ sub add_doc {
 	$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} = sprintf "%011d", $row->{$col};
+	}
+
+	warn "XXX ",dump($row) if $ENV{DEBUG};
+
 	$self->indexer->add_doc( $row );
 
 }
@@ -134,6 +150,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 +190,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,