/[Search-Estraier]/trunk/Estraier.pm

This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!

Diff of /trunk/Estraier.pm

Parent Directory | Revision Log | View Patch Patch

-revision 164 by dpavlin,
Sun Aug  6 12:19:19 2006 UTC
+revision 184 by dpavlin,
Sat Nov  4 13:10:29 2006 UTC
 Line 4 
 use 5.008;
  use strict;
  use warnings;
- our $VERSION = '0.07_2';
+ our $VERSION = '0.08_1';
  =head1 NAME
 Line 182 
 sub new {
                          if ($line =~ m/^%VECTOR\t(.+)$/) {
                                  my @fields = split(/\t/, $1);
-                                 for my $i ( 0 .. ($#fields - 1) ) {
+                                 if ($#fields % 2 == 1) {
-                                         $self->{kwords}->{ $fields[ $i ] } = $fields[ $i + 1 ];
+                                         $self->{kwords} = { @fields };
-                                         $i++;
+                                 } else {
+                                         warn "can't decode $line\n";
                                  }
                                  next;
+                         } elsif ($line =~ m/^%SCORE\t(.+)$/) {
+                             $self->{score} = $1;
+                             next;
                          } elsif ($line =~ m/^%/) {
                                  # What is this? comment?
                                  #warn "$line\n";
-Line 268 
 sub add_hidden_text {
+Line 272 
 sub add_hidden_text {
          push @{ $self->{htexts} }, $self->_s($text);
  }
+ =head2 add_vectors
+ Add a vectors
+   $doc->add_vector(
+         'vector_name' => 42,
+         'another' => 12345,
+   );
+ =cut
+ sub add_vectors {
+         my $self = shift;
+         return unless (@_);
+         # this is ugly, but works
+         die "add_vector needs HASH as argument" unless ($#_ % 2 == 1);
+         $self->{kwords} = {@_};
+ }
+ =head2 set_score
+ Set the substitute score
+   $doc->set_score(12345);
+ =cut
+ sub set_score {
+     my $self = shift;
+     my $score = shift;
+     return unless (defined($score));
+     $self->{score} = $score;
+ }
+ =head2 score
+ Get the substitute score
+ =cut
+ sub score {
+     my $self = shift;
+     return -1 unless (defined($self->{score}));
+     return $self->{score};
+ }
  =head2 id
-Line 362 
 sub dump_draft {
+Line 413 
 sub dump_draft {
          }
          if ($self->{kwords}) {
-                 $draft .= '%%VECTOR';
+                 $draft .= '%VECTOR';
                  while (my ($key, $value) = each %{ $self->{kwords} }) {
                          $draft .= "\t$key\t$value";
                  }
                  $draft .= "\n";
          }
+         if (defined($self->{score}) && $self->{score} >= 0) {
+             $draft .= "%SCORE\t" . $self->{score} . "\n";
+         }
          $draft .= "\n";
          $draft .= join("\n", @{ $self->{dtexts} }) . "\n" if ($self->{dtexts});
          $draft .= "\t" . join("\n\t", @{ $self->{htexts} }) . "\n" if ($self->{htexts});
+         printf("[%s]\n", $draft);
          return $draft;
  }
-Line 656 
 sub skip {
+Line 713 
 sub skip {
  }
+ =head2 set_distinct
+   $cond->set_distinct('@author');
+ =cut
+ sub set_distinct {
+         my $self = shift;
+         $self->{distinct} = shift;
+ }
+ =head2 distinct
+ Return distinct attribute
+   print $cond->distinct;
+ =cut
+ sub distinct {
+         my $self = shift;
+         return $self->{distinct};
+ }
+ =head2 set_mask
+ Filter out some links when searching.
+ Argument array of link numbers, starting with 0 (current node).
+   $cond->set_mask(qw/0 1 4/);
+ =cut
+ sub set_mask {
+         my $self = shift;
+         return unless (@_);
+         $self->{mask} = \@_;
+ }
  package Search::Estraier::ResultDocument;
  use Carp qw/croak/;
-Line 1331 
 sub _fetch_doc {
+Line 1429 
 sub _fetch_doc {
          $path = '/etch_doc' if ($a->{etch});
          if ($a->{id}) {
-                 croak "id must be numberm not '$a->{id}'" unless ($a->{id} =~ m/^\d+$/);
+                 croak "id must be number not '$a->{id}'" unless ($a->{id} =~ m/^\d+$/);
                  $arg = 'id=' . $a->{id};
          } elsif ($a->{uri}) {
                  $arg = 'uri=' . uri_escape($a->{uri});
-Line 1542 
 sub cond_to_query {
+Line 1640 
 sub cond_to_query {
          push @args, 'awidth=' . $self->{awidth};
          push @args, 'skip=' . $cond->{skip} if ($cond->{skip});
+         if (my $distinct = $cond->distinct) {
+                 push @args, 'distinct=' . uri_escape($distinct);
+         }
+         if ($cond->{mask}) {
+                 my $mask = 0;
+                 map { $mask += ( 2 ** $_ ) } @{ $cond->{mask} };
+                 push @args, 'mask=' . $mask if ($mask);
+         }
          return join('&', @args);
  }

 Legend:



Removed from v.164
 


changed lines


 
Added in v.184
 Legend:



Removed from v.164
 


changed lines


 
Added in v.184
-Removed from v.164
+Added in v.184

	ViewVC Help
Powered by ViewVC 1.1.26