From 704dd4144617669225bd8b964eb92977b583ddea Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Mon, 27 Feb 2017 13:40:55 -0800 Subject: [PATCH] LP#1541559: org setting for OneClickdigital API base URI Signed-off-by: Jeff Davis Signed-off-by: Kathy Lussier --- .../Application/EbookAPI/OneClickdigital.pm | 3 ++- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 16 ++++++++++++ ...a.org-setting.oneclickdigital-base-uri.sql | 26 +++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXX.data.org-setting.oneclickdigital-base-uri.sql 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 9880b5f480..166b7c9f7d 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 ce5e03f1ef..3729f08839 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 0000000000..f063254e4e --- /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; + -- 2.43.2