construct query parser manually

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

diff --git a/lib/BackupPC/Search/KinoSearch.pm b/lib/BackupPC/Search/KinoSearch.pm
index e1ba8da..7d37191 100644 (file)
--- a/lib/BackupPC/Search/KinoSearch.pm
+++ b/lib/BackupPC/Search/KinoSearch.pm
@@ -49,7 +49,6 @@ sub indexer {
        # numeric
        $schema->spec_field( name => $_, type => $string_type ) foreach ( qw/
                backup_date
-               backupnum
                fid
                shareid
                type
@@ -69,6 +68,7 @@ sub indexer {
 
        # sortable numeric
        $schema->spec_field( name => $_, type => $sort_type ) foreach (qw/
+               backupnum
                date
                size
        /);
@@ -148,9 +148,20 @@ 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 $hits = $self->searcher->hits(
-               query => $split,
+               query => m/:/ ? $q : $query,
+               offset => $offset,
+               num_wanted => $on_page,
                sort_spec => $sort_spec,
        );
 
@@ -161,7 +172,7 @@ sub search {
 
        my $results;
        while ( my $hit = $hits->next ) {
-warn "XXX ",dump($hit);
+               warn "## hit = ",dump($hit) if $ENV{DEBUG};
                push @$results, $hit;
        }