Fjernet duplikatkode.
This commit is contained in:
parent
1a9bf1a915
commit
ae8dd0ba02
|
@ -31,28 +31,6 @@ def get_in_order(list, id):
|
||||||
pass
|
pass
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def search_book_cmd(search_strings, search_description=False):
|
|
||||||
books = search_book(search_strings, search_description)
|
|
||||||
format = '%-13s %-10s %-40s %-30s'
|
|
||||||
for book in books:
|
|
||||||
b_id = book.getid() or ''
|
|
||||||
title = cut_str(book.title, 40)
|
|
||||||
authors = map(lambda p: p.first_name+' '+p.last_name,
|
|
||||||
book.get_authors())
|
|
||||||
authors_str = cut_str(', '.join(authors), 30)
|
|
||||||
print format % (book.isbn, b_id, title, authors_str)
|
|
||||||
|
|
||||||
def search_book(search_strings, search_description=False):
|
|
||||||
basic_query = Book.objects.select_related('persons__person','id','alt_titles')
|
|
||||||
for word in search_strings:
|
|
||||||
basic_query=basic_query.filter(Q(title__icontains=word) |
|
|
||||||
Q(subtitle__icontains=word) |
|
|
||||||
Q(alt_titles__alt_title__icontains=word) |
|
|
||||||
Q(id__id__icontains=word) |
|
|
||||||
Q(persons__person__first_name__icontains=word) |
|
|
||||||
Q(persons__person__last_name__icontains=word))
|
|
||||||
return remove_duplicates(basic_query.all())
|
|
||||||
|
|
||||||
def remove_duplicates(list):
|
def remove_duplicates(list):
|
||||||
d = {}
|
d = {}
|
||||||
for i in list:
|
for i in list:
|
||||||
|
|
Reference in New Issue