version 1.16, 2007/12/11 16:21:24
|
version 1.17, 2007/12/11 19:35:34
|
Line 49 def SimpleSearch(curs,query, args=None,
|
Line 49 def SimpleSearch(curs,query, args=None,
|
if args is not None: |
if args is not None: |
encargs = [] |
encargs = [] |
for a in args: |
for a in args: |
if a is not None: |
if a is not None and isinstance(a, str): |
a = a.encode("UTF-8") |
a = a.encode("UTF-8") |
encargs.append(a) |
encargs.append(a) |
|
|
Line 227 class xml_handler:
|
Line 227 class xml_handler:
|
# try to match date style with XML |
# try to match date style with XML |
self.db.execute("set datestyle to 'german'") |
self.db.execute("set datestyle to 'german'") |
|
|
# translate id_field (SQL-name) to XML-name |
|
self.xml_id = self.sql_field_map.get(self.id_field, None) |
|
|
|
#self.logger.debug("xml-fieldnames:"+repr(self.xml_field_names)) |
#self.logger.debug("xml-fieldnames:"+repr(self.xml_field_names)) |
# get list of fields and types of db table |
# get list of fields and types of db table |
qstr="select attname, format_type(pg_attribute.atttypid, pg_attribute.atttypmod) from pg_attribute, pg_class where attrelid = pg_class.oid and pg_attribute.attnum > 0 and relname = '%s'" |
qstr="select attname, format_type(pg_attribute.atttypid, pg_attribute.atttypmod) from pg_attribute, pg_class where attrelid = pg_class.oid and pg_attribute.attnum > 0 and relname = '%s'" |
Line 240 class xml_handler:
|
Line 237 class xml_handler:
|
#print "SQL fields: %s (%s)"%(n,t) |
#print "SQL fields: %s (%s)"%(n,t) |
self.sql_fields[n] = TableColumn(n,t) |
self.sql_fields[n] = TableColumn(n,t) |
|
|
|
# translate id_field (SQL-name) to XML-name |
|
self.xml_id = self.sql_field_map.get(self.id_field, None) |
|
# get type of id_field |
|
if self.id_field: |
|
self.id_type = self.sql_fields[self.id_field].getType() |
|
else: |
|
self.id_type = None |
|
|
# check fields to update |
# check fields to update |
if self.update_fields is None: |
if self.update_fields is None: |
if self.keep_fields: |
if self.keep_fields: |
Line 288 class xml_handler:
|
Line 293 class xml_handler:
|
self.db.execute(qstr) |
self.db.execute(qstr) |
self.dbCon.commit() |
self.dbCon.commit() |
|
|
# prepare sql statements for update |
# prepare sql statements for update (do not update id_field) |
setStr=string.join(["%s = %%s"%self.xml_field_map[f] for f in self.xml_update_list], ', ') |
setStr=string.join(["%s = %%s"%self.xml_field_map[f] for f in self.xml_update_list if f != self.xml_id], ', ') |
self.updQuery="UPDATE %s SET %s WHERE %s = %%s"%(self.table,setStr,self.id_field) |
self.updQuery="UPDATE %s SET %s WHERE %s = %%s"%(self.table,setStr,self.id_field) |
# and insert |
# and insert |
fields=string.join([self.xml_field_map[x].getName() for x in self.xml_update_list], ',') |
fields=string.join([self.xml_field_map[x].getName() for x in self.xml_update_list], ',') |
Line 394 class xml_handler:
|
Line 399 class xml_handler:
|
id_val='' |
id_val='' |
# synchronize by id_field |
# synchronize by id_field |
if self.id_field: |
if self.id_field: |
|
if self.id_type == 'integer': |
|
id_val = int(self.xml_data[self.xml_id]) |
|
else: |
id_val = self.xml_data[self.xml_id] |
id_val = self.xml_data[self.xml_id] |
|
|
if id_val in self.dbIDs: |
if id_val in self.dbIDs: |
self.dbIDs[id_val] += 1 |
self.dbIDs[id_val] += 1 |
update=True |
update=True |
Line 402 class xml_handler:
|
Line 411 class xml_handler:
|
# collect all values |
# collect all values |
args = [] |
args = [] |
for fn in self.xml_update_list: |
for fn in self.xml_update_list: |
|
# do not update id_field |
|
if self.id_field and fn == self.xml_id: |
|
continue |
|
|
f = self.xml_field_map[fn] |
f = self.xml_field_map[fn] |
val = self.xml_data[fn] |
val = self.xml_data[fn] |
type = self.sql_fields[f.getName()].getType() |
type = self.sql_fields[f.getName()].getType() |
Line 425 class xml_handler:
|
Line 438 class xml_handler:
|
else: |
else: |
# create new row |
# create new row |
self.logger.debug("insert: %s"%args) |
self.logger.debug("insert: %s"%args) |
|
sys.exit(1) |
SimpleSearch(self.db, self.addQuery, args, ascii=self.ascii_db) |
SimpleSearch(self.db, self.addQuery, args, ascii=self.ascii_db) |
|
|
#self.logger.info(" row:"+"%d (%s)"%(self.rowcnt,id_val)) |
#self.logger.info(" row:"+"%d (%s)"%(self.rowcnt,id_val)) |