--- ZSQLExtend/importFMPXML.py 2007/01/09 14:00:59 1.5 +++ ZSQLExtend/importFMPXML.py 2007/01/09 18:28:23 1.6 @@ -41,6 +41,8 @@ def SimpleSearch(curs,query, args=None): logging.debug("executing: "+query) if psyco == 1: query = query.encode("UTF-8") + #if args is not None: + # args = [ sql_quote(a) for a in args ] curs.execute(query, args) logging.debug("sql done") try: @@ -187,12 +189,13 @@ class xml_handler: if self.sync_mode: # delete unmatched entries in db + delQuery = "DELETE FROM %s WHERE %s = %%s"%(self.table,self.id_field) for id in self.dbIDs.keys(): # find all not-updated fields if self.dbIDs[id] == 0: logging.info(" delete:"+id) - qstr = "DELETE FROM %s WHERE %%s = '%%s'"%self.table - SimpleSearch(self.db, qstr, (self.id_field,id)) + SimpleSearch(self.db, delQuery, [id]) + sys.exit(1) elif self.dbIDs[id] > 1: logging.info(" sync:"+"id used more than once?"+id) @@ -251,7 +254,7 @@ class xml_handler: #qstr="INSERT INTO %s (%s) VALUES (%s)"%(self.table,fields,self.values) args = [self.dataSet[f] for f in self.update_fields] SimpleSearch(self.db, self.addQuery, args) - logging.debug("add: %s"%self.dataSet.get(self.id_field, rowcnt)) + logging.debug("add: %s"%self.dataSet.get(self.id_field, self.rowcnt)) #logging.info(" row:"+"%d (%s)"%(self.rowcnt,id_val)) if (self.rowcnt % 10) == 0: