r9010@llin: dpavlin | 2005-11-21 20:48:59 +0100

 make it less chatty

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@86 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/lib/WebPAC/Search/Estraier.pm b/lib/WebPAC/Search/Estraier.pm
index 4e24997..df62eb9 100644 (file)
--- a/lib/WebPAC/Search/Estraier.pm
+++ b/lib/WebPAC/Search/Estraier.pm
@@ -120,10 +120,12 @@ sub search {
 
        $log->logconfess("need attr as array not " . ref($args->{'attr'}) ) unless (ref($args->{'attr'}) eq 'ARRAY');
 
+       my $q = $args->{'query'};
+
        my $cond = HyperEstraier::Condition->new();
 #      $cond->add_attr("filepath ISTRINC $q");
 
-       $cond->set_phrase( $args->{'query'} ) if ($args->{'query'});
+       $cond->set_phrase( $self->{'iconv'}->convert( $q ) ) if ($q);
        $cond->set_max( $args->{'max'} ) if ($args->{'max'});
 #      $cond->set_options( $HyperEstraier::Condition::SURE );
 #      $cond->set_order( 'NUMD' );
@@ -132,13 +134,13 @@ sub search {
                $log->die("can't search for ", sub { Dumper( $args ) });
 
        my $hits = $result->doc_num;
-       $log->debug("found $hits hits");
+       $log->debug("found $hits hits for '$q'");
 
        my @results;
 
        for my $i ( 0 .. ( $hits - 1 ) ) {
 
-               $log->debug("get_doc($i)");
+               #$log->debug("get_doc($i)");
                my $doc = $result->get_doc( $i );
                if (! $doc) {
                        $log->warn("can't find result $i");
@@ -149,7 +151,7 @@ sub search {
 
                foreach my $attr (@{ $args->{'attr'} }) {
                        my $val = $doc->attr( $attr );
-                       $log->debug("attr $attr = ", $val || 'undef');
+                       #$log->debug("attr $attr = ", $val || 'undef');
                        $hash->{$attr} = $self->{'iconv'}->convert( $val ) if (defined($val));
                }