amuse.git

commit d0cabd8e0ae4e80e3c3768aee0919d091db8bf25

Author: Adam <git@apiote.tk>

fix getting images from Inventaire

 inventaire/book.go | 22 +++++++++++++++++-----


diff --git a/inventaire/book.go b/inventaire/book.go
index 666780db667adaf25842156e2c4b1294a2285b31..3f832f4a005b52f7769b743dd93a2c2d05a61ca2 100644
--- a/inventaire/book.go
+++ b/inventaire/book.go
@@ -17,8 +17,14 @@ 	Entities map[string]struct {
 		Labels       map[string]string
 		Claims       map[string][]string
 		Descriptions map[string]string
-		Image        map[string]string
-		Sitelinks    map[string]string
+		Image        struct {
+			Url     string
+			Credits struct {
+				Text string
+				Url  string
+			}
+		}
+		Sitelinks map[string]string
 	}
 }
 
@@ -88,7 +94,9 @@ 		//Tee(cache.saveCacheEntry).
 		Bind(unmarshalBook).
 		Finish()
 
-	*book = *result.(gott.Tuple)[1].(*network.Result).Result.(*datastructure.Book)
+	if err == nil {
+		*book = *result.(gott.Tuple)[1].(*network.Result).Result.(*datastructure.Book)
+	}
 	return gott.Tuple(args), err
 }
 
@@ -132,7 +140,9 @@ 		//Tee(cache.saveCacheEntry).
 		Bind(unmarshalAuthors).
 		Finish()
 
-	book.Authors = author.(gott.Tuple)[1].(*network.Result).Result.([]string)
+	if err == nil {
+		book.Authors = author.(gott.Tuple)[1].(*network.Result).Result.([]string)
+	}
 	return gott.Tuple(args), err
 }
 
@@ -174,7 +184,9 @@ 		//Tee(cache.saveCacheEntry).
 		Bind(unmarshalEdition).
 		Finish()
 
-	book.Cover = edition.(gott.Tuple)[1].(*network.Result).Result.(string)
+	if err == nil {
+		book.Cover = edition.(gott.Tuple)[1].(*network.Result).Result.(string)
+	}
 	return gott.Tuple(args), err
 }