Merge branch 'develop'

Kenneth Chan · Kenneth Chan · commit 554d9578df75 · 2013-08-07T15:09:57.000+08:00
diff --git a/examples/itemrec/movies/appdata.py b/examples/itemrec/movies/appdata.py
@@ -62,7 +62,7 @@ def __init_users(self):
 		print "[Info] Initializing users..."
 		f = open(self._users_file, 'r')
 		for line in f:
-			data = line.split(USERS_FILE_DELIMITER)
+			data = line.rstrip('\r\n').split(USERS_FILE_DELIMITER)
 			self.add_user(User(data[0]))
 		f.close()
 		print "[Info] %s users were initialized." % len(self._users)
@@ -74,7 +74,7 @@ def __init_items(self):
 		print "[Info] Initializing items..."
 		f = open(self._items_file, 'r')
 		for line in f:
-			data = line.split(ITEMS_FILE_DELIMITER)
+			data = line.rstrip('\r\n').split(ITEMS_FILE_DELIMITER)
 			self.add_item(Item(data[0], data[1]))
 		f.close()
 		print "[Info] %s items were initialized." % len(self._items)
@@ -86,7 +86,7 @@ def __init_rate_actions(self):
 		print "[Info] Initializing rate actions..."
 		f = open(self._rate_actions_file, 'r')
 		for line in f:
-			data = line.split(RATE_ACTIONS_DELIMITER)
+			data = line.rstrip('\r\n').split(RATE_ACTIONS_DELIMITER)
 			t = datetime.datetime.utcfromtimestamp(int(data[3])).isoformat()
 			self.add_rate_action(RateAction(data[0], data[1], data[2], t))
 		f.close()
diff --git a/examples/itemrec/movies/movie_rec_app.py b/examples/itemrec/movies/movie_rec_app.py
@@ -92,7 +92,7 @@ def display_user_task(self, prev_state):
 				print "\n[Info] Go back to previous menu..."
 				break
 			else:
-				print "[Error] invalid user id. Go back to previous menu..."
+				print "[Error] invalid user id %s. Go back to previous menu..." % choice
 				break
 	
 	def display_items(self, iids, all_info=False):
