update error handling

adrianojn · Oct 15, 2015 · bd168d6 · bd168d6
1 parent 4ee318b
commit bd168d6
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/rulings.go b/rulings.go
@@ -33,17 +33,17 @@ func getRulings() {
 		if i%100 == 0 {
 			fmt.Println(i, "of", size)
 		}
-		id, text := getRuling(page)
+		id, text, err := getRuling(page)
 
-		if (id != "") && (text != "") {
+		if err == nil {
 			result[id] = stripRulingText(text)
 		}
 	}
 
 	save(result, *ruling)
 }
 
-func getRuling(page string) (cardId, cardText string) {
+func getRuling(page string) (cardId, cardText string, err error) {
 	resp, err := http.PostForm("http://yugioh.wikia.com/api.php",
 		url.Values{
 			"action":            {"query"},
@@ -55,7 +55,7 @@ func getRuling(page string) (cardId, cardText string) {
 		})
 	if err != nil {
 		fmt.Println(page, err)
-		return
+		return "", "", err
 	}
 	var data struct {
 		Query struct {
@@ -70,12 +70,12 @@ func getRuling(page string) (cardId, cardText string) {
 	err = json.NewDecoder(resp.Body).Decode(&data)
 	if err != nil {
 		fmt.Println(page, err)
-		return
+		return "", "", err
 	}
 
 	for _, p := range data.Query.Pages {
 		if p.Revisions == nil {
-			return
+			return "", "", err
 		}
 		if p.Ns == 102 {
 			cardText = p.Revisions[0].Text
@@ -84,7 +84,7 @@ func getRuling(page string) (cardId, cardText string) {
 			cardId = extractNumber(p.Revisions[0].Text)
 		}
 	}
-	return
+	return cardText, cardId, nil
 }
 
 var removalList = []*regexp.Regexp{