From 5fac0defd27215313e154e882b96561cbf98f1b9 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Fri, 16 Jun 2017 16:06:58 +0300
Subject: [PATCH] Smarter use of MFHD IDs in row identification (#990)
- Fixed Voyager "no items" status and holding grouping to always use MFHD_ID as the group key with a prefix to make sure the MFHD_ID is never mixed with a proper ITEM_ID.
- Also added missing RETURNDATE field placeholder in getHoldingNoItemsSQL()
---
.../VuFind/src/VuFind/ILS/Driver/Voyager.php | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Voyager.php b/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
index 7abed9a1bc9..3ed756f7f5e 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
@@ -349,7 +349,7 @@ class Voyager extends AbstractBase
{
// Expressions
$sqlExpressions = [
- "BIB_ITEM.BIB_ID", "ITEM.ITEM_ID",
+ "BIB_ITEM.BIB_ID", "ITEM.ITEM_ID", "MFHD_MASTER.MFHD_ID",
"ITEM.ON_RESERVE", "ITEM_STATUS_DESC as status",
"NVL(LOCATION.LOCATION_DISPLAY_NAME, " .
"LOCATION.LOCATION_NAME) as location",
@@ -406,7 +406,7 @@ class Voyager extends AbstractBase
// Expressions
$sqlExpressions = [
"BIB_MFHD.BIB_ID",
- "1 as ITEM_ID", "'N' as ON_RESERVE",
+ "null as ITEM_ID", "MFHD_MASTER.MFHD_ID", "'N' as ON_RESERVE",
"'No information available' as status",
"NVL(LOCATION.LOCATION_DISPLAY_NAME, " .
"LOCATION.LOCATION_NAME) as location",
@@ -458,8 +458,10 @@ class Voyager extends AbstractBase
$data = [];
foreach ($sqlRows as $row) {
- if (!isset($data[$row['ITEM_ID']])) {
- $data[$row['ITEM_ID']] = [
+ $rowId = null !== $row['ITEM_ID']
+ ? $row['ITEM_ID'] : 'MFHD' . $row['MFHD_ID'];
+ if (!isset($data[$rowId])) {
+ $data[$rowId] = [
'id' => $row['BIB_ID'],
'status' => $row['STATUS'],
'status_array' => [$row['STATUS']],
@@ -475,10 +477,10 @@ class Voyager extends AbstractBase
];
} else {
$statusFound = in_array(
- $row['STATUS'], $data[$row['ITEM_ID']]['status_array']
+ $row['STATUS'], $data[$rowId]['status_array']
);
if (!$statusFound) {
- $data[$row['ITEM_ID']]['status_array'][] = $row['STATUS'];
+ $data[$rowId]['status_array'][] = $row['STATUS'];
}
}
}
@@ -693,7 +695,7 @@ EOT;
"LOCATION.LOCATION_NAME) as location",
"MFHD_MASTER.DISPLAY_CALL_NO as callnumber",
"BIB_MFHD.BIB_ID", "MFHD_MASTER.MFHD_ID",
- "null as duedate", "0 AS TEMP_LOCATION",
+ "null as duedate", "null as RETURNDATE", "0 AS TEMP_LOCATION",
"0 as PERM_LOCATION",
"0 as ITEM_SEQUENCE_NUMBER",
$this->getItemSortSequenceSQL('LOCATION.LOCATION_ID')
@@ -754,7 +756,8 @@ EOT;
// Concat wrapped rows (MARC data more than 300 bytes gets split
// into multiple rows)
- $rowId = isset($row['ITEM_ID']) ? $row['ITEM_ID'] : $row['MFHD_ID'];
+ $rowId = isset($row['ITEM_ID'])
+ ? $row['ITEM_ID'] : 'MFHD' . $row['MFHD_ID'];
if (isset($data[$rowId][$number])) {
// We don't want to concatenate the same MARC information to
// itself over and over due to a record with multiple status
--
GitLab