');
+ }
+ });
+ jQuery('#' + 'roblib-search-content-eds').empty().append(items.join(''));
+ }
+ var non_upei_link = '';
+ var upei_link = 'SEE ALL (' + data.recordCount + ') ';
+ if (!data.is_local_ip) {
+ non_upei_link = '[Non-UPEI]';
+ upei_link = upei_link + non_upei_link;
+ }
+ jQuery('#roblib-search-eds-more').empty().append(upei_link);
+ jQuery('#roblib-eds-books-more-results').empty().append(upei_link);
+ jQuery('#roblib-eds-books-toc').empty().append('Books (' + data.recordCount + ')');
+
+ });
+ }
+ }
+}
+
+
+function roblib_intersects(a, b) {
+ var d = {};
+ var results = [];
+ for (var i = 0; i < b.length; i++) {
+ d[b[i]] = true;
+ }
+ for (var j = 0; j < a.length; j++) {
+ if (d[a[j]])
+ results.push(a[j]);
+ }
+ return results;
+}
+
+function roblib_shorten(str, maxLen, separator) {
+ if (str.length <= maxLen)
+ return str;
+ return str.substr(0, str.lastIndexOf(separator, maxLen)) + ' et al.';
+}
+
+
diff --git a/modules/roblib_search_eds/roblib_search_eds.libraries.yml b/modules/roblib_search_eds/roblib_search_eds.libraries.yml
new file mode 100644
index 0000000..ccc1925
--- /dev/null
+++ b/modules/roblib_search_eds/roblib_search_eds.libraries.yml
@@ -0,0 +1,19 @@
+eds-book:
+ version: 1.x
+ css:
+ base:
+ css/roblib_search_eds.css: {}
+ js:
+ js/eds_results_book.js: {}
+ dependencies:
+ - core/drupal
+eds-article:
+ version: 1.x
+ css:
+ base:
+ css/roblib_search_eds.css: {}
+ js:
+ js/eds_results_article.js: {}
+ dependencies:
+ - core/drupal
+
diff --git a/modules/roblib_search_eds/roblib_search_eds.module b/modules/roblib_search_eds/roblib_search_eds.module
index 4cd19f2..22571ff 100644
--- a/modules/roblib_search_eds/roblib_search_eds.module
+++ b/modules/roblib_search_eds/roblib_search_eds.module
@@ -78,49 +78,21 @@ function roblib_search_eds_info($type = 'Articles') {
* Implements hook_theme().
*/
function roblib_search_eds_theme($existing, $type, $theme, $path) {
+ $modulePath = \Drupal::service('module_handler')->getModule('roblib_search')
+ ->getPath();
+ $spinner_path = '/' . $modulePath . "/img/spinner.gif";
return [
'roblib_search_eds_books' => [
- 'variables' => ['query' => NULL],
+ 'variables' => ['query' => NULL, 'spinner_path' => $spinner_path],
],
'roblib_search_eds_articles' => [
- 'variables' => ['query' => NULL],
+ 'variables' => ['query' => NULL, 'spinner_path' => $spinner_path],
],
];
}
-/*function roblib_search_eds_block_info() {
-
- $blocks['roblib_search_eds_results'] = array(
- // info: The name of the block.
- 'info' => t('EDS Search Results block'),
- // Block caching options (per role, per user, etc.)
- 'cache' => DRUPAL_CACHE_PER_ROLE,
- );
- $blocks['roblib_search_eds_articles'] = array(
- 'info' => t('EDS Search Results Articles'),
- 'cache' => DRUPAL_CACHE_PER_ROLE,
- );
- return $blocks;
-}*/
-
-/*function roblib_search_eds_block_view($delta = '') {
- switch ($delta) {
- case 'roblib_search_eds_results':
- $block['subject'] = t('Books & Media');
- $block['content'] = theme('roblib_search_eds', array('results' => NULL));
- break;
-
- case 'roblib_search_eds_articles':
- $block['subject'] = t('Articles');
- $block['content'] = theme('roblib_search_eds_articles', array('results' => NULL));
- break;
-
- }
- return $block;
-}*/
-
/*function roblib_search_eds_ajax($query) {
print roblib_search_eds_get_results($query, 'Books');
exit();
@@ -131,47 +103,7 @@ function roblib_search_eds_articles($query) {
exit();
}*/
-/**
- *
- * @param string $query
- * @return string
- * json string
- */
-function roblib_search_eds_get_results($query = NULL, $type = 'Articles') {
- drupal_add_css(drupal_get_path('module', 'roblib_search_eds') . '/css/roblib_search_eds.theme.css');
- module_load_include('php', 'ebsco', 'lib/EBSCOAPI');
- module_load_include('php', 'ebsco', 'lib/EBSCOAPIConnector');
- module_load_include('php', 'ebsco', 'lib/EBSCOAPIResponse');
- // Url parameters.
- if (!isset($query)) {
- if (isset($_GET['roblib_query'])) {
- $query = $_GET['roblib_query'];
- }
- else {
- return '';
- }
- }
- $limiters = '';
- if ($type != NULL) {
- $limiters = urldecode(roblib_search_eds_get_query_limiters($type));
- }
- // hardcoding "available in library collection" limiter as we can't pass it the
- // same way we passed other limiters
- $filters = ($type === 'Books') ? array("addlimiter(FT1:y)") : array();
- $config = roblib_search_eds_build_config_arr($type);
-
- $number_per_page = variable_get('roblib_search_eds_num_results', '5');
- $query = '(' . $query . ') ' . $limiters;
- $search = array('lookfor' => $query, 'type' => 'ALLFields', 'index' => 'AllFields', 'q' => 'ebsco/results', 'op' => 'Search');
- $eds_api = new EBSCOAPI($config);
- $is_local_ip = $eds_api->connector()->isGuestIPAddress($_SERVER["REMOTE_ADDR"]);
- //$eds_api->isGuest(boolval(variable_get('roblib_search_eds_guest','y')));
- $eds_api->isGuest(!$is_local_ip);
- $output = $eds_api->apiSearch($search, $filters, 1, $number_per_page);
- $output['is_local_ip'] = $is_local_ip;
- return json_encode($output);
-}
/**
* For each result query ebsco again to get the detailed record.
@@ -194,50 +126,6 @@ function roblib_search_eds_get_detailed_result(&$output, $query, &$eds_api) {
}
}
-/**
- * Creates the limiter string to append to the end of a query.
- *
- * @param string $type
- * The type of search we want (Articles or Books)
- *
- * @return string
- * The limiters to append to the query.
- */
-function roblib_search_eds_get_query_limiters($type) {
- $limiters = 'n';
- switch ($type) {
- case 'Articles':
- //$limiters = 'facetfilter=1,SourceType:Magazines,SourceType:News,SourceType:Academic+Journals,SourceType:Conference+Materials';
- $limiters = ' ' . variable_get('roblib_search_eds_article_limiters',
- 'AND (PT Article OR PT Magazines OR PT News OR PT Academic Journals OR PT Conference Materials)');
- break;
-
- case 'Books':
- // $limiters = '+AND+(PT+book)';
- //$limiters = 'facetfilter=1,PublicationType:Books,PublicationType:Audio,PublicationType:Videos';
- $limiters = ' ' . variable_get('roblib_search_eds_book_limiters',
- 'AND (PT Book OR PT Video OR PT Audio)');
- break;
-
-
- }
- return urlencode($limiters);
-}
-
-function roblib_search_eds_build_config_arr($type) {
- $config = array();
- $config['user'] = variable_get('roblib_search_eds_user', 'edsusername');
- $config['password'] = variable_get('roblib_search_eds_pass', 'edspassword');
- //get the local ips allowed from ebsco
- $config['local_ip_address'] = variable_get('ebsco_local_ips');
- $config['profile'] = ($type === 'Books') ? variable_get('roblib_search_eds_book_profile', 'apilite') :
- variable_get('roblib_search_eds_profile', 'edsapi');
- $config['auth_url'] = variable_get('roblib_search_eds_auth_url', 'https://eds-api.ebscohost.com/Authservice/rest');
- $config['rest_url'] = variable_get('roblib_search_eds_rest_url', 'https://eds-api.ebscohost.com/edsapi/rest');
- $config['guest'] = variable_get('roblib_search_eds_guest','y');
- return $config;
-}
-
/**
* Implements hook_help().
*
diff --git a/modules/roblib_search_eds/roblib_search_eds.routing.yml b/modules/roblib_search_eds/roblib_search_eds.routing.yml
index a8825c1..74c90ca 100644
--- a/modules/roblib_search_eds/roblib_search_eds.routing.yml
+++ b/modules/roblib_search_eds/roblib_search_eds.routing.yml
@@ -5,4 +5,21 @@ roblib_search_eds.settings:
_title: 'Roblib Search EDS Settings Form'
requirements:
_permission: 'administer site configuration'
-
\ No newline at end of file
+roblib_search_eds.article_search:
+ path: '/roblib_search/eds/articles/{query}'
+ defaults:
+ _controller: '\Drupal\roblib_search_eds\Controller\RoblibSearchEdsController::articleResults'
+ _title: 'Roblib Search EDS Articles'
+ query: '[a-zA-Z\s]+'
+ requirements:
+ _permission: 'access content'
+
+roblib_search_eds.book_search:
+ path: '/roblib_search/eds/book/{query}'
+ defaults:
+ _controller: '\Drupal\roblib_search_eds\Controller\RoblibSearchEdsController::bookResults'
+ _title: 'Roblib Search EDS Articles'
+ query: '[a-zA-Z\s]+'
+ requirements:
+ _permission: 'access content'
+
diff --git a/modules/roblib_search_eds/src/Controller/RoblibSearchEdsController.php b/modules/roblib_search_eds/src/Controller/RoblibSearchEdsController.php
index e95a8bf..b8bbefc 100644
--- a/modules/roblib_search_eds/src/Controller/RoblibSearchEdsController.php
+++ b/modules/roblib_search_eds/src/Controller/RoblibSearchEdsController.php
@@ -3,6 +3,7 @@
namespace Drupal\roblib_search_eds\Controller;
use Drupal\Core\Controller\ControllerBase;
+use Drupal\roblib_search_eds\Lib\EBSCOAPI;
/**
* Controller for d3 graphs.
@@ -16,9 +17,11 @@ class RoblibSearchEdsController extends ControllerBase {
* A renderable array.
*/
public function articleResults($query = NULL) {
+ print $this->eds_get_results($query, 'Articles');
+ exit();
}
-
+
/**
* Display the markup.
*
@@ -26,10 +29,92 @@ class RoblibSearchEdsController extends ControllerBase {
* A renderable array.
*/
public function bookResults($query = NULL) {
- return [
- '#theme' => 'roblib_search_eds_books',
- '#query' => $query,
- ];
+ print $this->eds_get_results($query, 'Books');
+ exit();
+ }
+
+ /**
+ *
+ * @param string $query
+ * @return string
+ * json string
+ */
+ function eds_get_results($query = NULL, $type = 'Articles') {
+ //drupal_add_css(drupal_get_path('module', 'roblib_search_eds') . '/css/roblib_search_eds.theme.css');
+ $config = \Drupal::config('roblib_search_eds.settings');
+ // Url parameters.
+ if (!isset($query)) {
+ if (isset($_GET['roblib_query'])) {
+ $query = $_GET['roblib_query'];
+ }
+ else {
+ return '';
+ }
+ }
+ $limiters = '';
+ if ($type != NULL) {
+ $limiters = $this->get_eds_query_limiters($type);
+ }
+ // hardcoding "available in library collection" limiter as we can't pass it the
+ // same way we passed other limiters
+ $filters = ($type === 'Books') ? array("addlimiter(FT1:y)") : array();
+ $eds_config = $this->build_eds_config_arr($type);
+
+ $number_per_page = $config->get('eds_num_results');
+ $query = '(' . $query . ') ' . $limiters;
+ $search = array('lookfor' => $query, 'type' => 'ALLFields', 'index' => 'AllFields', 'q' => 'ebsco/results', 'op' => 'Search');
+ $eds_api = new EBSCOAPI($eds_config);
+ $is_local_ip = $eds_api->connector()->isGuestIPAddress($_SERVER["REMOTE_ADDR"]);
+ $eds_api->isGuest(!$is_local_ip);
+
+ $output = $eds_api->apiSearch($search, $filters, 1, $number_per_page);
+ $output['is_local_ip'] = $is_local_ip;
+ print json_encode($output);
+ exit();
+ }
+
+ /**
+ * Creates the limiter string to append to the end of a query.
+ *
+ * @param string $type
+ * The type of search we want (Articles or Books)
+ *
+ * @return string
+ * The limiters to append to the query.
+ */
+ function get_eds_query_limiters($type) {
+ $config = \Drupal::config('roblib_search_eds.settings');
+ $limiters = 'n';
+ switch ($type) {
+ case 'Articles':
+ //example 'facetfilter=1,SourceType:Magazines,SourceType:News,SourceType:Academic+Journals,SourceType:Conference+Materials';
+ $limiters = ' ' . $config->get('eds_article_limiters');
+ break;
+
+ case 'Books':
+ // example '+AND+(PT+book)';
+ // example 'facetfilter=1,PublicationType:Books,PublicationType:Audio,PublicationType:Videos';
+ $limiters = ' ' . $config->get('eds_book_limiters');
+ break;
+ }
+ return $limiters;
+ }
+
+ function build_eds_config_arr($type) {
+ $ebsco_config = array();
+ $roblib_search_config = \Drupal::config('roblib_search_eds.settings');
+ $ebsco_config['user'] = $roblib_search_config->get('eds_user');
+ $ebsco_config['password'] = $roblib_search_config->get('eds_pass');
+ //get the local ips allowed from ebsco
+ //TODO move this to a variable
+ $ebsco_config['local_ip_address'] = $roblib_search_config->get('eds_local_ip');
+ $ebsco_config['profile'] = ($type === 'Books') ? $roblib_search_config->get
+ ('eds_book_profile') : $roblib_search_config->get('eds_article_profile');
+ $ebsco_config['auth_url'] = $roblib_search_config->get('eds_auth_url');
+ $ebsco_config['rest_url'] = $roblib_search_config->get('eds_rest_url');
+ $ebsco_config['guest'] = $roblib_search_config->get('eds_guest');
+ $ebsco_config['autocomplete'] = '';
+ return $ebsco_config;
}
}
diff --git a/modules/roblib_search_eds/src/Form/EdsSettingsForm.php b/modules/roblib_search_eds/src/Form/EdsSettingsForm.php
index f0c0b52..898a9eb 100644
--- a/modules/roblib_search_eds/src/Form/EdsSettingsForm.php
+++ b/modules/roblib_search_eds/src/Form/EdsSettingsForm.php
@@ -24,7 +24,7 @@ class EdsSettingsForm extends FormBase {
*/
public function buildForm(array $form, FormStateInterface $form_state) {
$config = \Drupal::config('roblib_search_eds.settings');
- $form['eds_rest_url'] = array(
+ /* $form['eds_rest_url'] = array(
'#type' => 'textfield',
'#title' => t('EDS Rest endpoint'),
'#default_value' => $config->get('eds_rest_url'),
@@ -61,8 +61,16 @@ class EdsSettingsForm extends FormBase {
'#default_value' => $config->get('eds_guest'),
'#description' => t('EDS Guest access, y = guest access, n = not a guest'),
'#required' => TRUE,
+ );*/
+
+ $form['eds_local_ip'] = array(
+ '#type' => 'textfield',
+ '#title' => t('EDS Local IP'),
+ '#default_value' => $config->get('eds_local_ip'),
+ '#description' => t('Local IP address prefix, i. 137.149.'),
+ '#required' => TRUE,
);
-
+
$form['eds_article_profile'] = array(
'#type' => 'textfield',
'#title' => t('EDS Article profile'),
@@ -122,11 +130,12 @@ class EdsSettingsForm extends FormBase {
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
$config = \Drupal::configFactory()->getEditable('roblib_search_eds.settings');
- $config->set('eds_rest_url', $form_state->getValue('eds_rest_url'))->save();
- $config->set('eds_auth_url', $form_state->getValue('eds_auth_url'))->save();
- $config->set('eds_user', $form_state->getValue('eds_user'))->save();
- $config->set('eds_pass', $form_state->getValue('eds_pass'))->save();
- $config->set('eds_guest', $form_state->getValue('eds_guest'))->save();
+ //$config->set('eds_rest_url', $form_state->getValue('eds_rest_url'))->save();
+ //$config->set('eds_auth_url', $form_state->getValue('eds_auth_url'))->save();
+ //$config->set('eds_user', $form_state->getValue('eds_user'))->save();
+ //$config->set('eds_pass', $form_state->getValue('eds_pass'))->save();
+ //$config->set('eds_guest', $form_state->getValue('eds_guest'))->save();
+ $config->set('eds_local_ip', $form_state->getValue('eds_local_ip'))->save();
$config->set('eds_article_profile', $form_state->getValue('eds_article_profile'))->save();
$config->set('eds_book_profile', $form_state->getValue('eds_book_profile'))->save();
$config->set('eds_num_results', $form_state->getValue('eds_num_results'))->save();
diff --git a/modules/roblib_search_eds/src/Lib/EBSCOAPI.php b/modules/roblib_search_eds/src/Lib/EBSCOAPI.php
index ed9faa4..be79616 100644
--- a/modules/roblib_search_eds/src/Lib/EBSCOAPI.php
+++ b/modules/roblib_search_eds/src/Lib/EBSCOAPI.php
@@ -273,13 +273,14 @@ class EBSCOAPI {
* @access protected
*/
protected function request($action, $params = NULL, $attempts = 5) {
- $authenticationToken = $this->authenticationToken();
- $sessionToken = $this->sessionToken();
+ //$authenticationToken = $this->authenticationToken();
+ $sessionToken = $this->apiSessionToken();//$this->sessionToken();
// If authentication token is missing then the session token is missing too, so get both tokens
// If session token is missing then the authentication token may be invalid, so get both tokens.
- if (empty($authenticationToken) || empty($sessionToken)) {
- $result = $this->apiAuthenticationAndSessionToken();
+ if (empty($sessionToken)) {
+ //$result = $this->apiAuthenticationAndSessionToken();
+ $result = $this->apiSessionToken();
if ($this->isError($result)) {
// Any error should terminate the request immediately
// in order to prevent infinite recursion.
@@ -295,7 +296,7 @@ class EBSCOAPI {
}
$headers = array(
- 'x-authenticationToken: '.$this->authenticationToken(),
+ // 'x-authenticationToken: '.$this->authenticationToken(),
'x-sessionToken: '.$this->sessionToken(),
);
@@ -366,9 +367,9 @@ class EBSCOAPI {
*/
public function apiSessionToken() {
// Add authentication tokens to headers.
- $headers = array(
- 'x-authenticationToken: '.$this->authenticationToken(),
- );
+ //$headers = array(
+ // 'x-authenticationToken: '.$this->authenticationToken(),
+ //);
$response = $this->connector()->requestSessionToken($headers);
// Raise the exception so that any code running this method should exit immediately.
@@ -592,12 +593,12 @@ class EBSCOAPI {
'highlight' => 'y',
- 'includeimagequickview' => $includeimagequickview,
-
+ //'includeimagequickview' => $includeimagequickview,
- 'format' => 'ris',
-
- 'styles' => $styles,
+ //UPEI commented out
+ //'format' => 'ris',
+ //UPEI commented out
+ //'styles' => $styles,
);
@@ -620,7 +621,7 @@ class EBSCOAPI {
}
if ($includeimagequickview == TRUE) {
- $params["includeimagequickview"] = "y";
+ //$params["includeimagequickview"] = "y";
}
if ($styles == 'all') {
diff --git a/modules/roblib_search_eds/src/Lib/EBSCOConnector.php b/modules/roblib_search_eds/src/Lib/EBSCOConnector.php
index ae0d736..b5045c7 100644
--- a/modules/roblib_search_eds/src/Lib/EBSCOConnector.php
+++ b/modules/roblib_search_eds/src/Lib/EBSCOConnector.php
@@ -272,9 +272,9 @@ class EBSCOConnector {
.''.$this->userId.''
.''.$this->password.''
.'wsapi'
- .'
-
- '
+ // .'
+ //
+ // '
.'';
$response = $this->request($url,$params, array(), 'POST');
diff --git a/modules/roblib_search_eds/src/Lib/EBSCOResponse.php b/modules/roblib_search_eds/src/Lib/EBSCOResponse.php
index ba3f6b9..93d08e8 100644
--- a/modules/roblib_search_eds/src/Lib/EBSCOResponse.php
+++ b/modules/roblib_search_eds/src/Lib/EBSCOResponse.php
@@ -20,8 +20,8 @@ namespace Drupal\roblib_search_eds\Lib;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-use Drupal\roblib_search_eds\Lib\HTML_Sanitizer;
+require_once __DIR__ . '/sanitizer.class.php';
+//use Drupal\roblib_search_eds\Lib\HTML_Sanitizer;
/**
* EBSCOResponse class.
@@ -168,6 +168,17 @@ class EBSCOResponse
$result = json_decode(json_encode($this->response->SearchResult->citationStylesTerms), true);
$citationStylesTerms = $result;
}
+ // added by UPEI so we can link back with exact same search.
+ $queries = array();
+ if($this->response->SearchRequestGet->SearchCriteriaWithActions->QueriesWithAction){
+ $queriesWithAction = $this->response->SearchRequestGet->SearchCriteriaWithActions->QueriesWithAction->QueryWithAction;
+ foreach($queriesWithAction as $queryWithAction){
+ $queries[]=array(
+ 'query' => (string)$queryWithAction->Query->Term,
+ 'removeAction'=> (string) $queryWithAction->RemoveAction
+ );
+ }
+ }
$results = array(
'recordCount' => $hits,
@@ -180,6 +191,7 @@ class EBSCOResponse
'facets' => $facets,
'imageQuickViewTerms' => $imageQuickViewTerms,
'citationStylesTerms' => $citationStylesTerms,
+ 'queries' => $queries,
);
return $results;
@@ -573,16 +585,16 @@ class EBSCOResponse
- //ImageQuickView
+ //ImageQuickView UPEI commented out below code.
$includeImageQuickView = array();
- $elements = $this->response->AvailableIncludeImageQuickView->IncludeImageQuickViewOptions->IncludeImageQuickViewOption;
+ /*$elements = $this->response->AvailableIncludeImageQuickView->IncludeImageQuickViewOptions->IncludeImageQuickViewOption;
foreach ($this->response->ViewResultSettings->IncludeImageQuickView as $element) {
$includeImageQuickView[] = array(
'Label' => (string) $element->Label,
'Id' => (string) $element->Id,
'DefaultOn' => (string) $element->DefaultOn,
);
- }
+ }*/
@@ -937,7 +949,7 @@ class EBSCOResponse
// Any group can be added here, but we only use Au (Author)
// Other groups, not present here, won't be transformed to HTML links.
$allowed_searchlink_groups = array('au');
-
+ $allowed_link_groups = array('URL', 'url');
// Map xml tags to the HTML tags
// This is just a small list, the total number of xml tags is far more greater.
$xml_to_html_tags = array(
@@ -1015,6 +1027,14 @@ class EBSCOResponse
$data = str_replace('', '', $data);
}
}
+
+ // Parse link
+ if (!empty($group) && in_array($group, $allowed_link_groups)) {
+ $link_xml = '//';
+ $link_html = ""; //replaced $path with "result.php"
+ $data = preg_replace($link_xml, $link_html, $data);
+ $data = str_replace('', '', $data);
+ }
// Replace the rest of searchLinks with simple spans.
$link_xml = '//';
diff --git a/modules/roblib_search_eds/src/Plugin/Block/RoblibSearchEdsBooks.php b/modules/roblib_search_eds/src/Plugin/Block/RoblibSearchEdsBooks.php
index febfa3e..250f9a7 100644
--- a/modules/roblib_search_eds/src/Plugin/Block/RoblibSearchEdsBooks.php
+++ b/modules/roblib_search_eds/src/Plugin/Block/RoblibSearchEdsBooks.php
@@ -19,9 +19,25 @@ class RoblibSearchEdsBooks extends BlockBase {
* {@inheritdoc}
*/
public function build() {
- return [
+ $host = \Drupal::request()->getSchemeAndHttpHost();
+ $search_url = $host . '/roblib_search/eds/book/';
+ $eds_profile = \Drupal::config('roblib_search_eds.settings')
+ ->get('eds_book_profile');
+ $settings = [
+ 'eds_book_search_url' => $search_url,
+ 'eds_book_profile' => $eds_profile,
+ ];
+ return [
'#theme' => 'roblib_search_eds_books',
- '#query' => $query,
+ 'query' => $query,
+ 'spinner_path' => 'test',
+ '#attached' => [
+ 'library' => [
+ 'roblib_search_eds/eds-book'
+ ],
+ 'drupalSettings' => $settings,
+ ],
];
}
+
}
diff --git a/modules/roblib_search_eds/templates/roblib-search-eds-books.html.twig b/modules/roblib_search_eds/templates/roblib-search-eds-books.html.twig
index 27573e0..fef7dce 100644
--- a/modules/roblib_search_eds/templates/roblib-search-eds-books.html.twig
+++ b/modules/roblib_search_eds/templates/roblib-search-eds-books.html.twig
@@ -1,7 +1,6 @@
-
-
+
diff --git a/modules/roblib_search_eds/templates/theme.inc b/modules/roblib_search_eds/templates/theme.inc
index 97b0b39..00e1596 100644
--- a/modules/roblib_search_eds/templates/theme.inc
+++ b/modules/roblib_search_eds/templates/theme.inc
@@ -8,7 +8,7 @@
// TODO: combine these two functions and call this function from the preprocessor
function roblib_search_eds_preprocess_roblib_search_eds(&$variables) {
- global $base_url;
+ /*global $base_url;
if (!isset($query)) {
if (isset($_GET['roblib_query'])) {
$query = $_GET['roblib_query'];
@@ -28,6 +28,8 @@ function roblib_search_eds_preprocess_roblib_search_eds(&$variables) {
variable_get('roblib_search_eds_book_profile', 'apilite')
)
), array('type' => 'setting'));
+ * */
+
}
