MPIWGWeb/updatePersonalWWW.py - diff

Return to updatePersonalWWW.py CVS log

Up to [Repository] / MPIWGWeb

version 1.1.2.7, 2009/04/28 13:47:04	version 1.1.2.9, 2011/05/18 10:52:29
Line 6 except:	Line 6 except:
psyco = 1	psyco = 1

import logging	import logging
	from MPIWGHelper import unicodify, utf8ify

from xml import sax	from xml import sax
from amara import saxtools	from amara import saxtools
Line 15 fm_ns = 'http://www.filemaker.com/fmpxml	Line 16 fm_ns = 'http://www.filemaker.com/fmpxml

# list of fields that are taken from XML and checked against DB as conflicts	# list of fields that are taken from XML and checked against DB as conflicts
#checkFields=['key','first_name','last_name','title','home_inst','current_work','e_mail2']	#checkFields=['key','first_name','last_name','title','home_inst','current_work','e_mail2']
checkFields=['key','first_name','last_name','title','titles_new','home_inst','e_mail2']	checkFields=['key','first_name','last_name','title','titles_new','home_inst','current_work','e_mail2']

def sql_quote(v):	def sql_quote(v):
# quote dictionary	# quote dictionary
Line 225 def checkImport(dsn,resultSet):	Line 226 def checkImport(dsn,resultSet):
keys=[]	keys=[]
for x in results:	for x in results:
if x[0]:	if x[0]:
keys.append(x[0].decode('utf-8'))	keys.append(unicodify(x[0]))


#first step detect new entries and conflicts	#first step detect new entries and conflicts