From 31888337f214ca69cb9bdb8ac58078c33dfc1e73 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 17 Feb 2020 16:39:34 -0500
Subject: [PATCH] Refactor CQL escaping to a support method.
---
module/VuFind/src/VuFind/ILS/Driver/Folio.php | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Folio.php b/module/VuFind/src/VuFind/ILS/Driver/Folio.php
index 109af97c85f..dc51a4b56ab 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Folio.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Folio.php
@@ -316,6 +316,18 @@ class Folio extends AbstractAPI implements
throw new \Exception('Unsupported ID type: ' . $idType);
}
+ /**
+ * Escape a string for use in a CQL query.
+ *
+ * @param string $in Input string
+ *
+ * @return string
+ */
+ protected function escapeCql($in)
+ {
+ return str_replace('"', '\"', str_replace('&', '%26', $in));
+ }
+
/**
* Retrieve FOLIO instance using VuFind's chosen bibliographic identifier.
*
@@ -332,8 +344,9 @@ class Folio extends AbstractAPI implements
$idType = $this->getBibIdType();
$idField = $idType === 'instance' ? 'id' : $idType;
- $escaped = str_replace('"', '\"', str_replace('&', '%26', $bibId));
- $query = ['query' => '(' . $idField . '=="' . $escaped . '")'];
+ $query = [
+ 'query' => '(' . $idField . '=="' . $this->escapeCql($bibId) . '")'
+ ];
$response = $this->makeRequest('GET', '/instance-storage/instances', $query);
$instances = json_decode($response->getBody());
if (count($instances->instances) == 0) {
--
GitLab