From 76fcb16adf77b7ac70c2d0634f800ed6311c55ff Mon Sep 17 00:00:00 2001 From: tirilane Date: Sat, 5 Mar 2011 21:51:29 +0000 Subject: [PATCH] =?UTF-8?q?Google-interfjaset=20fungerer,=20og=20printer?= =?UTF-8?q?=20action-lista=20til=20standard=20out.=20Dette=20b=C3=B8r=20sk?= =?UTF-8?q?rives=20til=20fil=20en=20gang=20i=20framtida.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- python/google_interface.py | 112 ++++++++++++++++++++++++------------- 1 file changed, 73 insertions(+), 39 deletions(-) diff --git a/python/google_interface.py b/python/google_interface.py index 994ec0f..3616e6f 100644 --- a/python/google_interface.py +++ b/python/google_interface.py @@ -10,11 +10,18 @@ from gdata.books.service import BookService import xml.parsers.expat import readline import re +import random +from web.library.fileformat import * exit_commands = ['exit', 'abort', 'quit', 'bye', 'eat flaming death', 'q'] +comments = "" +action_list = [] + def get_book_loop(): service = BookService(source='Programvareverkstedet - Worblehat - 0.1a ') + global action_list + while True: indata = raw_input('Enter ISBN number> ') if indata in exit_commands: @@ -23,7 +30,7 @@ def get_book_loop(): if feed.entry: if len(feed.entry) == 1: print "Found one book: "+feed.entry[0].dc_title[0].text - build_book(feed.entry[0], indata) + action_list.append(build_book(feed.entry[0], indata)) else: print "Found multiple books: " for i in range(len(feed.entry)): #entry in feed.entry: @@ -31,10 +38,12 @@ def get_book_loop(): # build_authors(feed.entry[i].to_dict())[0], feed.entry[i].dc_title[0].text) bookno = (int)(raw_input("Which book do you want? [0-%d] " % (len(feed.entry) - 1))) - build_book(feed.entry[bookno], indata) + action_list.append(build_book(feed.entry[bookno], indata)) else: print "No items found" + print write_actionlist(action_list) + def found_item(entry, indata): print "Found: "+entry.dc_title[0].text build_book(entry, indata) @@ -46,48 +55,60 @@ def build_book(entry, indata=False): book['action'] = 'new-book' - book['title'] = entry.dc_title[0].text - if len(entry.dc_title) > 0: - book['subtitle'] = ''.join(map(lambda x: x.text, entry.dc_title[1:])) - - isbn = find_isbn(dic['identifiers']) + isbn = find_isbn(unicode(dic['identifiers'])) if isbn: - book['isbn'] = isbn + book['isbn'] = unicode(isbn) elif indata: - if len(indata) == 13: - book['isbn'] = indata + if len(indata) == 13: + book['isbn'] = unicode(indata) else: - print "No ISBN found" + comment("No ISBN found.") return False - book['description'] = find_description(dic) + book['title'] = unicode(entry.dc_title[0].text) + + set_value(book, dic, 'category') + + if len(entry.dc_title) > 0: + book['subtitle'] = unicode(''.join(map(lambda x: x.text, entry.dc_title[1:]))) + authors = build_authors(dic) + book['persons'] = {} + book['persons']['author'] = [author['id'] for author in authors] + + if 'publishers' in dic: + book['publisher'] = unicode(','.join(dic['publishers'])) + if 'date' in dic: book['published_year'] = int(dic['date'][:4]) - if 'publishers' in dic: - book['publisher'] = ','.join(dic['publishers']) + set_value(book, dic, 'edition') book['num_pages'] = find_page_number(dic) - book['persons'] = {} - book['persons']['author'] = build_authors(dic) - + set_value(book, dic, 'series') + + book['description'] = unicode(find_description(dic)) + book['references'] = {} - book['references']['google'] = dic['preview'] + book['references']['google-books'] = [unicode(dic['preview'])] - keys_to_add = ['edition', 'series', 'category', 'thumbnail', 'picture'] - for key in keys_to_add: - set_value(book, dic, key) + global comments + print comments + book['comment'] = comments + comments = '' return book +def comment(comm): + global comments + comments += u'%s\n' % comm def set_value(book, dic, key): if key in dic: - book[key] = dic[key] + book[key] = unicode(dic[key]) else: - book[key] = '' + book[key] = None def find_description(dic): @@ -118,46 +139,59 @@ def build_authors(dictionary): author_list.append(get_or_create_author(author)) return author_list else: - print "No authors found" + comment("No authors found.") return [] def get_or_create_author(author_name): - print "Processing author: ", author_name +# print "Processing author: ", author_name + global action_list + author = {} + author['action'] = 'new-person' names = author_name.split() first = ' '.join(names[:-1]) last = names[-1] + author['first_name'] = first + author['last_name'] = last candidates = Person.objects.filter(first_name__contains=names[0],last_name=last) +# comment("Authors found: %s" % (', '.join(str(v) for v in ))) selected = select_from_list(candidates, attributes=['first_name','last_name'], item_name='author') if selected: return selected else: - print "No author found, creating author" +# print "No author found, creating author" + comment("No author found, creating author.") newid = ''.join([i[0] for i in names]).lower() - print newid + author['id'] = newid +# print newid while True: existing = Person.objects.filter(id=newid) if len(existing)==0: - return Person(first_name=first, last_name=last, id=newid) - newid = raw_input("Another authour found with same intials, please suggest an id> ") + action_list.append(author) + return author #Person(first_name=first, last_name=last, id=newid) + comment("Another author found with same initials, please fix id.") + newid = newid+"%f" % random.random() + author['id'] = newid +# newid = raw_input("Another author found with same intials, please suggest an id> ") #Cargo-cult coded function to unescape special XML characters def select_from_list(list, attributes=False, item_name=""): if len(list) == 0: - print "No candidate %sfound" %(item_name+' ') +# print "No candidate %sfound" %(item_name+' ') return None elif len(list) == 1: - if attributes: - answer = raw_input(str("Found one %s: %s. Use this? [y]/n> " %(item_name,' '.join([eval("list[0]."+attribute) for attribute in attributes])))) - else: - answer = raw_input(str("Found one %s: %s. Use this? [y]/n> " %(item_name,list[0]))) - if answer in ['yes', 'y', '']: - return list[0] - else: - return None +# if attributes: +# answer = raw_input(str("Found one %s: %s. Use this? [y]/n> " %(item_name,' '.join([eval("list[0]."+attribute) for attribute in attributes])))) +# else: +# answer = raw_input(str("Found one %s: %s. Use this? [y]/n> " %(item_name,list[0]))) +# if answer in ['yes', 'y', '']: +# return list[0] +# else: +# return None + return list[0] else: - print "several candidates found" +# print "several candidates found" return None def unescape(s):