match phrase

[BackupPC.git] / lib / BackupPC / Search / KinoSearch.pm

diff --git a/lib/BackupPC/Search/KinoSearch.pm b/lib/BackupPC/Search/KinoSearch.pm
index dcbb749..e1ba8da 100644 (file)
--- a/lib/BackupPC/Search/KinoSearch.pm
+++ b/lib/BackupPC/Search/KinoSearch.pm
@@ -43,22 +43,39 @@ 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 _file_path_split 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
+       $schema->spec_field( name => '_file_path_split', type => $ft_type );
+
 #      $schema->spec_field( name => '_doc', type => $blob_type );
 
        my $indexer = KinoSearch::Index::Indexer->new(
@@ -129,9 +146,11 @@ 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,
                sort_spec => $sort_spec,
        );