--- ZSQLExtend/ZSQLExtend.py	2007/12/11 15:47:52	1.123
+++ ZSQLExtend/ZSQLExtend.py	2008/03/31 13:31:34	1.126
@@ -127,7 +127,15 @@ class ZSQLExtendFolder(Folder,Persistent
         """quote str for sql"""
         return sql_quote(str)
     
+    def unicodify(self, s):
+        """return unicode object for string (utf-8 or latin1) or unicode object s"""
+        return unicodify(s)
     
+    def utf8ify(self, s):
+        """return utf-8 encoded string object for string or unicode object s"""
+        return utf8ify(s)
+
+   
     def normalizeField(self,table,fieldname, newFieldName=None,mode="alter", RESPONSE=None):
         """normalize a field, d.h. entfernt alle diakritischen Zeichen und ersetzt diese 
         durch den Grundbuchstaben in einer Spalte einer Tabelle
@@ -364,7 +372,7 @@ class ZSQLExtendFolder(Folder,Persistent
         '''
         Import FileMaker XML file (FMPXMLRESULT format) into the table.
         @param dsn: database connection string
-        @param table: name of the table the xml shall be imported into
+        @param table: name of the table the xml shall be imported into (may be comma-separated list)
         @param uploadfile: xmlfile file
         @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.
@@ -389,46 +397,53 @@ class ZSQLExtendFolder(Folder,Persistent
         
         if not dsn:
             dsn=self.getConnectionObj().connection_string
-            
-        options=Options()
-        options.dsn=dsn
-        options.table=table
-        options.filename=filename
-        options.update_fields=update_fields
-        options.id_field=id_field
-        options.sync_mode=sync_mode
-        options.lc_names=lc_names
-        options.replace_table=replace
-        options.keep_fields=keep_fields
-        options.ascii_db=ascii_db
-        options.replace_table=replace
-        options.backup_table=backup
-        options.debug=debug
-        
-        if RESPONSE and log_to_response:
-            # set up logging to response as plain text
-            RESPONSE.setHeader("Content-Type","text/plain; charset=utf-8")
-            RESPONSE.write("Import FMPXML file...\n\n")
-            loghandler = logging.StreamHandler(RESPONSE)
-            if debug:
-                loghandler.setLevel(logging.DEBUG)
-            else:
-                loghandler.setLevel(logging.INFO)
-            logger = logging.getLogger('db.import.fmpxml')
-            logger.addHandler(loghandler)
-            options.use_logger_instance = logger
+        
+        tablelist=table.split(',')
+        logging.debug("tablelist: %s" %tablelist)
+        #table=tables
+        
+        for t in tablelist :   
+            logging.debug("table: %s" %table)  
+            options=Options()
+            options.dsn=dsn
+            options.table=t
+            options.filename=filename
+            options.update_fields=update_fields
+            options.id_field=id_field
+            options.sync_mode=sync_mode
+            options.lc_names=lc_names
+            options.replace_table=replace
+            options.keep_fields=keep_fields
+            options.ascii_db=ascii_db
+            options.replace_table=replace
+            options.backup_table=backup
+            options.debug=debug
+        
+            if RESPONSE and log_to_response:
+                # set up logging to response as plain text
+                RESPONSE.setHeader("Content-Type","text/plain; charset=utf-8")
+                RESPONSE.write("Import FMPXML file...\n\n")
+                loghandler = logging.StreamHandler(RESPONSE)
+                if debug:
+                    loghandler.setLevel(logging.DEBUG)
+                else:
+                    loghandler.setLevel(logging.INFO)
+                logger = logging.getLogger('db.import.fmpxml')
+                logger.addHandler(loghandler)
+                options.use_logger_instance = logger
 
-        importFMPXML(options)
+            importFMPXML(options)
+            
+            
         
+            if RESPONSE and log_to_response:
+                loghandler.flush()
+                RESPONSE.write("\n\n DONE!")
+             
+            elif RESPONSE and redirect_url:
+                RESPONSE.redirect(redirect_url)
+                
         os.remove(filename)
-        
-        if RESPONSE and log_to_response:
-            loghandler.flush()
-            RESPONSE.write("\n\n DONE!")
-            return
-        
-        if RESPONSE and redirect_url:
-            RESPONSE.redirect(redirect_url)
 
             
     def generateIndex(self,field,index_name,table,RESPONSE=None):