Changeset 527

Timestamp:

10/03/04 11:17:48 (4 years ago)

Author:

kake

Message:

Fixed bug with paging on distance-only search (reported by Bob Walker). Improved encapsulation in OpenGuides::Supersearch - accessors.

Location:

trunk

Files:

• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• lib/OpenGuides/SuperSearch.pm (modified) (5 diffs)
• t/34_supersearch_paging.t (added)
• templates/supersearch.tt (modified) (1 diff)

trunk/Changes

@@ -2 +2 @@
         Handle distance searching with OpenGuides::Supersearch instead of
           find_within_distance action.
+        Fixed bug with paging on distance-only search (reported by Bob Walker).
+        Improved encapsulation in OpenGuides::Supersearch - accessors.
 
 0.41    21 September 2004

trunk/MANIFEST

@@ -60 +60 @@
 t/32_supersearch_simple_metadata.t
 t/33_supersearch_advanced_search.t
+t/34_supersearch_paging.t
 t/35_supersearch_two_searches.t
 t/36_supersearch_order.t

trunk/lib/OpenGuides/SuperSearch.pm

@@ -60 +60 @@
 
     return $self;
+}
+
+=item B<wiki>
+
+  my $wiki = $search->wiki;
+
+An accessor; returns the underlying L<CGI::Wiki> object.
+
+=cut
+
+sub wiki {
+    my $self = shift;
+    return $self->{wiki};
+}
+
+=item B<config>
+
+  my $config = $search->config;
+
+An accessor; returns the underlying L<Config::Tiny> object.
+
+=cut
+
+sub config {
+    my $self = shift;
+    return $self->{config};
 }
 
@@ -151 +177 @@
         if ( $self->{search_string} ) {
             my %fuzzies =
-                      $self->{wiki}->fuzzy_title_match($self->{search_string});
+                      $self->wiki->fuzzy_title_match($self->{search_string});
             if ( $numres == 1
                  && !$self->{return_tt_vars} && scalar keys %fuzzies) {
@@ -208 +234 @@
 
     my $output =  OpenGuides::Template->output(
-                                                wiki     => $self->{wiki},
-                                                config   => $self->{config},
+                                                wiki     => $self->wiki,
+                                                config   => $self->config,
                                                 template => "supersearch.tt",
                                                 vars     => $tt_vars,
@@ -224 +250 @@
     my ($self, %args) = @_;
     my ($op, @leaves) = @{ $args{tree} };
-    my $wiki = $self->{wiki};
+    my $wiki = $self->wiki;
 
     if ($op =~ /AND|OR/) {
@@ -335 +361 @@
         }
     } else {
-        my $wiki = $self->{wiki};
+        my $wiki = $self->wiki;
         my @all_nodes = $wiki->list_all_nodes;
         my $formatter = $wiki->formatter;

trunk/templates/supersearch.tt

@@ -87 +87 @@
       [% END %]
       [% IF next_page_startpos %]
-        <a href="supersearch.cgi?search=[% search_terms %]&next=[% next_page_startpos %]">Next 
+        <a href="supersearch.cgi?search=[% search_terms %];distance_in_metres=[% dist %];os_x=[% os_x %];os_y=[% os_y %];next=[% next_page_startpos %]">Next 
         [% IF ((total_num - last_num >= 20)) %]
           20