Diff for /ZSQLExtend/importFMPXML.py between versions 1.5 and 1.6

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

Removed from v.1.5  
changed lines
  Added in v.1.6


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>