From aff4e4c2a232fd82fbbedef8351b2d0ef2343d2e Mon Sep 17 00:00:00 2001 From: tirilane Date: Sat, 5 Mar 2011 21:57:11 +0000 Subject: [PATCH] =?UTF-8?q?#2=20er=20forel=C3=B8pig=20ferdig.=20Denne=20ve?= =?UTF-8?q?rsjonen=20har=20litt=20penere=20kode,=20og=20ser=20ut=20til=20?= =?UTF-8?q?=C3=A5=20fungere=20fint.=20Action-lista=20blir=20fremdeles=20pr?= =?UTF-8?q?inta=20til=20standard=20ut.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- python/google_interface.py | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/python/google_interface.py b/python/google_interface.py index 3616e6f..9f552c3 100644 --- a/python/google_interface.py +++ b/python/google_interface.py @@ -4,9 +4,6 @@ import os os.environ['DJANGO_SETTINGS_MODULE']='web.settings' from web.library.models import * from gdata.books.service import BookService -#from dibbler_snippet import ConfirmMenu -#from xml.dom import minidom -#from xml.sax.saxutils import unescape import xml.parsers.expat import readline import re @@ -35,13 +32,13 @@ def get_book_loop(): print "Found multiple books: " for i in range(len(feed.entry)): #entry in feed.entry: print "%d: %s" % (i, -# 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))) action_list.append(build_book(feed.entry[bookno], indata)) else: print "No items found" + print print write_actionlist(action_list) def found_item(entry, indata): @@ -94,7 +91,6 @@ def build_book(entry, indata=False): book['references']['google-books'] = [unicode(dic['preview'])] global comments - print comments book['comment'] = comments comments = '' @@ -143,7 +139,6 @@ def build_authors(dictionary): return [] def get_or_create_author(author_name): -# print "Processing author: ", author_name global action_list author = {} author['action'] = 'new-person' @@ -153,16 +148,13 @@ def get_or_create_author(author_name): 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" comment("No author found, creating author.") newid = ''.join([i[0] for i in names]).lower() author['id'] = newid -# print newid while True: existing = Person.objects.filter(id=newid) if len(existing)==0: @@ -171,27 +163,16 @@ def get_or_create_author(author_name): 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+' ') 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 return list[0] else: -# print "several candidates found" return None def unescape(s):