--- ZSQLExtend/importFMPXML.py	2010/05/10 15:50:32	1.31
+++ ZSQLExtend/importFMPXML.py	2011/06/23 09:14:53	1.33
@@ -6,6 +6,7 @@ import logging
 import sys
 import types
 import time
+import re
 
 from xml import sax
 from amara import saxtools
@@ -22,7 +23,7 @@ except:
 
 fm_ns = 'http://www.filemaker.com/fmpxmlresult'
 
-version_string = "V0.6.5 ROC 10.5.2010"
+version_string = "V0.6.7 ROC 21.6.2011"
 
 def unicodify(text, withNone=False):
     """decode str (utf-8 or latin-1 representation) into unicode object"""
@@ -68,6 +69,20 @@ def sql_quote(v):
             v=string.join(string.split(v,dkey),quote_dict[dkey])
     return "'%s'"%v
 
+def sqlName(s, lc=True, more=''):
+    """returns restricted ASCII-only version of string"""
+    if s is None:
+        return ""
+    
+    # remove '
+    s = s.replace("'","")
+    # all else -> "_"
+    s = re.sub('[^A-Za-z0-9_'+more+']','_',s)
+    if lc:
+        return s.lower()
+    
+    return s
+
 def SimpleSearch(curs,query, args=None, ascii=False):
     """execute sql query and return data"""
     #logger.debug("executing: "+query)
@@ -351,7 +366,7 @@ class xml_handler:
         #Element closed.  Wrap up
         if self.lc_names:
             # clean name
-            sqlname = name.replace(" ","_").lower() 
+            sqlname = sqlName(name)
         else:
             sqlname = name
         self.xml_field_names.append(name)
@@ -389,18 +404,23 @@ class xml_handler:
         
         if self.sync_mode:
             # delete unmatched entries in db
-            self.logger.info("deleting unmatched rows from db")
-            delQuery = "DELETE FROM %s WHERE \"%s\" = %%s"%(self.table,self.id_field)
-            for id in self.dbIDs.keys():
-                # find all not-updated fields
-                if self.dbIDs[id] == 0:
-                    self.logger.info(" delete: %s"%id)
-                    SimpleSearch(self.db, delQuery, [id], ascii=self.ascii_db)
-                    
-                elif self.dbIDs[id] > 1:
-                    self.logger.info(" sync: ID %s used more than once?"%id)
-            
-            self.dbCon.commit()
+            if self.rowcnt > 0:
+                self.logger.info("deleting unmatched rows from db")
+                delQuery = "DELETE FROM %s WHERE \"%s\" = %%s"%(self.table,self.id_field)
+                for id in self.dbIDs.keys():
+                    # find all not-updated fields
+                    if self.dbIDs[id] == 0:
+                        self.logger.info(" delete: %s"%id)
+                        SimpleSearch(self.db, delQuery, [id], ascii=self.ascii_db)
+                        
+                    elif self.dbIDs[id] > 1:
+                        self.logger.info(" sync: ID %s used more than once?"%id)
+                
+                self.dbCon.commit()
+                
+            else:
+                # safety in case we had an empty file
+                self.logger.warning("no rows read! not deleting unmatched rows!")
             
         # reinstate backup tables
         if self.backup_table and not self.id_field: