diff --git a/python/search.py b/python/search.py index 49a2cc2..307323f 100644 --- a/python/search.py +++ b/python/search.py @@ -8,7 +8,7 @@ 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: - print book.to_string(True) + print book.to_string(False) #b_id = book.getid() or '' #title = cut_str(book.title, 40, '*') #authors = map(lambda p: p.first_name+' '+p.last_name, diff --git a/python/web/library/models.py b/python/web/library/models.py index be0ece3..50f68b8 100644 --- a/python/web/library/models.py +++ b/python/web/library/models.py @@ -160,14 +160,25 @@ class Person(models.Model): def to_string(self, commit=False): if commit: #generate commit-string - print '' + print self.to_dict() else: - scratch = 'Name'.ljust(15, ' ') + ':' - scratch += ' '.join((first_name,last_name)) + format = '%-10s: %50s \n' + scratch = format % ('Name', ' '.join((self.first_name, self.last_name))) + scratch += format % ('ID', self.id) + + books = ', '.join(map(lambda x: x.book.title, self.books.all())) + scratch += format % ('Books', books) return scratch - + def to_dict(self): + dict = {} + dict['action'] = 'edit-person' + dict['id'] = self.id + dict['first_name'] = self.first_name + dict['last_name'] = self.last_name + + return dict def __unicode__(self): diff --git a/python/worblehat.py b/python/worblehat.py index 7884fed..597573d 100755 --- a/python/worblehat.py +++ b/python/worblehat.py @@ -39,12 +39,13 @@ def remove_duplicates(list): def search_person_cmd(search_strings, search_description=False): people = search_person(search_strings, search_description) - format = '%-20s %-10s %-70s' + #format = '%-20s %-10s %-70s' for person in people: - name = cut_str(person.first_name+' '+person.last_name, 20) - p_id = cut_str(person.id, 10) - books = cut_str(', '.join(map(lambda x: x.book.title, person.books.all())), 70) - print format % (name,p_id,books) + print person.to_string() + # name = cut_str(person.first_name+' '+person.last_name, 20) + # p_id = cut_str(person.id, 10) + # books = cut_str(', '.join(map(lambda x: x.book.title, person.books.all())), 70) + # print format % (name,p_id,books) def search_person(search_strings, search_description=False): basic_query=Person.objects.select_related('books__book__alt_titles')