--- ZSQLExtend/ZSQLExtend.py	2006/12/08 16:23:54	1.98
+++ ZSQLExtend/ZSQLExtend.py	2006/12/14 17:10:23	1.99
@@ -396,7 +396,150 @@ class ZSQLExtendFolder(Folder,Persistent
                 #nf=file("xtf/"+fn+".xtf",'w')
                 #nf.write("""<texts xmlns="http://emegir.info/xtf" xmlns:lem="http://emegir.info/lemma" >"""+node[1].toxml()+"</texts>")
                 #print "wrote: %s"%fn
+
+
+    def importXMLFileFMP(self,table,data=None,filename=None,update_fields=None,id_field=None,sync_mode=False,RESPONSE=None):
+        '''
+        Import FileMaker XML file (FMPXMLRESULT format) into the table.
+        @param table: name of the table the xml shall be imported into
+        @param data: xml data as bz2 string
+        @param filename: xmlfile filename
+        @param update_fields: (optional) list of fields to update; default is to create all fields
+        @param id_field: (optional) field which uniquely identifies an entry for updating purposes.
+        @param sync_mode: (optional) really synchronise, i.e. delete entries not in XML file
+        @param RESPONSE: (optional)
+        '''
+        from xml.dom.pulldom import parseString,parse
+        import transaction
+
+        ret = ""
+
+        if data:
+            data=bz2.decompress(base64.decodestring(data))
+            zLOG.LOG("fmpxml",zLOG.INFO,"received file")
+            doc=parseString(data)
+            zLOG.LOG("fmpxml",zLOG.INFO,"parsed file")
+
+        elif filename:
+            fh=file(filename)
+            zLOG.LOG("fmpxml",zLOG.INFO,"reading file")
+            doc=parse(fh)
+            zLOG.LOG("fmpxml",zLOG.INFO,"parsed file")
+
+        dbIDs = {}
+        rowcnt = 0
+        
+        if id_field is not None:
+            # prepare a list of ids for sync mode
+            qstr="select %s from %s"%(id_field,table)
+            for id in self.ZSQLSimpleSearch(qstr):
+                # value 0: not updated
+                dbIDs[id[0]] = 0;
+                rowcnt += 1
                 
+            zLOG.LOG("fmpxml",zLOG.INFO,"%d entries in DB to sync"%rowcnt)
+        
+        fieldNames = []
+        rowcnt = 0
+        id_val = ''
+        
+        while 1:
+            node=doc.getEvent()
+        
+            if node is None:
+                break;
+            
+            # METADATA tag defines number and names of fields in FMPXMLRESULT
+            if node[1].nodeName == 'METADATA':
+                doc.expandNode(node[1])
+            
+                names=node[1].getElementsByTagName('FIELD')
+
+                for name in names:
+                    fn = name.getAttribute('NAME')
+                    fieldNames.append(fn)
+                
+                if update_fields is None:
+                    # update all fields
+                    update_fields = fieldNames
+                
+                zLOG.LOG("fmpxml fieldnames:",zLOG.INFO,repr(fieldNames))
+                # get list of fields in db table
+                qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s'"""
+                columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)]
+                
+                # adjust db table to fields in XML and fieldlist
+                for fieldName in fieldNames:
+                    zLOG.LOG("fmpxml fieldname:",zLOG.INFO,repr(fieldName))                     
+                    if (fieldName not in columns) and (fieldName in update_fields):
+                        qstr="""alter table %s add %s %s"""
+                        self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))
+                        zLOG.LOG("fmpxml add field:",zLOG.INFO,qstr%(table,fieldName,'text'))
+                        
+            # ROW tags (in RESULTSET tag) hold data
+            elif node[1].nodeName == 'ROW':
+                rowcnt += 1
+                
+                doc.expandNode(node[1])
+                cols=node[1].getElementsByTagName('COL')
+                dataSet={}
+                i = 0
+                # populate with data
+                for col in cols:
+                    data=col.getElementsByTagName('DATA')
+                    dataSet[fieldNames[i]] = getTextFromNode(data[0])
+                    i += 1
+                    
+                update=False
+                
+                # synchronize by id_field
+                if id_field:
+                    id_val=dataSet[id_field]
+                    if id_val in dbIDs:
+                        dbIDs[id_val] += 1
+                        update=True
+                
+                if update:
+                    # update existing row (by id_field)
+                    setvals=[]
+                    for fieldName in update_fields:
+                        setvals.append("%s = %s"%(fieldName,self.ZSQLQuote(dataSet[fieldName])))
+                    setStr=string.join(setvals, ',')
+                    id_val=dataSet[id_field]
+                    qstr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,id_field,id_val)
+                    #zLOG.LOG("fmpxml update:",zLOG.INFO,queryStr)
+                    self.ZSQLSimpleSearch(qstr)
+                    ret+="up: %s \n"%id_val
+                else:
+                    # create new row
+                    fields=string.join(update_fields, ',')
+                    values=string.join([" %s "%self.ZSQLQuote(dataSet[x]) for x in update_fields], ',')
+                    qstr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)
+                    self.ZSQLSimpleSearch(qstr)
+                    #zLOG.LOG("fmpxml: insert",zLOG.INFO,queryStr)
+                    ret+="ad: %s \n"%dataSet.get(id_field, rowcnt)
+
+                #zLOG.LOG("fmpxml row:",zLOG.INFO,"%d (%s)"%(rowcnt,id_val))
+                if (rowcnt % 10) == 0:
+                    zLOG.LOG("fmpxml row:",zLOG.INFO,"%d (%s)"%(rowcnt,id_val))
+                    transaction.commit()
+
+        transaction.commit()
+        if sync_mode:
+            # delete unmatched entries in db
+            for id in dbIDs.keys():
+                # find all not-updated fields
+                if dbIDs[id] == 0:
+                    zLOG.LOG("fmpxml delete:",zLOG.INFO,id)
+                    qstr = "DELETE FROM %s WHERE %s = '%s'"
+                    self.ZSQLSimpleSearch(qstr%(table,id_field,id))
+                    
+                elif dbIDs[id] > 1:
+                    zLOG.LOG("fmpxml sync:",zLOG.INFO,"id used more than once?"+id)
+            
+            transaction.commit()
+            
+        return ret        
         
     def generateIndex(self,field,index_name,table,RESPONSE=None):
         """erzeuge index aus feld"""
@@ -734,6 +877,8 @@ class ZSQLExtendFolder(Folder,Persistent
             ret[field[0]]=(self.ZSQLInlineSearch(storename=storename,args=argTmp2),field[3],field[4],field[5],field[6])
         
         return ret
+    
+    
     def ZSQLInlineSearch(self,storename=None,args=None,**argv):
         """inlinesearch"""