From e56c7d85c8b19e0e9d7422669a5110e14f86b668 Mon Sep 17 00:00:00 2001 From: Ben Woodhead Date: Fri, 9 Sep 2011 13:14:43 -0300 Subject: [PATCH] ISLANDORA-323: Fixed naming --- SearchClass.inc | 5 ++++- tests/README_TESTING.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SearchClass.inc b/SearchClass.inc index 40334374..043a5e02 100644 --- a/SearchClass.inc +++ b/SearchClass.inc @@ -24,9 +24,12 @@ class SearchClass { */ function solr_search($query, $startPage=1, $fq = NULL, $dismax = NULL) { $solrFile = trim(variable_get('islandora_solr_search_block_handler_file', 'plugins/SolrResults.inc')); - if (strpos($solrField, '../')) { // Don't let us bust out of fedora_repository modules directory when looking for a handler + + // Don't let us bust out of fedora_repository modules directory when looking for a handler + if (strpos($solrField, '../')) { drupal_set_message(t('You have illegal characters in your solr handler function in the Islandora solr block config.'), 'error'); } + $solrClass = trim(variable_get('islandora_solr_search_block_handler_class', 'SolrResults')); $solrFunction = trim(variable_get('islandora_solr_search_block_handler_function', 'SearchAndDisplay')); require_once(drupal_get_path('module', 'fedora_repository') . '/' . $solrFile); diff --git a/tests/README_TESTING.txt b/tests/README_TESTING.txt index 18db5ba8..bd69c57e 100644 --- a/tests/README_TESTING.txt +++ b/tests/README_TESTING.txt @@ -2,7 +2,7 @@ There are a few things to set up to get the Simpletests to run properly. Fedora Installation -The test sets up the fedora_repository module with the default server settings. +The test sets up the islandora module with the default server settings. This means it will expect a Fedora server to be running on localhost:8080 with the usual defaults. The tests also expect the Islandora demo objects, i.e., islandora:top, islandora:demos collections, etc. to be installed. (Go to