diff --git a/README.txt b/README.txt index 055a945..f0c648a 100644 --- a/README.txt +++ b/README.txt @@ -4,7 +4,7 @@ $Id$ The Google Appliance module provides an interface to obtain search results from a dedicated Google Search Appliance (GSA) hardware device. The module can act as a replacemet for core Search, or it may operate in tandem with it. -If you will use core search along with this module, core search results will show up normally at search/{search terms}, while Google Appliance searches will show up at gsearch/{search terms}. +If you will use core search along with this module, core search results will show up normally at search/{search terms}, while Google Appliance searches will show up at gsearch/{search terms} by default. You can also configure Google Appliance searches to appear at a path other than gsearch, even taking over the Core Search module's path. Since search index management for the GSA searches is offloaded to the GSA device, utilizing the module is a two-tier solution: @@ -40,7 +40,7 @@ The module provides two blocks: (1) Search Form (2) Related Searches -Both blocks will need to be assigned to a region, but the Related Searches block is preconfigured to only appear on results pages. Neither block is required to be used, as you can access the search form on the search page +Both blocks will need to be assigned to a region, but the Related Searches block is preconfigured to only appear on results pages. Neither block is required to be used, as you can access the search form on the search page located here by default: * gsearch/ diff --git a/google_appliance.module b/google_appliance.module index 424d419..142d37a 100644 --- a/google_appliance.module +++ b/google_appliance.module @@ -27,7 +27,7 @@ function google_appliance_help($path, $arg) { $output .= '

' . t('Teaming up with core Search') . '

'; $output .= '

' . t('The Google Appliance module can act as a replacement for core Search, or it may operate in tandem with it. Say you want to provide search results for the public to include both drupal and non-drupal content, but you want administrative searches to only provide results for local site content. In this case you use the Google Appliance searches for public search, and core Search for admin searches.') . '

' . PHP_EOL; - $output .= '

' . t('If you will use core search along with this module, core search results will show up normally at search/{search terms}, while Google Appliance searches will show up at gsearch/{search terms}.') . '

' . PHP_EOL; + $output .= '

' . t('If you will use core search along with this module, core search results will show up normally at search/{search terms}, while Google Appliance searches will show up by default at gsearch/{search terms}.') . '

' . PHP_EOL; $output .= '

' . t('Blocks') . '

'; $output .= '

' . t('The module provides two blocks:') . '

' . PHP_EOL; @@ -95,10 +95,11 @@ function google_appliance_menu() { $settings = _google_appliance_get_settings(); // search results page + $parts = substr_count($settings['drupal_path'], '/'); $items[$settings['drupal_path']] = array( 'title' => $settings['search_title'], 'page callback' => 'google_appliance_search_view', - 'page arguments' => array(1, 2), // (1) search query, (2) results sort param + 'page arguments' => array(++$parts, ++$parts), // (1) search query, (2) results sort param 'access arguments' => array('access_google_appliance_content'), 'type' => MENU_SUGGESTED_ITEM, );