From 7a5d48fab0b3ef6d591335ef24b7ab25bf4414e0 Mon Sep 17 00:00:00 2001
From: Eric O <eric@ejdigitalmedia.com>
Date: Sun, 5 Nov 2023 11:17:51 -0500
Subject: [PATCH] Re-add oci8 gem and reference CUL-forked zoom gem

---
 Gemfile      |  6 ++++--
 Gemfile.lock | 14 +++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index e750ffa..3659bda 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,9 @@ gem 'bootsnap', '>= 1.1.0', require: false
 
 # For z3950
 # gem 'zoom', '0.5.0'
-gem 'alexandria-zoom', '0.6.0' # Using this gem instead of regular 'zoom' because this PR has not been merged: https://github.com/bricestacey/ruby-zoom/pull/4
+# gem 'alexandria-zoom', '0.6.0' # Using this gem instead of regular 'zoom' because this PR has not been merged: https://github.com/bricestacey/ruby-zoom/pull/4
+gem 'alexandria-zoom', git: 'https://github.com/cul/cul-zoom.git', branch: 'yaz-config-fallback'
+# gem 'alexandria-zoom', path: '../cul-zoom'
 # For MARC parsing (using fork until PR is merged into main project)
 gem 'marc', '1.0.4'
 # gem 'marc', path: '../ruby-marc'
@@ -44,7 +46,7 @@ gem 'rainbow', '~> 3.0'
 # As of Ruby 3.0, need to explicitly include rexml because it's a bundled gem instead of a default gem
 gem 'rexml', '~> 3.2', '>= 3.2.4'
 # For oracle connections
-#gem 'ruby-oci8', '~> 2.2.7'
+gem 'ruby-oci8', '~> 2.2.7'
 # For HTTP Requests
 gem 'rest-client', '~> 2.0'
 # For cron tasks
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c23c04..8303311 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/cul/cul-zoom.git
+  revision: ef094e238aac2e6f5759240bd78fdf98b2f3f82b
+  branch: yaz-config-fallback
+  specs:
+    alexandria-zoom (0.6.0)
+      pkg-config (~> 1.5.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -70,8 +78,6 @@ GEM
       tzinfo (~> 2.0)
     airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    alexandria-zoom (0.6.0)
-      pkg-config (~> 1.5.1)
     ast (2.4.2)
     bcrypt_pbkdf (1.1.0)
     bindex (0.8.1)
@@ -270,6 +276,7 @@ GEM
       rubocop-performance
       rubocop-rails
       rubocop-rspec
+    ruby-oci8 (2.2.12)
     ruby-progressbar (1.11.0)
     rubyzip (2.3.2)
     sass (3.7.4)
@@ -324,7 +331,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-nulldb-adapter
-  alexandria-zoom (= 0.6.0)
+  alexandria-zoom!
   bootsnap (>= 1.1.0)
   byebug
   capistrano (~> 3.17.0)
@@ -348,6 +355,7 @@ DEPENDENCIES
   rspec (>= 3.11)
   rspec-rails (~> 5.1)
   rubocul (~> 4.0.3)
+  ruby-oci8 (~> 2.2.7)
   rubyzip (>= 2.0)
   sass-rails (~> 5.0)
   sqlite3