oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Store search query parameters in separate variable

Browse source
This commit is contained in:
shortcutme 2017-11-10 11:15:57 +01:00
parent 991e59d0fc
commit 9b61ae44ab
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/Newsfeed/NewsfeedPlugin.py
View file

@ -123,12 +123,20 @@ class UiWebsocketPlugin(object):
for name, query in feeds.iteritems(): for name, query in feeds.iteritems():
try: try:
db_query = DbQuery(query) db_query = DbQuery(query)
db_query.wheres.append("(%s LIKE ? OR %s LIKE ?)" % (db_query.fields["body"], db_query.fields["title"]))
params = []
# Filters
if search_text:
db_query.wheres.append("(%s LIKE ? OR %s LIKE ?)" % (db_query.fields["body"], db_query.fields["title"]))
search_like = "%" + search_text.replace(" ", "%") + "%"
params.append(search_like)
params.append(search_like)
# Order
db_query.parts["ORDER BY"] = "date_added DESC" db_query.parts["ORDER BY"] = "date_added DESC"
db_query.parts["LIMIT"] = "30" db_query.parts["LIMIT"] = "30"
search_like = "%" + search.replace(" ", "%") + "%" res = site.storage.query(str(db_query), params)
res = site.storage.query(str(db_query), [search_like, search_like])
except Exception, err: except Exception, err:
self.log.error("%s feed query %s error: %s" % (address, name, err)) self.log.error("%s feed query %s error: %s" % (address, name, err))
continue continue