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

re-factored the query logic for overdrive to handle titles including punctuation

Browse Source
This commit is contained in:
Lee 2011-04-24 22:43:25 +08:00
parent e3fa34c0a2
commit 441b4e20cc
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/ebooks/metadata/sources/overdrive.py
View File

@ -198,12 +198,16 @@ class OverDrive(Source):
title_tokens = list(self.get_title_tokens(title, title_tokens = list(self.get_title_tokens(title,
strip_joiners=False, strip_subtitle=True)) strip_joiners=False, strip_subtitle=True))
if len(title_tokens) >= len(author_tokens): xref_q = ''
if len(author_tokens) <= 1:
initial_q = ' '.join(title_tokens) initial_q = ' '.join(title_tokens)
xref_q = '+'.join(author_tokens) xref_q = '+'.join(author_tokens)
else: else:
initial_q = ' '.join(author_tokens) initial_q = ' '.join(author_tokens)
xref_q = '+'.join(title_tokens) for token in title_tokens:
if len(xref_q) < len(token):
xref_q = token
#log.error('Initial query is %s'%initial_q) #log.error('Initial query is %s'%initial_q)
#log.error('Cross reference query is %s'%xref_q) #log.error('Cross reference query is %s'%xref_q)
@ -234,10 +238,12 @@ class OverDrive(Source):
if xref_q.find('+') != -1: if xref_q.find('+') != -1:
xref_tokens = xref_q.split('+') xref_tokens = xref_q.split('+')
xref_q = xref_tokens[0] xref_q = xref_tokens[0]
#log.error('xref_q is '+xref_q) for token in xref_tokens:
if len(xref_q) < len(token):
xref_q = token
#log.error('rewrote xref_q, new query is '+xref_q)
else: else:
xref_q = '' xref_q = ''
xref_q = ''
q_xref = q+'SearchResults.svc/GetResults?iDisplayLength=50&sSearch='+xref_q q_xref = q+'SearchResults.svc/GetResults?iDisplayLength=50&sSearch='+xref_q
elif int(m.group('totalrecords')) == 0: elif int(m.group('totalrecords')) == 0:
return '' return ''
@ -264,6 +270,7 @@ class OverDrive(Source):
else: else:
if creators: if creators:
creators = creators.split(', ') creators = creators.split(', ')
# if an exact match in a preferred format occurs # if an exact match in a preferred format occurs
if ((author and creators[0] == author[0]) or (not author and not creators)) and od_title.lower() == title.lower() and int(formatid) in [1, 50, 410, 900] and thumbimage: if ((author and creators[0] == author[0]) or (not author and not creators)) and od_title.lower() == title.lower() and int(formatid) in [1, 50, 410, 900] and thumbimage:
return self.format_results(reserveid, od_title, subtitle, series, publisher, return self.format_results(reserveid, od_title, subtitle, series, publisher,