Changeset 716
- Timestamp:
- 11/24/05 20:01:09 (3 years ago)
- Location:
- trunk
- Files:
-
- 6 removed
- 5 modified
- 9 moved
-
Changes (modified) (1 diff)
-
MANIFEST (modified) (4 diffs)
-
lib/OpenGuides/Search.pm (moved) (moved from trunk/lib/OpenGuides/SuperSearch.pm) (5 diffs)
-
search.cgi (moved) (moved from trunk/supersearch.cgi) (1 diff)
-
t/31_search.t (moved) (moved from trunk/t/31_supersearch.t)
-
t/31_supersearch.t (deleted)
-
t/32_search_simple_metadata.t (moved) (moved from trunk/t/32_supersearch_simple_metadata.t)
-
t/33_supersearch_advanced_search.t (deleted)
-
t/34_search_paging.t (moved) (moved from trunk/t/34_supersearch_paging.t)
-
t/35_supersearch_two_searches.t (deleted)
-
t/36_search_order.t (moved) (moved from trunk/t/36_supersearch_order.t)
-
t/36_supersearch_order.t (deleted)
-
t/37_supersearch_summaries.t (deleted)
-
t/38_search_params.t (moved) (moved from trunk/t/38_supersearch_params.t)
-
t/39_search_form.t (moved) (moved from trunk/t/39_supersearch_form.t)
-
templates/differences.tt (modified) (1 diff)
-
templates/footer.tt (modified) (1 diff)
-
templates/node.tt (modified) (1 diff)
-
templates/search.tt (moved) (moved from trunk/templates/supersearch.tt) (4 diffs)
-
templates/supersearch.tt (deleted)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Changes
r712 r716 1 0.52 Fix missing bracket in node.tt. 1 0.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. 2 7 Add custom_node template just below main content in node.tt. 3 8 -
trunk/MANIFEST
r633 r716 18 18 lib/OpenGuides/Config.pm 19 19 lib/OpenGuides/RDF.pm 20 lib/OpenGuides/S uperSearch.pm20 lib/OpenGuides/Search.pm 21 21 lib/OpenGuides/Template.pm 22 22 lib/OpenGuides/Test.pm … … 25 25 newpage.cgi 26 26 preferences.cgi 27 s upersearch.cgi27 search.cgi 28 28 templates/backlink_results.tt 29 29 templates/banner.tt … … 50 50 templates/search_results.tt 51 51 templates/site_index.tt 52 templates/s upersearch.tt52 templates/search.tt 53 53 templates/userstats.tt 54 54 templates/wanted_pages.tt … … 65 65 t/26_geo_data_search_form.t 66 66 t/27_geo_data_edit_form.t 67 t/31_s upersearch.t68 t/32_s upersearch_simple_metadata.t69 t/33_s upersearch_advanced_search.t70 t/33_s upersearch_advanced_search_utm.t71 t/34_s upersearch_paging.t72 t/35_s upersearch_two_searches.t73 t/36_s upersearch_order.t74 t/37_s upersearch_summaries.t75 t/38_s upersearch_params.t76 t/39_s upersearch_form.t67 t/31_search.t 68 t/32_search_simple_metadata.t 69 t/33_search_advanced_search.t 70 t/33_search_advanced_search_utm.t 71 t/34_search_paging.t 72 t/35_search_two_searches.t 73 t/36_search_order.t 74 t/37_search_summaries.t 75 t/38_search_params.t 76 t/39_search_form.t 77 77 t/41_deletion.t 78 78 t/51_display_node.t -
trunk/lib/OpenGuides/Search.pm
r692 r716 1 package OpenGuides::S uperSearch;1 package OpenGuides::Search; 2 2 use strict; 3 3 our $VERSION = '0.10'; … … 12 12 =head1 NAME 13 13 14 OpenGuides::S uperSearch - Search form generation and processing for OpenGuides.14 OpenGuides::Search - Search form generation and processing for OpenGuides. 15 15 16 16 =head1 DESCRIPTION … … 24 24 use CGI; 25 25 use OpenGuides::Config; 26 use OpenGuides::S uperSearch;26 use OpenGuides::Search; 27 27 28 28 my $config = OpenGuides::Config->new( file => "wiki.conf" ); 29 my $search = OpenGuides::S uperSearch->new( config => $config );29 my $search = OpenGuides::Search->new( config => $config ); 30 30 my %vars = CGI::Vars(); 31 31 $search->run( vars => \%vars ); … … 38 38 39 39 my $config = OpenGuides::Config->new( file => "wiki.conf" ); 40 my $search = OpenGuides::S uperSearch->new( config => $config );40 my $search = OpenGuides::Search->new( config => $config ); 41 41 42 42 =cut … … 692 692 wiki => $self->wiki, 693 693 config => $self->config, 694 template => "s upersearch.tt",694 template => "search.tt", 695 695 vars => $tt_vars, 696 696 ); -
trunk/search.cgi
r621 r716 6 6 use CGI; 7 7 use OpenGuides::Config; 8 use OpenGuides::S uperSearch;8 use OpenGuides::Search; 9 9 10 10 my $config_file = $ENV{OPENGUIDES_CONFIG_FILE} || "wiki.conf"; 11 11 my $config = OpenGuides::Config->new( file => $config_file ); 12 my $search = OpenGuides::S uperSearch->new( config => $config );12 my $search = OpenGuides::Search->new( config => $config ); 13 13 my %vars = CGI::Vars(); 14 14 $search->run( vars => \%vars ); -
trunk/templates/differences.tt
r581 r716 33 33 34 34 <p> 35 <form action="s upersearch.cgi" method="get">35 <form action="search.cgi" method="get"> 36 36 <input type="text" size="50" name="search" /> 37 37 <input type="submit" name="Go" value="Search" class="form_button" /> -
trunk/templates/footer.tt
r530 r716 2 2 3 3 <div id="search_form"> 4 <form action="s upersearch.cgi" method="get">4 <form action="search.cgi" method="get"> 5 5 <strong><label for="search">Search [% site_name %]:</label></strong> <input type="text" size="50" name="search" id="search" value="Search text" onclick="this.value=''" /> 6 6 <input type="submit" name="Go" value="Go" id="go" class="form_button" /> -
trunk/templates/node.tt
r715 r716 40 40 <br clear="all" /> 41 41 <div id="find_within_distance"> 42 <form action="s upersearch.cgi">42 <form action="search.cgi"> 43 43 <label for="distance">Find all things within</label> 44 44 <select name="[% dist_field %]" id="distance"> -
trunk/templates/search.tt
r688 r716 23 23 </small></p> 24 24 25 <form method="get" action="s upersearch.cgi">25 <form method="get" action="search.cgi"> 26 26 <table border="1"> 27 27 <tr> … … 81 81 Matches [% first_num %] - [% last_num %] of [% total_num %]. 82 82 [% IF (first_num > 20) %] 83 <a href="s upersearch.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> 84 84 [% END %] 85 85 [% IF ((first_num > 20) and next_page_startpos) %] … … 87 87 [% END %] 88 88 [% IF next_page_startpos %] 89 <a href="s upersearch.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 %]">Next89 <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 90 90 [% IF ((total_num - last_num >= 20)) %] 91 91 20 … … 101 101 [% END %] 102 102 103 <form method="get" action="s upersearch.cgi">103 <form method="get" action="search.cgi"> 104 104 <label for="search_lower">Search:</label> 105 105 <input type="text" name="search" id="search_lower" value="[% search_terms %]" size="50" maxlength="80" value="Search text" onclick="this.value=''" />
