added urlencode to evergreen target removed some comments in scholar target

targets/cufts/roblib_search_cufts.module

@@ -5,30 +5,6 @@
  * Implementation of Roblib search for searching several targets.
  */
 
-/**
- * Implements hook_boot().
- * @global type $conf
- */
-function roblib_search_cufts_boot() {
-  /* below is an example from islandora_solr module for internationalization
-   *  global $conf;
-
-    // Allow i18n, by using multilingual variables.
-    if (module_exists('i18n')) {
-    $vars = array(
-    'islandora_solr_facets',
-    'islandora_solr_result_fields',
-    'islandora_solr_searchterms'
-    );
-
-    if (isset($conf['i18n_variables']) && is_array($conf['i18n_variables'])) {
-    $conf['i18n_variables'] = array_merge($vars, $conf['i18n_variables']);
-    }
-    else {
-    $conf['i18n_variables'] = $vars;
-    }
-    } */
-}
 
 /**
  * Implements hook_menu().

targets/evergreen/roblib_search_evergreen.module

@@ -167,8 +167,8 @@ function roblib_search_evergreen_get_results($query) {
   $url = variable_get('roblib_search_evergreen_url', 'http://137.149.200.52');
   $url_suffix = variable_get('roblib_search_evergreen_search_suffix', '/opac/extras/sru?version=1.1&operation=searchRetrieve&query=');
   $number_of_records = variable_get('roblib_search_evergreen_num_results', '5');
-  $query = str_replace(' ', '%20AND%20',$query); //hack until the library decides if we want phrase or individual words
+  $query = str_replace(' ', ' AND ',$query); //hack until the library decides if we want phrase or individual words
-  $query .= urlencode(' AND "prince edward island"');
+  $query = urlencode($query . ' AND "prince edward island"');
   $search_url = $url . $url_suffix . $query  . '&maximumRecords=' . $number_of_records;
   $catalog_base_search_url = variable_get('roblib_search_evergreen_catalog_base_search_url', 'http://islandpines.roblib.upei.ca/opac/en-CA/skin/roblib/xml/rresult.xml?rt=keyword&tp=keyword&t=');
   drupal_add_js(array('roblib_search_evergreen' => array('catalog_url' => $catalog_base_search_url)), array('type' => 'setting'));