pjht/buku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle empty string in search terms

Browse Source
This commit is contained in:
Arun Prakash Jana 2018-09-28 23:37:32 +05:30
parent eec5e461a2
commit 5535e921af
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
buku.py
View File

@ -1173,8 +1173,15 @@ class BukuDb:
if regex: if regex:
q0 = 'SELECT id, url, metadata, tags, desc FROM (SELECT *, ' q0 = 'SELECT id, url, metadata, tags, desc FROM (SELECT *, '
for token in keywords: for token in keywords:
if not token:
continue
q0 += case_statement(q2) + ' + ' q0 += case_statement(q2) + ' + '
qargs += (token, token, token, token,) qargs += (token, token, token, token,)
if not qargs:
return None
q0 = q0[:-3] + ' AS score FROM bookmarks WHERE score > 0 ORDER BY score DESC)' q0 = q0[:-3] + ' AS score FROM bookmarks WHERE score > 0 ORDER BY score DESC)'
elif all_keywords: elif all_keywords:
if len(keywords) == 1 and keywords[0] == 'blank': if len(keywords) == 1 and keywords[0] == 'blank':
@ -1185,6 +1192,9 @@ class BukuDb:
else: else:
q0 = 'SELECT id, url, metadata, tags, desc FROM bookmarks WHERE ' q0 = 'SELECT id, url, metadata, tags, desc FROM bookmarks WHERE '
for token in keywords: for token in keywords:
if not token:
continue
if deep: if deep:
q0 += q1 + 'AND ' q0 += q1 + 'AND '
else: else:
@ -1197,11 +1207,18 @@ class BukuDb:
q0 += q2 + 'AND ' q0 += q2 + 'AND '
qargs += (token, token, token, token,) qargs += (token, token, token, token,)
if not qargs:
return None
q0 = q0[:-4] q0 = q0[:-4]
q0 += 'ORDER BY id ASC' q0 += 'ORDER BY id ASC'
elif not all_keywords: elif not all_keywords:
q0 = 'SELECT id, url, metadata, tags, desc FROM (SELECT *, ' q0 = 'SELECT id, url, metadata, tags, desc FROM (SELECT *, '
for token in keywords: for token in keywords:
if not token:
continue
if deep: if deep:
q0 += case_statement(q1) + ' + ' q0 += case_statement(q1) + ' + '
else: else:
@ -1214,6 +1231,10 @@ class BukuDb:
q0 += case_statement(q2) + ' + ' q0 += case_statement(q2) + ' + '
qargs += (token, token, token, token,) qargs += (token, token, token, token,)
if not qargs:
return None
q0 = q0[:-3] + ' AS score FROM bookmarks WHERE score > 0 ORDER BY score DESC)' q0 = q0[:-3] + ' AS score FROM bookmarks WHERE score > 0 ORDER BY score DESC)'
else: else:
logerr('Invalid search option') logerr('Invalid search option')