Changeset 716

Show
Ignore:
Timestamp:
11/24/05 20:01:09 (3 years ago)
Author:
earle
Message:

Renaming OpenGuides::SuperSearch? to OpenGuides::Search and supersearch.cgi to search.cgi - bug #17.

Location:
trunk
Files:
6 removed
5 modified
9 moved

Legend:

Unmodified
Added
Removed
  • trunk/Changes

    r712 r716  
    1 0.52    Fix missing bracket in node.tt. 
     10.52     
     2        IMPORTANT CHANGE: "supersearch.cgi" is now simply "search.cgi". If you 
     3          have customisations to your templates, you may need to make changes 
     4          to reflect this. 
     5        Rename OpenGuides::SuperSearch to OpenGuides::Search. 
     6        Fix missing bracket in node.tt. 
    27        Add custom_node template just below main content in node.tt. 
    38 
  • trunk/MANIFEST

    r633 r716  
    1818lib/OpenGuides/Config.pm 
    1919lib/OpenGuides/RDF.pm 
    20 lib/OpenGuides/SuperSearch.pm 
     20lib/OpenGuides/Search.pm 
    2121lib/OpenGuides/Template.pm 
    2222lib/OpenGuides/Test.pm 
     
    2525newpage.cgi 
    2626preferences.cgi 
    27 supersearch.cgi 
     27search.cgi 
    2828templates/backlink_results.tt 
    2929templates/banner.tt 
     
    5050templates/search_results.tt 
    5151templates/site_index.tt 
    52 templates/supersearch.tt 
     52templates/search.tt 
    5353templates/userstats.tt 
    5454templates/wanted_pages.tt 
     
    6565t/26_geo_data_search_form.t 
    6666t/27_geo_data_edit_form.t 
    67 t/31_supersearch.t 
    68 t/32_supersearch_simple_metadata.t 
    69 t/33_supersearch_advanced_search.t 
    70 t/33_supersearch_advanced_search_utm.t 
    71 t/34_supersearch_paging.t 
    72 t/35_supersearch_two_searches.t 
    73 t/36_supersearch_order.t 
    74 t/37_supersearch_summaries.t 
    75 t/38_supersearch_params.t 
    76 t/39_supersearch_form.t 
     67t/31_search.t 
     68t/32_search_simple_metadata.t 
     69t/33_search_advanced_search.t 
     70t/33_search_advanced_search_utm.t 
     71t/34_search_paging.t 
     72t/35_search_two_searches.t 
     73t/36_search_order.t 
     74t/37_search_summaries.t 
     75t/38_search_params.t 
     76t/39_search_form.t 
    7777t/41_deletion.t 
    7878t/51_display_node.t 
  • trunk/lib/OpenGuides/Search.pm

    r692 r716  
    1 package OpenGuides::SuperSearch; 
     1package OpenGuides::Search; 
    22use strict; 
    33our $VERSION = '0.10'; 
     
    1212=head1 NAME 
    1313 
    14 OpenGuides::SuperSearch - Search form generation and processing for OpenGuides. 
     14OpenGuides::Search - Search form generation and processing for OpenGuides. 
    1515 
    1616=head1 DESCRIPTION 
     
    2424  use CGI; 
    2525  use OpenGuides::Config; 
    26   use OpenGuides::SuperSearch; 
     26  use OpenGuides::Search; 
    2727 
    2828  my $config = OpenGuides::Config->new( file => "wiki.conf" ); 
    29   my $search = OpenGuides::SuperSearch->new( config => $config ); 
     29  my $search = OpenGuides::Search->new( config => $config ); 
    3030  my %vars = CGI::Vars(); 
    3131  $search->run( vars => \%vars ); 
     
    3838 
    3939  my $config = OpenGuides::Config->new( file => "wiki.conf" ); 
    40   my $search = OpenGuides::SuperSearch->new( config => $config ); 
     40  my $search = OpenGuides::Search->new( config => $config ); 
    4141 
    4242=cut 
     
    692692                                                wiki     => $self->wiki, 
    693693                                                config   => $self->config, 
    694                                                 template => "supersearch.tt", 
     694                                                template => "search.tt", 
    695695                                                vars     => $tt_vars, 
    696696                                              ); 
  • trunk/search.cgi

    r621 r716  
    66use CGI; 
    77use OpenGuides::Config; 
    8 use OpenGuides::SuperSearch; 
     8use OpenGuides::Search; 
    99 
    1010my $config_file = $ENV{OPENGUIDES_CONFIG_FILE} || "wiki.conf"; 
    1111my $config = OpenGuides::Config->new( file => $config_file ); 
    12 my $search = OpenGuides::SuperSearch->new( config => $config ); 
     12my $search = OpenGuides::Search->new( config => $config ); 
    1313my %vars = CGI::Vars(); 
    1414$search->run( vars => \%vars ); 
  • trunk/templates/differences.tt

    r581 r716  
    3333 
    3434<p> 
    35 <form action="supersearch.cgi" method="get"> 
     35<form action="search.cgi" method="get"> 
    3636  <input type="text" size="50" name="search" /> 
    3737  <input type="submit" name="Go" value="Search" class="form_button" /> 
  • trunk/templates/footer.tt

    r530 r716  
    22 
    33<div id="search_form"> 
    4   <form action="supersearch.cgi" method="get"> 
     4  <form action="search.cgi" method="get"> 
    55    <strong><label for="search">Search [% site_name %]:</label></strong> <input type="text" size="50" name="search" id="search" value="Search text" onclick="this.value=''" />  
    66    <input type="submit" name="Go" value="Go" id="go" class="form_button" /> 
  • trunk/templates/node.tt

    r715 r716  
    4040  <br clear="all" /> 
    4141  <div id="find_within_distance"> 
    42     <form action="supersearch.cgi"> 
     42    <form action="search.cgi"> 
    4343      <label for="distance">Find all things within</label> 
    4444      <select name="[% dist_field %]" id="distance"> 
  • trunk/templates/search.tt

    r688 r716  
    2323  </small></p> 
    2424 
    25   <form method="get" action="supersearch.cgi"> 
     25  <form method="get" action="search.cgi"> 
    2626    <table border="1"> 
    2727      <tr> 
     
    8181      Matches [% first_num %] - [% last_num %] of [% total_num %].  
    8282      [% IF (first_num > 20) %] 
    83         <a href="supersearch.cgi?search=[% search_terms %]&next=[% first_num - 21 %]">Previous 20 results</a>  
     83        <a href="search.cgi?search=[% search_terms %]&next=[% first_num - 21 %]">Previous 20 results</a>  
    8484      [% END %]  
    8585      [% IF ((first_num > 20) and next_page_startpos) %] 
     
    8787      [% END %] 
    8888      [% IF next_page_startpos %] 
    89         <a href="supersearch.cgi?search=[% search_terms %];[% dist_field %]=[% dist %];[% coord_field_1 %]=[% coord_field_1_value %];[% coord_field_2 %]=[% coord_field_2_value %];next=[% next_page_startpos %]">Next  
     89        <a href="search.cgi?search=[% search_terms %];[% dist_field %]=[% dist %];[% coord_field_1 %]=[% coord_field_1_value %];[% coord_field_2 %]=[% coord_field_2_value %];next=[% next_page_startpos %]">Next  
    9090        [% IF ((total_num - last_num >= 20)) %] 
    9191          20 
     
    101101    [% END %]   
    102102 
    103   <form method="get" action="supersearch.cgi"> 
     103  <form method="get" action="search.cgi"> 
    104104    <label for="search_lower">Search:</label>  
    105105    <input type="text" name="search" id="search_lower" value="[% search_terms %]" size="50" maxlength="80" value="Search text" onclick="this.value=''" />