amuse.git

diff --git a/libamuse/account.go b/libamuse/account.go
index 9243a63e1cd0b24c55f3f740c334759c6de25ce4..6ea4e11e15ff1a940609293684bd2bff59441021 100644
--- a/libamuse/account.go
+++ b/libamuse/account.go
@@ -86,7 +86,7 @@ 	case datastructure.ItemTypeBook:
 		arg, err = gott.
 			NewResult(gott.Tuple(args)).
 			Bind(getBook).
-			//Bind(getDescription).  // FIXME
+			Bind(getDescription).
 			Bind(getCover).
 			Finish()
 		if err == nil {




diff --git a/libamuse/common.go b/libamuse/common.go
index 6e6825ba171a6d71d4369f8c7188504a95535f78..b7bc494eb58b1fd8eabb24c0034756e29ea0924e 100644
--- a/libamuse/common.go
+++ b/libamuse/common.go
@@ -2,11 +2,11 @@ package libamuse
 
 import (
 	"notabug.org/apiote/amuse/accounts"
+	"notabug.org/apiote/amuse/datastructure"
+	"notabug.org/apiote/amuse/db"
 	"notabug.org/apiote/amuse/front"
 	"notabug.org/apiote/amuse/tmdb"
 	"notabug.org/apiote/amuse/wikidata"
-	"notabug.org/apiote/amuse/datastructure"
-	"notabug.org/apiote/amuse/db"
 
 	"database/sql"
 	"errors"
@@ -78,8 +78,14 @@ func getDescription(args ...interface{}) (interface{}, error) {
 	data := args[0].(*RequestData)
 	result := args[1].(*Result)
 	work := result.result.(datastructure.Work)
-	languages := result.languages
-	description, err := wikidata.GetWorkDescription(work.GetArticle(), languages[0].String(), data.connection)
+	var (
+		description string
+		err         error
+	)
+	if work.GetArticle() != "" {
+		languages := result.languages
+		description, err = wikidata.GetWorkDescription(work.GetArticle(), languages[0].String(), data.connection)
+	}
 	work.SetDescription(description)
 	return gott.Tuple(args), err
 }
@@ -100,7 +106,7 @@ 	list := result.result.(datastructure.List)
 	genres, err := tmdb.GetGenres(result.languages[0].String(), list.GetType())
 	list.SetGenres(genres)
 	result.result = list
-	
+
 	return gott.Tuple(args), err
 }
 
@@ -131,7 +137,6 @@
 	err := db.UpdateCacheItem(item.GetItemType(), data.id, itemInfo)
 	return gott.Tuple(args), err
 }
-
 
 type RequestData struct {
 	id         string