Merge branch 'master' into 'master'HEADmaster

Convert strings to ints

See merge request wjoe/bladictionary2!2

1 files changed, 4 insertions, 5 deletions

diff --git a/bladictionary.py b/bladictionary.py
index 9fe1827..6b33c08 100755
--- a/bladictionary.py
+++ b/bladictionary.py
@@ -214,11 +214,10 @@ def parse_oed(word):
 	definition = ""
 	word_type = ""
 	for part in line.split(" ")[word_len:]:
-
 		#If we've reached a word type, add the current data to the list
 		if part in types.keys():
 			#Don't add empty definitions
-			if id > 0 and definition != " " and definition:
+			if int(id) > 0 and definition and definition != " ":
 				item = Definition(word, id, "oed", word_type, definition, [], [], [])
 				items.append(item)
 				definition = ""
@@ -348,7 +347,7 @@ def main():
 
 	if word_dict == "oed":
 		items = parse_oed(word)
-	elif word_dict == "wn":
+	elif word_dict == "wn" or word_dict == "wordnet":
 		xml = get_xml(word, word_dict)
 
 		if xml is None:
@@ -410,7 +409,7 @@ def main():
 		if all_types:
 			found_type = False
 			cur_id = type_id
-			if item.id < page_num:
+			if int(item.id) < page_num:
 				if item.id != 0:
 					continue
 				elif item.id == 0 and page_num > 1:
@@ -438,7 +437,7 @@ def main():
 			else:
 				# Ignore anything after a line break as this breaks output
 				item_definition = item.definition.split("\n")[0]
-				if item.id > 0:
+				if int(item.id) > 0:
 					definition = item.word_type + " " + str(item.id) + ": " + item_definition
 				else:
 					definition = item.word_type + ": " + item_definition