ZSQLExtend/importFMPXML.py - diff

Return to importFMPXML.py CVS log

Up to [Repository] / ZSQLExtend

version 1.24, 2008/03/06 12:10:55	version 1.27, 2008/09/05 19:05:57
Line 22 except:	Line 22 except:

fm_ns = 'http://www.filemaker.com/fmpxmlresult'	fm_ns = 'http://www.filemaker.com/fmpxmlresult'

version_string = "V0.6.1 ROC .2008"	version_string = "V0.6.1 ROC 2.7.2008"

def unicodify(text, withNone=False):	def unicodify(text, withNone=False):
"""decode str (utf-8 or latin-1 representation) into unicode object"""	"""decode str (utf-8 or latin-1 representation) into unicode object"""
Line 146 class xml_handler:	Line 146 class xml_handler:

# connect database	# connect database
self.dbCon = psycopg.connect(options.dsn)	self.dbCon = psycopg.connect(options.dsn)
logging.debug("DB encoding: %s"%self.dbCon.encoding)	logging.debug("DB encoding: %s"%getattr(self.dbCon, 'encoding', 'UNKNOWN'))
self.db = self.dbCon.cursor()	self.db = self.dbCon.cursor()
assert self.db, "AIIEE no db cursor for %s!!"%options.dsn	assert self.db, "AIIEE no db cursor for %s!!"%options.dsn

Line 388 class xml_handler:	Line 388 class xml_handler:
for id in self.dbIDs.keys():	for id in self.dbIDs.keys():
# find all not-updated fields	# find all not-updated fields
if self.dbIDs[id] == 0:	if self.dbIDs[id] == 0:
self.logger.info(" delete:"+id)	self.logger.info(" delete: %s"%id)
SimpleSearch(self.db, delQuery, [id], ascii=self.ascii_db)	SimpleSearch(self.db, delQuery, [id], ascii=self.ascii_db)

elif self.dbIDs[id] > 1:	elif self.dbIDs[id] > 1: