public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing a broken query in autocomplete that caused full table scans. Now optimized and refactored.

Browse source
This commit is contained in:
Samuel Clay 2010-12-23 16:19:21 -05:00
parent 7ce16b9cc7
commit 3a17bc976c
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/rss_feeds/views.py
View file

@ -2,6 +2,7 @@ import datetime
from utils import log as logging
from django.shortcuts import get_object_or_404
from django.http import HttpResponseForbidden
from django.db import connection
# from django.db import IntegrityError
from apps.rss_feeds.models import Feed, merge_feeds
from apps.reader.models import UserSubscription
@ -11,14 +12,17 @@ from utils.feed_functions import relative_timeuntil, relative_timesince
@json.json_view
def feed_autocomplete(request):
connection.queries = []
query = request.GET['term']
feeds = Feed.objects.filter(feed_address__icontains=query)
if not feeds:
feeds = Feed.objects.filter(feed_link__icontains=query)
if not feeds:
feeds = Feed.objects.filter(feed_title__icontains=query)
feeds = []
for field in ['feed_address', 'feed_link', 'feed_title']:
if not feeds:
feeds = Feed.objects.filter(**{'%s__icontains' % field: query}).only(
'feed_title',
'feed_address',
'num_subscribers'
).order_by('-num_subscribers')[:5]
feeds = feeds.order_by('-num_subscribers')[:5]
feeds = [{
'value': feed.feed_address,
'label': feed.feed_title,

2
media/css/reader.css
View file

@ -2642,7 +2642,7 @@ a.NB-splash-link:hover {
color: #3F3D6E;
font-size: 10px;
font-weight: normal;
height: 12px;
height: 11px;
padding: 4px 0 4px 4px;
overflow: hidden;
}