Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Content server: Use new exact matching for greater precision when generating OPDS catalogs. Also fix regression that broke rowsing by Tags on Stanza.

Browse Source
This commit is contained in:
Kovid Goyal 2010-02-15 00:44:01 -07:00
parent 20504d9f17
commit a000a3a2df
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/library/server.py
View File

@ -517,8 +517,8 @@ class LibraryServer(object):
def get_matches(self, location, query): def get_matches(self, location, query):
base = self.db.data.get_matches(location, query) base = self.db.data.get_matches(location, query)
epub = self.db.data.get_matches('format', 'epub') epub = self.db.data.get_matches('format', '=epub')
pdb = self.db.data.get_matches('format', 'pdb') pdb = self.db.data.get_matches('format', '=pdb')
return base.intersection(epub.union(pdb)) return base.intersection(epub.union(pdb))
def stanza_sortby_subcategory(self, updated, sortby, offset): def stanza_sortby_subcategory(self, updated, sortby, offset):
@ -540,15 +540,15 @@ class LibraryServer(object):
what, subtitle = sortby[2:], '' what, subtitle = sortby[2:], ''
if sortby == 'byseries': if sortby == 'byseries':
data = self.db.all_series() data = self.db.all_series()
data = [(x[0], x[1], len(self.get_matches('series', x[1]))) for x in data] data = [(x[0], x[1], len(self.get_matches('series', '='+x[1]))) for x in data]
subtitle = 'Books by series' subtitle = 'Books by series'
elif sortby == 'byauthor': elif sortby == 'byauthor':
data = self.db.all_authors() data = self.db.all_authors()
data = [(x[0], x[1], len(self.get_matches('authors', x[1]))) for x in data] data = [(x[0], x[1], len(self.get_matches('authors', '='+x[1]))) for x in data]
subtitle = 'Books by author' subtitle = 'Books by author'
elif sortby == 'bytag': elif sortby == 'bytag':
data = self.db.all_tags2() data = self.db.all_tags2()
data = [(x[0], x[1], len(self.get_matches('tags', x[1]))) for x in data] data = [(x[0], x[1], len(self.get_matches('tags', '='+x[1]))) for x in data]
subtitle = 'Books by tag' subtitle = 'Books by tag'
fcmp = author_cmp if sortby == 'byauthor' else cmp fcmp = author_cmp if sortby == 'byauthor' else cmp
data = [x for x in data if x[2] > 0] data = [x for x in data if x[2] > 0]