Merge lp:~seif/zeitgeist/fix-673922 into lp:zeitgeist/0.1

[Seif Lotfy]

I removed rows from get_events since it is not being used at all
this fixes bug #673922

[lp:~seif/zeitgeist/fix-673922]

1633. By Seif Lotfy on 2010-11-12

updated to trunk

[Markus Korn (thekorn)]

Just for a reference, the last usage of the 'row' argument was removed with https://code.launchpad.net/~zeitgeist/zeitgeist/small-find-events-optimization/+merge/34065

[lp:~seif/zeitgeist/fix-673922]

1634. By Seif Lotfy on 2010-11-12

make ids argument mandatory and chck if len(ids)== 0 instead of None

1635. By Seif Lotfy on 2010-11-12

revert len(ids)== 0 to ids == None

[Markus Korn (thekorn)]

looks good.

review: Approve

=== modified file '_zeitgeist/engine/main.py'
--- _zeitgeist/engine/main.py	2010-11-12 11:38:31 +0000
+++ _zeitgeist/engine/main.py	2010-11-12 16:59:53 +0000
@@ -155,23 +155,20 @@
 				getattr(self, "_" + field).value(row["subj_" + field]))
 		return subject
 	
-	def get_events(self, ids=None, rows=None, sender=None):
+	def get_events(self, ids, sender=None):
 		"""
 		Look up a list of events.
 		"""
 		
 		t = time.time()
 		
-		if not ids and not rows:
+		if not ids:
 			return []
 		
-		if ids:
-			rows = self._cursor.execute("""
-				SELECT * FROM event_view
-				WHERE id IN (%s)
-				""" % ",".join("%d" % id for id in ids)).fetchall()
-		else:
-			ids = (row[0] for row in rows)
+		rows = self._cursor.execute("""
+			SELECT * FROM event_view
+			WHERE id IN (%s)
+			""" % ",".join("%d" % id for id in ids)).fetchall()
 		
 		id_hash = defaultdict(list)
 		for n, id in enumerate(ids):