From 41502a6fe528e38716b6f9f190870df9cd427f14 Mon Sep 17 00:00:00 2001
From: Theodoros Theodoropoulos <sbujam@users.noreply.github.com>
Date: Wed, 10 Oct 2018 15:56:23 +0300
Subject: [PATCH] Fixes issues with findReserves in KohaILSDI driver (#1242)
---
.../VuFind/src/VuFind/ILS/Driver/KohaILSDI.php | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php b/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
index ccdba432e7a..2f3218d8c7b 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
@@ -1848,12 +1848,12 @@ class KohaILSDI extends \VuFind\ILS\Driver\AbstractBase implements
$bindParams[':dept'] = $dept;
}
$reserveWhere = empty($reserveWhere) ?
- "" : "where (" . implode(' AND ', $reserveWhere) . ")";
+ "" : "HAVING (" . implode(' AND ', $reserveWhere) . ")";
$sql = "SELECT biblionumber AS `BIB_ID`,
- courses.course_id AS COURSE_ID,
- course_instructors.borrowernumber as INSTRUCTOR_ID,
- courses.department AS DEPARTMENT_ID
+ courses.course_id AS `COURSE_ID`,
+ course_instructors.borrowernumber as `INSTRUCTOR_ID`,
+ courses.department AS `DEPARTMENT_ID`
FROM courses
INNER JOIN `authorised_values`
ON courses.department = `authorised_values`.`authorised_value`
@@ -1862,11 +1862,14 @@ class KohaILSDI extends \VuFind\ILS\Driver\AbstractBase implements
INNER JOIN `items` USING (itemnumber)
INNER JOIN `course_instructors` USING (course_id)
INNER JOIN `borrowers` USING (borrowernumber)
- WHERE courses.enabled = 'yes'" . $reserveWhere;
+ WHERE courses.enabled = 'yes' " . $reserveWhere;
try {
- $sqlStmt = $this->db->prepare($sql, $bindParams);
- $sqlStmt->execute();
+ if (!$this->db) {
+ $this->initDb();
+ }
+ $sqlStmt = $this->db->prepare($sql);
+ $sqlStmt->execute($bindParams);
$result = [];
foreach ($sqlStmt->fetchAll() as $rowItem) {
$result[] = $rowItem;
--
GitLab