--- ZSQLExtend/importASCII.py 2007/12/05 17:42:22 1.1 +++ ZSQLExtend/importASCII.py 2007/12/05 18:42:46 1.2 @@ -25,7 +25,7 @@ def sql_quote(v): v=string.join(string.split(v,dkey),quote_dict[dkey]) return "'%s'"%v -def SimpleSearch(curs,query, args=None, ascii=False): +def SimpleSearch(curs,query, args=None, ascii=False, result=True): """execute sql query and return data""" #logging.debug("executing: "+query+" "+repr(args)) if ascii: @@ -42,10 +42,11 @@ def SimpleSearch(curs,query, args=None, curs.execute(query, args) #logger.debug("sql done") - try: - return curs.fetchall() - except: - return None + if result: + try: + return curs.fetchall() + except: + return None class TableColumn: @@ -236,7 +237,7 @@ class ASCII_handler: # find all not-updated fields if self.dbIDs[id] == 0: self.logger.info(" delete:"+id) - SimpleSearch(self.db, delQuery, [id], ascii=self.ascii_db) + SimpleSearch(self.db, delQuery, [id], ascii=self.ascii_db, result=False) sys.exit(1) elif self.dbIDs[id] > 1: @@ -295,12 +296,12 @@ class ASCII_handler: # last argument is ID match args.append(id_val) self.logger.debug("update: %s = %s"%(id_val, args)) - SimpleSearch(self.db, self.updQuery, args, ascii=self.ascii_db) + SimpleSearch(self.db, self.updQuery, args, ascii=self.ascii_db, result=False) elif not self.update_mode: # create new row self.logger.debug("insert: %s"%args) - SimpleSearch(self.db, self.addQuery, args, ascii=self.ascii_db) + SimpleSearch(self.db, self.addQuery, args, ascii=self.ascii_db, result=False) #self.logger.info(" row:"+"%d (%s)"%(self.rowcnt,id_val)) if (self.rowcnt % 100) == 0: