Changeset 717

Timestamp:

11/24/05 20:12:31 (3 years ago)

Author:

earle

Message:

Sorry, I screwed up the last commit - tests pass now. This fixes bug #17.

Location:

trunk

Files:

• Build.PL (modified) (2 diffs)
• README.CSS (modified) (4 diffs)
• lib/OpenGuides.pm (modified) (1 diff)
• lib/OpenGuides/Utils.pm (modified) (1 diff)
• t/31_search.t (modified) (2 diffs)
• t/32_search_simple_metadata.t (modified) (2 diffs)
• t/33_search_advanced_search.t (modified) (2 diffs)
• t/33_search_advanced_search_utm.t (modified) (2 diffs)
• t/34_search_paging.t (modified) (7 diffs)
• t/35_search_two_searches.t (modified) (4 diffs)
• t/36_search_order.t (modified) (2 diffs)
• t/37_search_summaries.t (modified) (2 diffs)
• t/38_search_params.t (modified) (10 diffs)
• t/39_search_form.t (modified) (4 diffs)

trunk/Build.PL

@@ -257 +257 @@
 # Tell OpenGuides::Build which additional scripts and templates to install.
 $build->{config}{__extra_scripts}     = 
-                      [ "wiki.conf", "preferences.cgi", "supersearch.cgi",
+                      [ "wiki.conf", "preferences.cgi", "search.cgi",
                         "newpage.cgi" ];
 $build->{config}{__templates}         = [
@@ -283 +283 @@
                       "search_results.tt",
                       "site_index.tt",
-                      "supersearch.tt",
+                      "search.tt",
                       "userstats.tt",
                       "wanted_pages.tt"

trunk/README.CSS

@@ -31 +31 @@
 input.form_button
     Used in: differences.tt, edit_form.tt, footer.tt, navbar.tt, newpage.tt,
-             node.tt, preferences.tt, supersearch.tt
+             node.tt, preferences.tt, search.tt
     Purpose: A standard form button
 
@@ -86 +86 @@
 
 div.hit_summary
-    Used in: supersearch.tt
+    Used in: search.tt
     Purpose: One-line summary of individual search result.
 
@@ -102 +102 @@
              home_node.tt, newpage.tt, node.tt, preferences.tt,
              recent_changes.tt, search_results.tt, site_index.tt,
-             supersearch.tt, userstats.tt, wanted_pages.tt
+             search.tt, userstats.tt, wanted_pages.tt
     Purpose: Defines the main textual content of the page
              content includes the navbar and footer; maincontent does not
@@ -220 +220 @@
 
 input#search_lower
-    Used in: supersearch.tt
+    Used in: search.tt
     Purpose: An iput field for the lower search in the main search page
 
 input#search_upper
-    Used in: supersearch.tt
+    Used in: search.tt
     Purpose: An input field for the upper search in the main search page
 

trunk/lib/OpenGuides.pm

@@ -416 +416 @@
     my $long = $data{metadata}{longitude}[0];
     my $script_url = $self->config->script_url;
-    print CGI->redirect( $script_url . "supersearch.cgi?lat=$lat;long=$long;distance_in_metres=$metres" );
+    print CGI->redirect( $script_url . "search.cgi?lat=$lat;long=$long;distance_in_metres=$metres" );
 }
 

trunk/lib/OpenGuides/Utils.pm

@@ -112 +112 @@
     # Make formatter.
     my $script_name = $config->script_name;
-    my $search_url = $config->script_url . "supersearch.cgi";
+    my $search_url = $config->script_url . "search.cgi";
 
     my %macros = (

trunk/t/31_search.t

@@ -1 +1 @@
 use strict;
 use CGI::Wiki::Setup::SQLite;
-use OpenGuides::SuperSearch;
+use OpenGuides::Search;
 use OpenGuides::Test;
 use Test::More;
@@ -24 +24 @@
     if ( $@ ) { $config->use_plucene( 0 ) };
 
-    my $search = OpenGuides::SuperSearch->new( config => $config );
-    isa_ok( $search, "OpenGuides::SuperSearch" );
+    my $search = OpenGuides::Search->new( config => $config );
+    isa_ok( $search, "OpenGuides::Search" );
 
     my $output = $search->run( return_output => 1 );

trunk/t/32_search_simple_metadata.t

@@ -2 +2 @@
 use CGI::Wiki::Setup::SQLite;
 use OpenGuides::Config;
-use OpenGuides::SuperSearch;
+use OpenGuides::Search;
 use Test::More tests => 10;
 
@@ -33 +33 @@
     if ( $@ ) { $config->use_plucene( 0 ) };
 
-    my $search = OpenGuides::SuperSearch->new( config => $config );
+    my $search = OpenGuides::Search->new( config => $config );
 
     # Add some data.  We write it twice to avoid hitting the redirect.

trunk/t/33_search_advanced_search.t

@@ -3 +3 @@
 use CGI::Wiki::Setup::SQLite;
 use OpenGuides::Config;
-use OpenGuides::SuperSearch;
+use OpenGuides::Search;
 use OpenGuides::Test;
 use Test::More;
@@ -42 +42 @@
            }
 );
-my $search = OpenGuides::SuperSearch->new( config => $config );
+my $search = OpenGuides::Search->new( config => $config );
 my $guide = OpenGuides->new( config => $config );
 

trunk/t/33_search_advanced_search_utm.t

@@ -2 +2 @@
 use CGI::Wiki::Setup::SQLite;
 use OpenGuides::Config;
-use OpenGuides::SuperSearch;
+use OpenGuides::Search;
 use OpenGuides::Test;
 use Test::More;
@@ -42 +42 @@
            }
 );
-my $search = OpenGuides::SuperSearch->new( config => $config );
+my $search = OpenGuides::Search->new( config => $config );
 my $guide = OpenGuides->new( config => $config );
 

trunk/t/34_search_paging.t

@@ -2 +2 @@
 use CGI::Wiki::Setup::SQLite;
 use OpenGuides::Config;
-use OpenGuides::SuperSearch;
+use OpenGuides::Search;
 use OpenGuides::Test;
 use Test::More;
@@ -25 +25 @@
 my $config = OpenGuides::Test->make_basic_config;
 $config->use_plucene( 1 );
-my $search = OpenGuides::SuperSearch->new( config => $config );
+my $search = OpenGuides::Search->new( config => $config );
 my $guide = OpenGuides->new( config => $config );
 
@@ -52 +52 @@
                                                 },
                              );
-    like( $output, qr/supersearch.cgi\?.*os_x=523500.*Next.*results/s,
+    like( $output, qr/search.cgi\?.*os_x=523500.*Next.*results/s,
           "os_x retained in next page link" );
-    like( $output, qr/supersearch.cgi\?.*os_y=177500.*Next.*results/s,
+    like( $output, qr/search.cgi\?.*os_y=177500.*Next.*results/s,
           "os_y retained in next page link" );
-    like( $output, qr/supersearch.cgi\?.*os_dist=1500.*Next.*results/s,
+    like( $output, qr/search.cgi\?.*os_dist=1500.*Next.*results/s,
           "os_dist retained in next page link" );
 }
@@ -68 +68 @@
     # in order to force it to create a fresh locator.
     $config->geo_handler( 2 );
-    my $search = OpenGuides::SuperSearch->new( config => $config );
+    my $search = OpenGuides::Search->new( config => $config );
 
     foreach my $i ( 1 .. 30 ) {
@@ -87 +87 @@
                                                 },
                              );
-    like( $output, qr/supersearch.cgi\?.*osie_x=100000.*Next.*results/s,
+    like( $output, qr/search.cgi\?.*osie_x=100000.*Next.*results/s,
           "osie_x retained in next page link" );
-    like( $output, qr/supersearch.cgi\?.*osie_y=200000.*Next.*results/s,
+    like( $output, qr/search.cgi\?.*osie_y=200000.*Next.*results/s,
           "osie_y retained in next page link" );
-    like( $output, qr/supersearch.cgi\?.*osie_dist=1500.*Next.*results/s,
+    like( $output, qr/search.cgi\?.*osie_dist=1500.*Next.*results/s,
           "osie_dist retained in next page link" );
 }
@@ -103 +103 @@
     # in order to force it to create a fresh locator.
     $config->geo_handler( 3 );
-    my $search = OpenGuides::SuperSearch->new( config => $config );
+    my $search = OpenGuides::Search->new( config => $config );
 
     foreach my $i ( 1 .. 30 ) {
@@ -122 +122 @@
                                                 },
                              );
-    like( $output, qr/supersearch.cgi\?.*latitude=51.5.*Next.*results/s,
+    like( $output, qr/search.cgi\?.*latitude=51.5.*Next.*results/s,
           "latitude retained in next page link" );
-    like( $output, qr/supersearch.cgi\?.*longitude=-0.12.*Next.*results/s,
+    like( $output, qr/search.cgi\?.*longitude=-0.12.*Next.*results/s,
           "longitude retained in next page link" );
-    like( $output, qr/supersearch.cgi\?.*latlong_dist=1500.*Next.*results/s,
+    like( $output, qr/search.cgi\?.*latlong_dist=1500.*Next.*results/s,
           "latlong_dist retained in next page link" );
 }

trunk/t/35_search_two_searches.t

@@ -2 +2 @@
 use CGI::Wiki::Setup::SQLite;
 use OpenGuides::Config;
-use OpenGuides::SuperSearch;
+use OpenGuides::Search;
 use Test::More;
 
@@ -53 +53 @@
 if ( $@ ) { $config->use_plucene( 0 ) };
 
-my $search = OpenGuides::SuperSearch->new( config => $config );
+my $search = OpenGuides::Search->new( config => $config );
 
 # Write some data.
@@ -106 +106 @@
 # Now with Irish National Grid.
 $config->geo_handler( 2 );
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $search->run(
               return_output => 1,
@@ -121 +121 @@
 $config->geo_handler( 3 );
 $config->ellipsoid( "Airy" );
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $search->run(
               return_output => 1,

trunk/t/36_search_order.t

@@ -2 +2 @@
 use CGI::Wiki::Setup::SQLite;
 use OpenGuides::Config;
-use OpenGuides::SuperSearch;
+use OpenGuides::Search;
 use Test::More;
 
@@ -37 +37 @@
 );
 
-my $search = OpenGuides::SuperSearch->new( config => $config );
-isa_ok( $search, "OpenGuides::SuperSearch" );
+my $search = OpenGuides::Search->new( config => $config );
+isa_ok( $search, "OpenGuides::Search" );
 
 # Write some data.

trunk/t/37_search_summaries.t

@@ -2 +2 @@
 use CGI::Wiki::Setup::SQLite;
 use OpenGuides::Config;
-use OpenGuides::SuperSearch;
+use OpenGuides::Search;
 use Test::More;
 
@@ -32 +32 @@
     if ( $@ ) { $config->use_plucene( 0 ) };
 
-    my $search = OpenGuides::SuperSearch->new( config => $config );
-    isa_ok( $search, "OpenGuides::SuperSearch" );
+    my $search = OpenGuides::Search->new( config => $config );
+    isa_ok( $search, "OpenGuides::Search" );
     my $wiki = $search->wiki;
     $wiki->write_node( "Pub Crawls", "The basic premise of the pub crawl is to visit a succession of pubs, rather than spending the entire evening or day in a single establishment. London offers an excellent choice of themes for your pub crawl.", undef, { category => "Pubs" } ) or die "Can't write node";

trunk/t/38_search_params.t

@@ -3 +3 @@
 use CGI::Wiki::Setup::SQLite;
 use OpenGuides::Config;
-use OpenGuides::SuperSearch;
+use OpenGuides::Search;
 use Test::More;
 
@@ -60 +60 @@
 $q->param( -name => "latlong_dist", -value => 700    );
 my %vars = $q->Vars();
-my $search = OpenGuides::SuperSearch->new( config => $config );
+my $search = OpenGuides::Search->new( config => $config );
 $search->run( vars => \%vars, return_output => 1 );
 is( $search->{distance_in_metres}, 500,
@@ -74 +74 @@
 $q->param( -name => "latlong_dist", -value => 700    );
 %vars = $q->Vars();
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $search->run( vars => \%vars, return_output => 1 );
 ok( !defined $search->{distance_in_metres},
@@ -86 +86 @@
 $q->param( -name => "latlong_dist", -value => 700 );
 %vars = $q->Vars();
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $search->run( vars => \%vars, return_output => 1 );
 is( $search->{distance_in_metres}, 700,
@@ -104 +104 @@
 $q->param( -name => "latlong_dist", -value => 700    );
 %vars = $q->Vars();
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $search->run( vars => \%vars, return_output => 1 );
 is( $search->{distance_in_metres}, 600,
@@ -118 +118 @@
 $q->param( -name => "latlong_dist", -value => 700    );
 %vars = $q->Vars();
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $search->run( vars => \%vars, return_output => 1 );
 ok( !defined $search->{distance_in_metres},
@@ -130 +130 @@
 $q->param( -name => "latlong_dist", -value => 700 );
 %vars = $q->Vars();
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $search->run( vars => \%vars, return_output => 1 );
 is( $search->{distance_in_metres}, 700,
@@ -149 +149 @@
 $q->param( -name => "latlong_dist", -value => 700    );
 %vars = $q->Vars();
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $search->run( vars => \%vars, return_output => 1 );
 ok( !defined $search->{distance_in_metres},
@@ -161 +161 @@
 $q->param( -name => "latlong_dist", -value => 700    );
 %vars = $q->Vars();
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $search->run( vars => \%vars, return_output => 1 );
 ok( !defined $search->{distance_in_metres},
@@ -173 +173 @@
 $q->param( -name => "latlong_dist", -value => 700 );
 %vars = $q->Vars();
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $search->run( vars => \%vars, return_output => 1 );
 is( $search->{distance_in_metres}, 700,

trunk/t/39_search_form.t

@@ -1 +1 @@
 use strict;
 use CGI::Wiki::Setup::SQLite;
-use OpenGuides::SuperSearch;
+use OpenGuides::Search;
 use OpenGuides::Test;
 use Test::More;
@@ -46 +46 @@
 
 # British National Grid guides should have os and latlong search fields.
-my $search = OpenGuides::SuperSearch->new( config => $config );
+my $search = OpenGuides::Search->new( config => $config );
 my $output = $search->run( return_output => 1 );
 # Strip Content-Type header to stop Test::HTML::Content getting confused.
@@ -72 +72 @@
 # Irish National Grid guides should have osie and latlong.
 $config->geo_handler( 2 );
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $output = $search->run( return_output => 1 );
 $output =~ s/^Content-Type.*[\r\n]+//m;
@@ -98 +98 @@
 $config->geo_handler( 3 );
 $config->ellipsoid( "Airy" );
-$search = OpenGuides::SuperSearch->new( config => $config );
+$search = OpenGuides::Search->new( config => $config );
 $output = $search->run( return_output => 1 );
 $output =~ s/^Content-Type.*[\r\n]+//m;