bss/dr.botzo
1
0
Fork 0
Code Issues 3 Pull Requests Releases 2 Wiki Activity

Markov: unicode fixes and improvements

Browse Source
This commit is contained in:
Brian S. Stephan 2012-07-15 01:11:21 -05:00
parent 8f5b6d96c2
commit 2b0b7abd58
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/Markov.py
View File

@ -406,7 +406,7 @@ class Markov(Module):
if gen_words[-1] == self.stop: if gen_words[-1] == self.stop:
gen_words = gen_words[:-1] gen_words = gen_words[:-1]
return ' '.join(gen_words).encode('utf-8', 'ignore') return ' '.join(gen_words)
def _retrieve_chains_for_key(self, k1, k2, context_id): def _retrieve_chains_for_key(self, k1, k2, context_id):
"""Get the value(s) for a given key (a pair of strings).""" """Get the value(s) for a given key (a pair of strings)."""
@ -425,11 +425,13 @@ class Markov(Module):
else: else:
query = ('SELECT v FROM markov_chain WHERE k1 = ? AND k2 = ? AND ' query = ('SELECT v FROM markov_chain WHERE k1 = ? AND k2 = ? AND '
'(context_id = ?)') '(context_id = ?)')
cursor = db.execute(query, (k1,k2,context_id)) cursor = db.execute(query, (k1.decode('utf-8', 'replace'),
k2.decode('utf-8', 'replace'),
context_id))
results = cursor.fetchall() results = cursor.fetchall()
for result in results: for result in results:
values.append(result['v']) values.append(result['v'].encode('utf-8', 'replace'))
db.close() db.close()
return values return values
@ -445,11 +447,11 @@ class Markov(Module):
try: try:
db = self.get_db() db = self.get_db()
query = 'SELECT k2 FROM markov_chain WHERE v = ? AND (context_id = ?)' query = 'SELECT k2 FROM markov_chain WHERE v = ? AND (context_id = ?)'
cursor = db.execute(query, (v,context_id)) cursor = db.execute(query, (v.decode('utf-8', 'replace'), context_id))
results = cursor.fetchall() results = cursor.fetchall()
for result in results: for result in results:
values.append(result['k2']) values.append(result['k2'].encode('utf-8', 'replace'))
db.close() db.close()
return values return values