Bug 82651 - Allow index entries overwrite mode for Sphinx content indexing

git-svn-id: svn://svn.office.custis.ru/3rdparty/viewvc.org/trunk@1588 6955db30-a419-402b-8a0d-67ecbb4d7f56
remotes/github/custis
vfilippov 2012-07-24 10:30:18 +00:00 committed by Vitaliy Filippov
parent a071627c59
commit b5ac9522cc
1 changed files with 5 additions and 2 deletions

View File

@ -410,7 +410,7 @@ class CheckinDatabase:
del props['descid']
del props['type']
sphcur.execute(
'INSERT INTO '+self.sphinx_index+'('+','.join(i for i in props)+') VALUES ('+
'REPLACE INTO '+self.sphinx_index+'('+','.join(i for i in props)+') VALUES ('+
','.join('%s' for i in props)+')',
tuple(props[i] for i in props)
)
@ -421,7 +421,10 @@ class CheckinDatabase:
if (self.enable_snippets and not (mime and
(mime.startswith('text/') or
mime.startswith('application/') and mime.endswith('xml')))):
cursor.execute('INSERT INTO contents SET id=%s, content=%s', (commit_id, content))
cursor.execute(
'INSERT INTO contents SET id=%s, content=%s ON DUPLICATE KEY UPDATE id=id',
(commit_id, content)
)
except Exception, e:
print ("Error adding commit: '"+str(e)+"'\nValues were:\n"+
"\n".join(i+'='+str(props[i]) for i in props))