Merge lp:~kamstrup/zeitgeist/payload-fix into lp:zeitgeist/0.1

[Mikkel Kamstrup Erlandsen]

See commit log

=== modified file '_zeitgeist/engine/main.py'
--- _zeitgeist/engine/main.py	2010-04-08 20:10:04 +0000
+++ _zeitgeist/engine/main.py	2010-04-12 22:29:20 +0000
@@ -400,17 +400,7 @@
 		
 		id = self.next_event_id()
 		
-		if event.payload:
-			# TODO: Rigth now payloads are not unique and every event has its
-			# own one. We could optimize this to store those which are repeated
-			# for different events only once, especially considering that
-			# events cannot be modified once they've been inserted.
-			payload_id = self._cursor.execute(
-				"INSERT INTO payload (value) VALUES (?)", (event.payload,))
-			payload_id = self._cursor.lastrowid
-		else:
-			# Don't use None here, as that'd be inserted literally into the DB
-			payload_id = ""
+		payload_id = self._store_payload (event)
 		
 		# Make sure all URIs are inserted
 		_origin = [subject.origin for subject in event.subjects if subject.origin]
@@ -480,6 +470,24 @@
 		
 		return id
 	
+	def _store_payload (self, event):
+		# TODO: Rigth now payloads are not unique and every event has its
+		# own one. We could optimize this to store those which are repeated
+		# for different events only once, especially considering that
+		# events cannot be modified once they've been inserted.
+		if event.payload:
+			# TODO: For Python >= 2.6 bytearray() is much more efficient
+			# than this hack...
+			# We need binary encoding that sqlite3 will accept, for
+			# some reason sqlite3 can not use array.array('B', event.payload)
+			payload = sqlite3.Binary("".join(map(str, event.payload)))
+			self._cursor.execute(
+				"INSERT INTO payload (value) VALUES (?)", (payload,))
+			return self._cursor.lastrowid
+		else:
+			# Don't use None here, as that'd be inserted literally into the DB
+			return ""
+
 	def delete_events (self, ids):
 		# Extract min and max timestamps for deleted events
 		self._cursor.execute("""
 
=== modified file '_zeitgeist/engine/sql.py'
--- _zeitgeist/engine/sql.py	2010-04-04 14:56:16 +0000
+++ _zeitgeist/engine/sql.py	2010-04-12 22:29:20 +0000
@@ -252,7 +252,8 @@
 				event.interpretation,
 				event.manifestation,
 				event.actor,
-				event.payload,
+				(SELECT value FROM payload WHERE payload.id=event.id)
+					as payload,
 				(SELECT value FROM uri WHERE uri.id=event.subj_id)
 					AS subj_uri,
 				event.subj_interpretation,
 
=== modified file 'test/engine-test.py'
--- test/engine-test.py	2010-04-08 20:27:43 +0000
+++ test/engine-test.py	2010-04-12 22:29:20 +0000
@@ -581,7 +581,10 @@
 		subject.uri = "http://www.google.com"
 		subject.interpretation = Interpretation.UNKNOWN
 		subject.manifestation = Manifestation.WEB_HISTORY
+		subject.text = None
 		subject.mimetype = "text/html"
+		subject.origin = None
+		subject.storage = None
 		ev.subjects.append(subject)
 
 		sampleString = """