Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for Sutton and Blackpool #30

Merged
merged 16 commits into from
Feb 11, 2023
Merged

Fixes for Sutton and Blackpool #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1a0722e
West Sussex moved to Arena v7
cpwood Nov 5, 2022
9083df7
Merge branch 'main' of https://github.com/cpwood/catalogues-library
cpwood Nov 5, 2022
72c5e67
Merge pull request #6 from LibrariesHacked/main
cpwood Nov 5, 2022
22705f4
Merge pull request #7 from LibrariesHacked/main
cpwood Dec 10, 2022
412ab07
Haringey move to Enterprise
cpwood Dec 10, 2022
8cbcae2
East Lothian has moved to Spydus
cpwood Dec 21, 2022
b99252c
Merge pull request #8 from LibrariesHacked/main
cpwood Dec 21, 2022
116f3b9
Falkirk has moved to Spydus
cpwood Jan 6, 2023
387940d
Merge pull request #9 from LibrariesHacked/main
cpwood Jan 6, 2023
d2e8333
Merge pull request #10 from LibrariesHacked/main
cpwood Jan 14, 2023
cd4dfd4
North Lincolnshire move to Arena v7
cpwood Jan 14, 2023
c16135b
Southampton has removed individual libraries
cpwood Jan 27, 2023
ec12abb
Merge pull request #11 from LibrariesHacked/main
cpwood Feb 3, 2023
c1589b0
Fix Surrey and Sutton
cpwood Feb 3, 2023
5bdfbd5
Merge pull request #12 from LibrariesHacked/main
cpwood Feb 11, 2023
8ee70d7
Fixes for Sutton and Blackpool
cpwood Feb 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions connectors/blackpool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ console.log('blackpool connector loading...')
*/
exports.getService = (service) => common.getService(service)

getLibrariesInternal = async function (service) {
getBlackpoolLibrariesInternal = async function (service) {
const agent = request.agent()
const response = {
libraries: []
Expand Down Expand Up @@ -44,7 +44,7 @@ getLibrariesInternal = async function (service) {
*/
exports.getLibraries = async function (service) {
const responseLibraries = common.initialiseGetLibrariesResponse(service)
const libs = await getLibrariesInternal(service);
const libs = await getBlackpoolLibrariesInternal(service);

responseLibraries.exception = libs.exception;
responseLibraries.libraries = libs.libraries.map(x => x.name)
Expand Down Expand Up @@ -78,7 +78,7 @@ exports.searchByISBN = async function (isbn, service) {

responseHoldings.id = `${titleId}`

const libs = await getLibrariesInternal(service)
const libs = await getBlackpoolLibrariesInternal(service)

const titleSearch = `https://api.blackpool.gov.uk/live/api/library/standard/lookupTitleInformation/${titleId}`
const titleRequest = await agent.get(titleSearch).timeout(30000)
Expand Down
9 changes: 6 additions & 3 deletions connectors/luci.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ console.log('luci connector loading...')
*/
exports.getService = (service) => common.getService(service)

getLibrariesInternal = async function (service) {
getLuciLibrariesInternal = async function (service) {
const agent = request.agent()
const response = {
libraries: []
Expand Down Expand Up @@ -42,7 +42,7 @@ getLibrariesInternal = async function (service) {
*/
exports.getLibraries = async function (service) {
const responseLibraries = common.initialiseGetLibrariesResponse(service)
const libs = await getLibrariesInternal(service);
const libs = await getLuciLibrariesInternal(service);

responseLibraries.exception = libs.exception;
responseLibraries.libraries = libs.libraries.map(x => x.name)
Expand Down Expand Up @@ -94,7 +94,10 @@ exports.searchByISBN = async function (isbn, service) {
responseHoldings.id = result.recordID;
responseHoldings.url = `${service.Url}manifestations/${result.recordID}`;

resp = await agent.get(`${service.Url}api/record?id=${result.recordID}&source=ILSWS`).timeout(20000);
resp = await agent.get(`${service.Url}api/record?id=${result.recordID}&source=ILSWS`)
.set('solus-app-id', appId)
.timeout(20000);

let libraries = resp.body.data.copies.map(x => x.location.locationName);

// Get unique library values.
Expand Down