added offset and num_wated so pager works
[BackupPC.git] / lib / BackupPC / Search / KinoSearch.pm
index 67eff7e..d12577d 100644 (file)
@@ -43,22 +43,34 @@ sub indexer {
        );
        my $blob_type = KinoSearch::Plan::BlobType->new( stored => 1 );
        my $string_type = KinoSearch::Plan::StringType->new; # non-tokenized
-       my $num_type = KinoSearch::Plan::Int64Type->new;
+       my $num_type = KinoSearch::Plan::Int64Type->new( sortable => 1 );
+       my $sort_type = KinoSearch::Plan::StringType->new( sortable => 1 ); # non-tokenized
 
        # numeric
        $schema->spec_field( name => $_, type => $string_type ) foreach ( qw/
                backup_date
                backupnum
-               date
                fid
                shareid
-               size
                type
        / );
 
        # non-tokenized strings
        $schema->spec_field( name => $_, type => $string_type ) foreach ( qw/
-               _uri filepath hname sname
+               _uri
+               hname
+       /);
+
+       # sortable
+       $schema->spec_field( name => $_, type => $sort_type ) foreach (qw/
+               sname
+               filepath
+       /);
+
+       # sortable numeric
+       $schema->spec_field( name => $_, type => $sort_type ) foreach (qw/
+               date
+               size
        /);
 
        # tokenized magic columns for infix search
@@ -134,9 +146,13 @@ sub search {
 
        my $sort_spec = KinoSearch::Search::SortSpec->new( rules => $rules );
 
-#      $q =~ s/(.)/$1 /g;
+       my $split = $q;
+       $split =~ s/(.)/$1 /g; # _file_path_split
+       $split = qq{"$split"}; # exact ordering
        my $hits = $self->searcher->hits(
-               query => $q,
+               query => $split,
+               offset => $offset,
+               num_wanted => $on_page,
                sort_spec => $sort_spec,
        );