added numeric padding to appropriate query values

diff --git a/lib/BackupPC/Search/KinoSearch.pm b/lib/BackupPC/Search/KinoSearch.pm
index e6f7c6a..e3431b5 100644 (file)
--- a/lib/BackupPC/Search/KinoSearch.pm
+++ b/lib/BackupPC/Search/KinoSearch.pm
@@ -20,6 +20,12 @@ sub new {
        my $self = bless {
                index => $index_path,
                first_time_indexing => ! -d $index_path,
        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;
        }, $class;
        warn "# ",dump($self);
        return $self;


@@ -46,18 +52,6 @@ sub indexer {
        my $num_type = KinoSearch::Plan::Int64Type->new( sortable => 1 );
        my $sort_type = KinoSearch::Plan::StringType->new( sortable => 1 ); # non-tokenized
 
        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
        # numeric
        $schema->spec_field( name => $_, type => $string_type ) foreach ( qw/
                backup_date


@@ -124,6 +118,8 @@ sub exists {
        return $hits->total_hits;
 }
 
        return $hits->total_hits;
 }
 

+sub _numeric_padding { sprintf "%011d", $_[0] }
+

 sub add_doc {
        my ($self,$row) = @_;
 
 sub add_doc {
        my ($self,$row) = @_;
 


@@ -135,7 +131,7 @@ sub add_doc {
        $self->{stats}->{add_doc}++;
 
        foreach my $col ( @{ $self->{numeric_padding} } ) {
        $self->{stats}->{add_doc}++;
 
        foreach my $col ( @{ $self->{numeric_padding} } ) {

-               $row->{$col} = sprintf "%011d", $row->{$col};
+               $row->{$col} = _numeric_padding $row->{$col};

        }
 
        warn "XXX ",dump($row) if $ENV{DEBUG};
        }
 
        warn "XXX ",dump($row) if $ENV{DEBUG};


@@ -151,18 +147,22 @@ sub commit {
 }
 
 sub _field_lower_upper_term {
 }
 
 sub _field_lower_upper_term {

-       my ( $field, $l, $u ) = @_;
+       my ( $self, $field, $l, $u ) = @_;
+       my $numeric_padding = grep { /^$field$/ } @{ $self->{numeric_padding} };

        my $range;
        if ( $l ) {
        my $range;
        if ( $l ) {

-               $range->{lower_term} = $l;
+               $range->{lower_term} = $numeric_padding ? _numeric_padding $l : $l;

                $range->{include_lower} = 1;
        }
        if ( $u ) {
                $range->{include_lower} = 1;
        }
        if ( $u ) {

-               $range->{upper_term} = $u;
+               $range->{upper_term} = $numeric_padding ? _numeric_padding $u : $u;

                $range->{include_upper} = 1;
        }
                $range->{include_upper} = 1;
        }

-       $range->{field} = $field if $range;
-       warn "# $field $l - $u ",dump($range);
+       if ( $range ) {
+               $range->{field} = $field;
+
+               warn "# $field $l - $u numeric_padding:$numeric_padding ",dump($range);
+       }

        return $range;
 }
 
        return $range;
 }
 


@@ -196,10 +196,10 @@ sub search {
                push @and_query, KinoSearch::Search::TermQuery->new( field => 'shareid', term => $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 ) ) {
+       if ( my $range = $self->_field_lower_upper_term( 'backup_date', $backup_from, $backup_to ) ) {

                push @and_query, KinoSearch::Search::RangeQuery->new( %$range );
        }
                push @and_query, KinoSearch::Search::RangeQuery->new( %$range );
        }

-       if ( my $range = _field_lower_upper_term( 'date', $files_from, $files_to ) ) {
+       if ( my $range = $self->_field_lower_upper_term( 'date', $files_from, $files_to ) ) {

                push @and_query, KinoSearch::Search::RangeQuery->new( %$range );
        }
 
                push @and_query, KinoSearch::Search::RangeQuery->new( %$range );
        }