From b1cb46a3b06ad28c8b8dbccbd4b75a0966e505a5 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 16 Aug 2019 09:10:11 -0400
Subject: [PATCH] Clarify Content Cafe code/comments.
---
config/vufind/config.ini | 10 +++++-----
.../VuFind/src/VuFind/Content/Covers/ContentCafe.php | 3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/config/vufind/config.ini b/config/vufind/config.ini
index 9b6660da687..5bc3467b7ba 100644
--- a/config/vufind/config.ini
+++ b/config/vufind/config.ini
@@ -991,12 +991,12 @@ timeout = 10
url = "https://api.booksite.com"
;key = "Key"
-; You can change the base Content Cafe URL used by the content services here. Most
-; users will not need to change this setting. You also need to set your password,
-; "pw". Note that Content Cafe is a subscription service from Baker & Taylor.
+; Content Cafe is a subscription service from Baker & Taylor. If you are using this
+; service (see the [Content] section above for details), you MUST uncomment and set
+; the password (pw) setting. You may also change the API base URL (url) if needed.
[Contentcafe]
-url = "http://contentcafe2.btol.com"
-pw = "Password"
+;url = "http://contentcafe2.btol.com"
+;pw = "Password"
; Summon is optional; this section is used for your API credentials. apiId is the
; short, human-readable identifier for your Summon account; apiKey is the longer,
diff --git a/module/VuFind/src/VuFind/Content/Covers/ContentCafe.php b/module/VuFind/src/VuFind/Content/Covers/ContentCafe.php
index 276e492013f..8af568a0031 100644
--- a/module/VuFind/src/VuFind/Content/Covers/ContentCafe.php
+++ b/module/VuFind/src/VuFind/Content/Covers/ContentCafe.php
@@ -60,8 +60,7 @@ class ContentCafe extends \VuFind\Content\AbstractCover
public function __construct(\Zend\Config\Config $config)
{
$this->password = $config->pw;
- $this->baseURL = isset($config->url)
- ? $config->url : 'http://contentcafe2.btol.com';
+ $this->baseURL = $config->url ?? 'http://contentcafe2.btol.com';
$this->supportsUpc = $this->supportsIsbn = $this->cacheAllowed = true;
}
--
GitLab