--- ZSQLExtend/ZSQLExtend.py	2008/06/19 11:46:29	1.127
+++ ZSQLExtend/ZSQLExtend.py	2009/11/17 18:21:28	1.132
@@ -388,7 +388,7 @@ class ZSQLExtendFolder(Folder,Persistent
         
         tfilehd,filename=tempfile.mkstemp()
         tfile=os.fdopen(tfilehd,'w')
-        logging.info("import %s"%uploadfile)
+        logging.info("importXMLFileFMP: importing %s"%uploadfile)
         for c in uploadfile.read():
             tfile.write(c)
         tfile.close()  
@@ -398,12 +398,26 @@ class ZSQLExtendFolder(Folder,Persistent
         if not dsn:
             dsn=self.getConnectionObj().connection_string
         
+        logging.debug("dsn: %s"%dsn)
+        logging.debug("table: %s"%table)
+        logging.debug("update_fields: %s"%update_fields)
+        logging.debug("id_field: %s"%id_field)
+        logging.debug("sync_mode: %s"%sync_mode)
+        logging.debug("lc_names: %s"%lc_names)
+        logging.debug("keep_fields: %s"%keep_fields)
+        logging.debug("ascii_db: %s"%ascii_db)
+        logging.debug("replace: %s"%replace)
+        logging.debug("backup: %s"%backup)
+        logging.debug("debug: %s"%debug)
+        logging.debug("log_to_response: %s"%log_to_response)
+        logging.debug("RESPONSE: %s"%repr(RESPONSE))
+
         tablelist=table.split(',')
-        logging.debug("tablelist: %s" %tablelist)
+        logging.debug("tablelist: %s"%tablelist)
         #table=tables
         
         for t in tablelist :   
-            logging.debug("table: %s" %table)  
+            logging.debug("table: %s"%table)  
             options=Options()
             options.dsn=dsn
             options.table=t
@@ -421,8 +435,10 @@ class ZSQLExtendFolder(Folder,Persistent
         
             if RESPONSE and log_to_response:
                 # set up logging to response as plain text
+                logging.debug("Setting up logging to RESPONSE")
                 RESPONSE.setHeader("Content-Type","text/plain; charset=utf-8")
                 RESPONSE.write("Import FMPXML file...\n\n")
+                RESPONSE.flush()
                 loghandler = logging.StreamHandler(RESPONSE)
                 if debug:
                     loghandler.setLevel(logging.DEBUG)
@@ -433,9 +449,8 @@ class ZSQLExtendFolder(Folder,Persistent
                 options.use_logger_instance = logger
 
             importFMPXML(options)
+            logging.info("importXMLFileFMP: done")
             
-            
-        
             if RESPONSE and log_to_response:
                 loghandler.flush()
                 RESPONSE.write("\n\n DONE!")
@@ -770,11 +785,11 @@ class ZSQLExtendFolder(Folder,Persistent
         """generate select oprions form a cr seperated list"""
         fields=listField.split("\n")
         if size:
-            ret="""<select name="%s" %s size="%s" >
+            ret="""<select name="%s"%s size="%s" >
             """%(fieldname,multiple,size)
 
         else:
-            ret="""<select name="%s" %s >
+            ret="""<select name="%s"%s >
             """%(fieldname,multiple)
         if start:
             if start==' ':
@@ -1136,7 +1151,10 @@ class ZSQLExtendFolder(Folder,Persistent
                     table=urllib.unquote(value)
             elif name=="-identify":
                 identify=urllib.unquote(value)
-                identify="lower("+identify.split("=")[0]+")="+sql_quote(identify.split("=")[1].lower())
+                # old code did identify with lower() which doesn't work for oids
+                #identify="lower("+identify.split("=")[0]+")="+sql_quote(identify.split("=")[1].lower())
+                (k,v) = identify.split("=")
+                identify="%s=%s"%(k,sql_quote(v))
             elif name=="-format":
                 format=urllib.unquote(value)
             #elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0):
@@ -1502,7 +1520,7 @@ class ZSQLExtendFolder(Folder,Persistent
 
                 elif op=="numerical":
                     term=analyseIntSearch(value)
-                    tmp=(name+" "+term)
+                    tmp=(namealt+" "+term) # take namealt without LOWER
                 elif op=="grep":
                     tmp=(name+" ~* "+sql_quote(value))
                 elif op=="one":
@@ -1552,7 +1570,7 @@ class ZSQLExtendFolder(Folder,Persistent
 
                 elif op=="numerical":
                     term=analyseIntSearch(value)
-                    tmp=(name+" "+term)
+                    tmp=(namealt+" "+term) # take namealt without LOWER
                 elif op=="grep":
                     tmp=(name+" ~* "+sql_quote(value))
                 elif op=="one":