Add a config to get inventaire.io URL
This commit is contained in:
@@ -26,7 +26,7 @@ func PostImportBookHandler(ac appcontext.AppContext) {
|
||||
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
|
||||
return
|
||||
}
|
||||
inventaireEdition, err := inventaire.CallInventaireEdition(request.InventaireID, request.Lang)
|
||||
inventaireEdition, err := inventaire.CallInventaireEdition(ac.Config.InventaireUrl, request.InventaireID, request.Lang)
|
||||
if err != nil {
|
||||
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
|
||||
return
|
||||
|
||||
@@ -52,7 +52,7 @@ func GetSearchBooksHandler(ac appcontext.AppContext) {
|
||||
returnedBooks = dto.BookSearchGet{Count: count, Inventaire: false, Books: books}
|
||||
}
|
||||
if params.Inventaire || len(returnedBooks.Books) == 0 {
|
||||
returnedBooksPtr, err := searchInInventaireAPI(searchterm, limit, offset, params)
|
||||
returnedBooksPtr, err := searchInInventaireAPI(ac.Config.InventaireUrl, searchterm, limit, offset, params)
|
||||
if err != nil {
|
||||
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
|
||||
return
|
||||
@@ -62,7 +62,7 @@ func GetSearchBooksHandler(ac appcontext.AppContext) {
|
||||
ac.C.JSON(http.StatusOK, returnedBooks)
|
||||
}
|
||||
|
||||
func searchInInventaireAPI(searchterm string, limit int, offset int, params dto.BookSearchGetParam) (*dto.BookSearchGet, error) {
|
||||
func searchInInventaireAPI(inventaireUrl string, searchterm string, limit int, offset int, params dto.BookSearchGetParam) (*dto.BookSearchGet, error) {
|
||||
|
||||
isIsbn, err := regexp.Match(`\d{10,13}`, []byte(searchterm))
|
||||
if err != nil {
|
||||
@@ -70,7 +70,7 @@ func searchInInventaireAPI(searchterm string, limit int, offset int, params dto.
|
||||
}
|
||||
|
||||
if isIsbn {
|
||||
queryResult, err := inventaire.CallInventaireFromISBN(searchterm, params.Lang)
|
||||
queryResult, err := inventaire.CallInventaireFromISBN(inventaireUrl, searchterm, params.Lang)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -82,11 +82,11 @@ func searchInInventaireAPI(searchterm string, limit int, offset int, params dto.
|
||||
}
|
||||
return &bookSearchGet, err
|
||||
} else {
|
||||
queryResult, err := inventaire.CallInventaireSearch(searchterm, params.Lang, limit, offset)
|
||||
queryResult, err := inventaire.CallInventaireSearch(inventaireUrl, searchterm, params.Lang, limit, offset)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
bookSearchGet := inventaireBooksToBookSearchGet(queryResult)
|
||||
bookSearchGet := inventaireBooksToBookSearchGet(inventaireUrl, queryResult)
|
||||
return &bookSearchGet, err
|
||||
}
|
||||
}
|
||||
@@ -109,12 +109,12 @@ func inventaireEditionToBookSearchGet(result inventaire.InventaireEditionDetaile
|
||||
return dto.BookSearchGet{Count: 1, Inventaire: true, Books: books}
|
||||
}
|
||||
|
||||
func inventaireBooksToBookSearchGet(results inventaire.InventaireSearchResult) dto.BookSearchGet {
|
||||
func inventaireBooksToBookSearchGet(inventaireUrl string, results inventaire.InventaireSearchResult) dto.BookSearchGet {
|
||||
var books []dto.BookSearchGetBook
|
||||
for _, b := range results.Results {
|
||||
coverPath := ""
|
||||
if b.Image != "" && strings.HasPrefix(b.Image, "/") {
|
||||
coverPath = inventaire.GetBaseInventaireUrl() + b.Image
|
||||
coverPath = inventaireUrl + b.Image
|
||||
}
|
||||
bookSearchGetBook := dto.BookSearchGetBook{
|
||||
ID: 0,
|
||||
|
||||
@@ -28,8 +28,7 @@ func GetInventaireBooks(ac appcontext.AppContext) {
|
||||
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
|
||||
return
|
||||
}
|
||||
|
||||
inventaireEditionResult, err := inventaire.CallInventaireEditionFromWork(workId, params.Lang, limit, offset)
|
||||
inventaireEditionResult, err := inventaire.CallInventaireEditionFromWork(ac.Config.InventaireUrl, workId, params.Lang, limit, offset)
|
||||
if err != nil {
|
||||
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user