From 1ca87e9c79d23d5a8a33dc8996ac4eb75e09ab15 Mon Sep 17 00:00:00 2001
From: Rui Francisco <blackmolly@gmail.com>
Date: Mon, 4 Jan 2016 12:58:56 -0500
Subject: [PATCH] Add EDS basic configuration & bug fixes - Added to config.ini
and combined.ini the basic EDS configuration - Fix problem in query builder
to support quotations
---
config/vufind/combined.ini | 7 +++++++
config/vufind/config.ini | 2 ++
.../src/VuFindSearch/Backend/EDS/QueryBuilder.php | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/config/vufind/combined.ini b/config/vufind/combined.ini
index f7eb9458859..020af459141 100644
--- a/config/vufind/combined.ini
+++ b/config/vufind/combined.ini
@@ -64,6 +64,13 @@ more_link = "More Summon results"
ajax = true
;limit = 10
+[EDS]
+label = EDS
+sublabel = "full-text articles, e-books, electronic subscription resources"
+more_link = "More EDS results"
+ajax = true
+; limit = 10
+
; This section controls recommendation modules displayed in combination with
; combined search results. Right now, only the top and bottom areas are
; supported. See searches.ini for a list of available modules. Not all modules
diff --git a/config/vufind/config.ini b/config/vufind/config.ini
index 406d90ff98f..cf1bdaea653 100644
--- a/config/vufind/config.ini
+++ b/config/vufind/config.ini
@@ -1251,6 +1251,7 @@ treeSearchLimit = 100
;Solr = Catalog
;Summon = Summon
;WorldCat = WorldCat
+;EDS = "EBSCO Discovery Service"
; Uncomment portions of this section to label searches from particular sources in the
; search history display. Keys are search backend names, values are labels for use in
@@ -1260,6 +1261,7 @@ treeSearchLimit = 100
;Summon = Summon
;WorldCat = WorldCat
;SolrWeb = "Library Website"
+;EDS = "EBSCO Discovery Service"
; Activate Captcha validation on select forms
; VuFind will use reCaptcha validation to prevent bots from using certain actions of
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php
index 02e79cf0dae..ab36c2c1849 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php
@@ -78,7 +78,7 @@ class QueryBuilder
*/
protected function queryToEdsQuery(Query $query, $operator = 'AND')
{
- $expression = str_replace('"', '', $query->getString());
+ $expression = $query->getString();
$expression = SearchRequestModel::escapeSpecialCharacters($expression);
$fieldCode = ($query->getHandler() == 'AllFields')
? '' : $query->getHandler(); //fieldcode
--
GitLab