diff --git a/composer.json b/composer.json index 33aa1eae6b3a278c4f5332c780e970e234c5e227..b56fda0d72e44203d017f351e1ffe2d72f4d2e1d 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "vufind-org/vufindcode": "1.0.3", "vufind-org/vufindharvest": "2.1.0", "vufind-org/vufindhttp": "2.1.0", + "yajra/laravel-pdo-via-oci8": "1.1.1", "zendframework/zendframework": "2.4.6", "zendframework/zendrest": "2.0.2", "zendframework/zendservice-amazon": "2.0.4", diff --git a/module/VuFind/src/VuFind/ILS/Driver/Voyager.php b/module/VuFind/src/VuFind/ILS/Driver/Voyager.php index e79638eea6cc5feb380ad8c29f444b6e42b68021..4d786a048df21739590b8eeb9aaa3723757d04b8 100644 --- a/module/VuFind/src/VuFind/ILS/Driver/Voyager.php +++ b/module/VuFind/src/VuFind/ILS/Driver/Voyager.php @@ -5,7 +5,7 @@ * PHP version 5 * * Copyright (C) Villanova University 2007. - * Copyright (C) The National Library of Finland 2014. + * Copyright (C) The National Library of Finland 2014-2016. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -29,7 +29,7 @@ * @link https://vufind.org/wiki/development:plugins:ils_drivers Wiki */ namespace VuFind\ILS\Driver; -use File_MARC, PDO, PDOException, +use File_MARC, Yajra\Pdo\Oci8, PDO, PDOException, VuFind\Exception\Date as DateException, VuFind\Exception\ILS as ILSException, VuFind\I18n\Translator\TranslatorAwareInterface, @@ -57,7 +57,7 @@ class Voyager extends AbstractBase /** * Database connection * - * @var PDO + * @var Oci8 */ protected $db; @@ -157,8 +157,8 @@ class Voyager extends AbstractBase ')' . ')'; try { - $this->db = new PDO( - "oci:dbname=$tns", + $this->db = new Oci8( + "oci:dbname=$tns;charset=US_ASCII", $this->config['Catalog']['user'], $this->config['Catalog']['password'] );