Merge branch 'root-v1.17-and-main' into release/dcs/v1.17

unfoldingWord · Nov 2, 2022 · e533a3b · e533a3b
2 parents 3653b13 + 524d508
commit e533a3b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/modules/convert/catalog.go b/modules/convert/catalog.go
@@ -84,15 +84,21 @@ func ToCatalogEntry(dm *models.Door43Metadata, mode perm.AccessMode) *api.Catalo
 
 	var books []string
 	if val, ok := (*dm.Metadata)["books"]; ok {
+		// Marshal/Unmarshal to let Unmarshaliing convert interface{} to []string
 		if byteData, err := json.Marshal(val); err == nil {
-			json.Unmarshal(byteData, &books)
+			if err := json.Unmarshal(byteData, &books); err != nil {
+				log.Error("Unable to Unmarshal books: %v\n", val)
+			}
 		}
 	}
 
 	var alignmentCounts map[string]int64
 	if val, ok := (*dm.Metadata)["alignment_counts"]; ok {
+		// Marshal/Unmarshal to let Unmarshaliing convert interface{} to map[string]int64
 		if byteData, err := json.Marshal(val); err == nil {
-			json.Unmarshal(byteData, &alignmentCounts)
+			if err := json.Unmarshal(byteData, &alignmentCounts); err != nil {
+				log.Error("Unable to Unmarshal alignment_counts: %v\n", val)
+			}
 		}
 	}