--- ZSQLExtend/ZSQLExtend.py	2007/08/09 15:09:27	1.119
+++ ZSQLExtend/ZSQLExtend.py	2008/02/21 17:59:23	1.125
@@ -364,7 +364,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 +389,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):
@@ -474,6 +481,27 @@ class ZSQLExtendFolder(Folder,Persistent
         """
         return urllib.quote(txt)
     
+    
+    def createIdSet(self, resultset, idField=None):
+        """returns a (frozen)set of IDs from a SQL-resultset (using idField) or a list (if idField=None)"""
+        logging.debug("createidset for idfield %s"%idField)
+        if idField is None:
+            return frozenset(resultset)
+        else:
+            idlist = [r[idField] for r in resultset]
+            return frozenset(idlist)
+        
+    def opIdSet(self, a, b, op):
+        """operate on sets a and b"""
+        logging.debug("opidset with op %s"%op)
+        if (op == 'intersect'):
+            return a.intersection(b)
+        elif (op == 'union'):
+            return a.union(b)
+        elif (op == 'diff'):
+            return a.difference(b)
+    
+    
     def searchRel(self,relStatement,statement,wherePart,classes):
         """suche relative haufigkeiten (experimental)"""
         ret={}
@@ -1247,30 +1275,25 @@ class ZSQLExtendFolder(Folder,Persistent
         """suche mit alten parametern bis auf die in argv getauschten"""
         if args:
             argv=args
-                
+        
         #get the old queries
         qs=self.REQUEST.SESSION[storename]['qs']
         querys=qs.split(",")
         
         #which arguments are in the old query string
-        
         queryList={}
         for query in querys:
             arg=query.split("=")[0]
             if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_"
             try:
-                queryList[arg]=query.split("=")[1]
+                queryList[arg]=urllib.unquote_plus(query.split("=")[1])
             except:
                 queryList[arg]=''   
                 
         argList=[]
         arg=""
-        
-        
-        
         #gehe durch die zu aendernden Argumente
         for argTmp in argv.keys():
-            
             arg=argTmp[0:]# sicherstellen, dass der string auh kopiert wird
             if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_"            
 
@@ -1282,6 +1305,7 @@ class ZSQLExtendFolder(Folder,Persistent
             str="ZSQLSearch?"+urllib.urlencode(queryList)
         
         return str
+
     
     def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename="foundCount",tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None):
         """analysieren den QueryString"""