From 874858ad83904619c78582d606af2f1371d31b18 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Mon, 13 Aug 2018 21:01:31 -0400
Subject: [PATCH] LP#1772680: sort out seed data and upgrade for new RBdigital
 YAOUS

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       | 53 ++++++++++++++++++++++
 ... XXXX.data.org-setting.ebook-api-rbdigital.sql} |  7 +--
 2 files changed, 54 insertions(+), 6 deletions(-)
 rename Open-ILS/src/sql/Pg/upgrade/{1030.data.org-setting.ebook-api-rbdigital.sql => XXXX.data.org-setting.ebook-api-rbdigital.sql} (79%)

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 8db8c8e762..d25b7d21e9 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -20347,3 +20347,56 @@ VALUES (
         'Include only resources that have been captured in the Ready grid in the Pickup screen',
         'cwst', 'label')
 );
+
+INSERT INTO config.org_unit_setting_type
+    (name, label, description, grp, datatype) 
+VALUES (
+    'ebook_api.rbdigital.base_uri',
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.base_uri',
+        'RBDigital Base URI',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.base_uri',
+        'Base URI for RBDigital API (defaults to https://api.rbdigital.com/v1). Using HTTPS here is strongly encouraged.',
+        'coust',
+        'description'
+    ),
+    'ebook_api',
+    'string'
+),(
+    'ebook_api.rbdigital.library_id',
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.library_id',
+        'RBDigital Library ID',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.library_id',
+        'Identifier assigned to this library by RBDigital',
+        'coust',
+        'description'
+    ),
+    'ebook_api',
+    'string'
+),(
+    'ebook_api.rbdigital.basic_token',
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.basic_token',
+        'RBDigital Basic Token',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.basic_token',
+        'Basic token for client authentication with RBDigital API (supplied by RBDigital)',
+        'coust',
+        'description'
+    ),
+    'ebook_api',
+    'string'
+);
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/1030.data.org-setting.ebook-api-rbdigital.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting.ebook-api-rbdigital.sql
similarity index 79%
rename from Open-ILS/src/sql/Pg/upgrade/1030.data.org-setting.ebook-api-rbdigital.sql
rename to Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting.ebook-api-rbdigital.sql
index fab2dc9306..4e525f38ca 100644
--- a/Open-ILS/src/sql/Pg/upgrade/1030.data.org-setting.ebook-api-rbdigital.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting.ebook-api-rbdigital.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('1030', :eg_version);
+-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
 
 INSERT INTO config.org_unit_setting_type
     (name, label, description, grp, datatype) 
@@ -54,10 +54,5 @@ VALUES (
     'string'
 );
 
-INSERT INTO actor.org_unit_setting (org_unit, name, value) 
-		VALUES  
-        (1, 'ebook_api.rbdigital.base_uri', '"api.rbdigital.com"'),
-        (1, 'ebook_api.rbdigital.basic_token', '"BF8DD41C-B286-4F60-9FF5-F4C5B3E57A11"'),
-        (1, 'ebook_api.rbdigital.library_id', '"3925"');
 COMMIT;
 
-- 
2.11.0