[open-ils-commits] [GIT] Evergreen ILS branch master updated. c7b42d325a55c588f21da73b841780b72a3deb5a

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  c7b42d325a55c588f21da73b841780b72a3deb5a (commit)
       via  704dd4144617669225bd8b964eb92977b583ddea (commit)
      from  54374902d89b5f11e22ef2c6e10433aa2e94aa51 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c7b42d325a55c588f21da73b841780b72a3deb5a
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Tue Mar 14 15:53:20 2017 -0400

    LP# 1668414: Stamping upgrade script for oneclickdigital base URI
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 7a6cd1a..9770e54 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1030', :eg_version); -- dbs/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1031', :eg_version); -- jeffdavis/kmlussier
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXX.data.org-setting.oneclickdigital-base-uri.sql b/Open-ILS/src/sql/Pg/upgrade/1031.data.org-setting.oneclickdigital-base-uri.sql
similarity index 90%
rename from Open-ILS/src/sql/Pg/upgrade/XXX.data.org-setting.oneclickdigital-base-uri.sql
rename to Open-ILS/src/sql/Pg/upgrade/1031.data.org-setting.oneclickdigital-base-uri.sql
index f063254..da13264 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXX.data.org-setting.oneclickdigital-base-uri.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1031.data.org-setting.oneclickdigital-base-uri.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('XXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1031', :eg_version);
 
 INSERT INTO config.org_unit_setting_type
     (name, label, description, grp, datatype) 

commit 704dd4144617669225bd8b964eb92977b583ddea
Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
Date:   Mon Feb 27 13:40:55 2017 -0800

    LP#1541559: org setting for OneClickdigital API base URI
    
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/OneClickdigital.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/OneClickdigital.pm
index 9880b5f..166b7c9 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/OneClickdigital.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/OneClickdigital.pm
@@ -77,7 +77,8 @@ sub initialize {
     my $self = shift;
     my $ou = $self->{ou};
 
-    $self->{base_uri} = 'https://api.oneclickdigital.us/v1'; # TODO pull from org setting?
+    my $base_uri = 'https://api.oneclickdigital.com/v1';
+    $self->{base_uri} = OpenILS::Application::AppUtils->ou_ancestor_setting_value($ou, 'ebook_api.oneclickdigital.base_uri') || $base_uri;
 
     my $library_id = OpenILS::Application::AppUtils->ou_ancestor_setting_value($ou, 'ebook_api.oneclickdigital.library_id');
     if ($library_id) {
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 ce5e03f..3729f08 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -16804,6 +16804,22 @@ VALUES (
 INSERT INTO config.org_unit_setting_type
     (name, label, description, grp, datatype) 
 VALUES (
+    'ebook_api.oneclickdigital.base_uri',
+    oils_i18n_gettext(
+        'ebook_api.oneclickdigital.base_uri',
+        'OneClickdigital Base URI',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ebook_api.oneclickdigital.base_uri',
+        'Base URI for OneClickdigital API (defaults to https://api.oneclickdigital.com/v1). Using HTTPS here is strongly encouraged.',
+        'coust',
+        'description'
+    ),
+    'ebook_api',
+    'string'
+),(
     'ebook_api.oneclickdigital.library_id',
     oils_i18n_gettext(
         'ebook_api.oneclickdigital.library_id',
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXX.data.org-setting.oneclickdigital-base-uri.sql b/Open-ILS/src/sql/Pg/upgrade/XXX.data.org-setting.oneclickdigital-base-uri.sql
new file mode 100644
index 0000000..f063254
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXX.data.org-setting.oneclickdigital-base-uri.sql
@@ -0,0 +1,26 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXX', :eg_version);
+
+INSERT INTO config.org_unit_setting_type
+    (name, label, description, grp, datatype) 
+VALUES (
+    'ebook_api.oneclickdigital.base_uri',
+    oils_i18n_gettext(
+        'ebook_api.oneclickdigital.base_uri',
+        'OneClickdigital Base URI',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ebook_api.oneclickdigital.base_uri',
+        'Base URI for OneClickdigital API (defaults to https://api.oneclickdigital.com/v1). Using HTTPS here is strongly encouraged.',
+        'coust',
+        'description'
+    ),
+    'ebook_api',
+    'string'
+);
+
+COMMIT;
+

-----------------------------------------------------------------------

Summary of changes:
 .../Application/EbookAPI/OneClickdigital.pm        |    3 +-
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |   16 ++++++++++++
 ...1.data.org-setting.oneclickdigital-base-uri.sql |   26 ++++++++++++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/1031.data.org-setting.oneclickdigital-base-uri.sql


hooks/post-receive
-- 
Evergreen ILS